fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-06-28 21:46:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move standalone commands into their own file

Browse source 
Also, cleaned up the way the arg parser handles standalone commands.
Rather than checking individually for each command, you can now register
the command in the proper place, and it will be run with all known
arguments (and cofig if available).
This commit is contained in:
Jonathan Wren 2020-07-01 18:25:27 -07:00
parent 0bc5f9d453
commit c98d01bb8b
4 changed files with 302 additions and 216 deletions
Download patch file Download diff file Expand all files Collapse all files

21
tests/test_parse_args.py
View file

@ -1,4 +1,4 @@
from jrnl.cli import parse_args
from jrnl.cli import parse_args_before_config as parse_args
import pytest
import shlex
@ -16,7 +16,6 @@ def expected_args(**kwargs):
"debug": False,
"decrypt": False,
"delete": False,
"diagnostic": False,
"edit": False,
"encrypt": False,
"end_date": None,
@ -25,16 +24,16 @@ def expected_args(**kwargs):
"import_": False,
"input": False,
"limit": None,
"ls": False,
"on_date": None,
"output": False,
"preconfig_cmd": None,
"postconfig_cmd": None,
"short": False,
"starred": False,
"start_date": None,
"strict": False,
"tags": False,
"text": [],
"version": False,
}
return {**default_args, **kwargs}
@ -57,7 +56,11 @@ def test_delete_alone():
def test_diagnostic_alone():
assert cli_as_dict("--diagnostic") == expected_args(diagnostic=True)
from jrnl.commands import preconfig_diagnostic
assert cli_as_dict("--diagnostic") == expected_args(
preconfig_cmd=preconfig_diagnostic
)
def test_edit_alone():
@ -134,7 +137,9 @@ def test_limit_shorthand_alone():
def test_list_alone():
assert cli_as_dict("-ls") == expected_args(ls=True)
from jrnl.commands import postconfig_list
assert cli_as_dict("--ls") == expected_args(postconfig_cmd=postconfig_list)
def test_on_date_alone():
@ -169,7 +174,9 @@ def test_text_alone():
def test_version_alone():
assert cli_as_dict("--version") == expected_args(version=True)
from jrnl.commands import preconfig_version
assert cli_as_dict("--version") == expected_args(preconfig_cmd=preconfig_version)
# @see https://github.com/jrnl-org/jrnl/issues/520