aselimov/pubs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better rename and error dialogue

Browse Source 
info() messages now print on stdout. warning() and error() still
print on stderr.

Fix #50
This commit is contained in:
Fabien Benureau 2016-01-16 21:28:44 +01:00
parent b4d066e1f9
commit e979aae85b
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pubs/commands/doc_cmd.py
View File

@ -105,7 +105,7 @@ def command(conf, args):
if not path.endswith('/'): if not path.endswith('/'):
path += '/' path += '/'
else: else:
ui.error('{} is not a directory. Quit.'.format( ui.error('{} is not a directory.'.format(
color.dye_err(args.path[0], 'filepath'))) color.dye_err(args.path[0], 'filepath')))
ui.exit(1) ui.exit(1)
@ -130,7 +130,7 @@ def command(conf, args):
paper = rp.pull_paper(citekey) paper = rp.pull_paper(citekey)
if paper.docpath is None: if paper.docpath is None:
ui.error('No document associated with the entry {}. Quit.'.format( ui.error('No document associated with the entry {}.'.format(
color.dye_err(citekey, 'citekey'))) color.dye_err(citekey, 'citekey')))
ui.exit() ui.exit()

4
pubs/commands/rename_cmd.py
View File

@ -1,4 +1,5 @@
from ..uis import get_ui from ..uis import get_ui
from .. import color
from .. import repo from .. import repo
from ..utils import resolve_citekey from ..utils import resolve_citekey
@ -24,3 +25,6 @@ def command(conf, args):
key = resolve_citekey(repo=rp, citekey=args.citekey, ui=ui, exit_on_fail=True) key = resolve_citekey(repo=rp, citekey=args.citekey, ui=ui, exit_on_fail=True)
paper = rp.pull_paper(key) paper = rp.pull_paper(key)
rp.rename_paper(paper, args.new_citekey) rp.rename_paper(paper, args.new_citekey)
ui.message("The '{}' citekey has been renamed into '{}'".format(
color.dye_out(args.citekey, 'citekey'),
color.dye_out(args.new_citekey, 'citekey')))

4
pubs/uis.py
View File

@ -69,8 +69,8 @@ class PrintUI(object):
print(*messages, **kwargs) print(*messages, **kwargs)
def info(self, message, **kwargs): def info(self, message, **kwargs):
kwargs['file'] = self._stderr kwargs['file'] = self._stdout
print(u'{}: {}'.format(color.dye_err('info', 'ok'), message), **kwargs) print(u'{}: {}'.format(color.dye_out('info', 'ok'), message), **kwargs)
def warning(self, message, **kwargs): def warning(self, message, **kwargs):
kwargs['file'] = self._stderr kwargs['file'] = self._stderr

4
pubs/utils.py
View File

@ -16,12 +16,12 @@ def resolve_citekey(repo, citekey, ui=None, exit_on_fail=True):
elif len(citekeys) == 1: elif len(citekeys) == 1:
if citekeys[0] != citekey: if citekeys[0] != citekey:
if ui is not None: if ui is not None:
ui.info("Provided citekey '{}' has been autocompleted into [{}].".format(color.dye_out(citekey, 'citekey'), color.dye_out(citekeys[0], 'citekey'))) ui.info("'{}' has been autocompleted into '{}'.".format(color.dye_out(citekey, 'citekey'), color.dye_out(citekeys[0], 'citekey')))
citekey = citekeys[0] citekey = citekeys[0]
elif citekey not in citekeys: elif citekey not in citekeys:
if ui is not None: if ui is not None:
citekeys = sorted(citekeys) citekeys = sorted(citekeys)
ui.error("Be more specific; Provided citekey '{}' matches multiples citekeys:".format( ui.error("Be more specific; '{}' matches multiples citekeys:".format(
citekey)) citekey))
for c in citekeys: for c in citekeys:
p = repo.pull_paper(c) p = repo.pull_paper(c)

3
tests/test_usecase.py
View File

@ -363,6 +363,7 @@ class TestUsecase(DataCommandTestCase):
'\n', '\n',
'', '',
'network search\n', 'network search\n',
'info: Assuming search to be a tag.\n'
'[Page99] Page, Lawrence et al. "The PageRank Citation Ranking: Bringing Order to the Web." (1999) | network,search\n', '[Page99] Page, Lawrence et al. "The PageRank Citation Ranking: Bringing Order to the Web." (1999) | network,search\n',
] ]
@ -508,7 +509,7 @@ class TestUsecase(DataCommandTestCase):
'pubs tag junk' 'pubs tag junk'
] ]
outs = self.execute_cmds(cmds) outs = self.execute_cmds(cmds)
self.assertEqual(1, len(outs[2].splitlines())) self.assertEqual(2, len(outs[2].splitlines()))
def test_doc_open(self): def test_doc_open(self):
cmds = ['pubs init', cmds = ['pubs init',