mirror of
https://github.com/jrnl-org/jrnl.git
synced 2025-05-20 04:58:32 +02:00
make format
This commit is contained in:
parent
5fe6caf805
commit
c4b3d51181
4 changed files with 31 additions and 18 deletions
|
@ -316,7 +316,10 @@ def parse_args(args=[]):
|
|||
help=argparse.SUPPRESS,
|
||||
)
|
||||
|
||||
overrides = parser.add_argument_group("Config file overrides",textwrap.dedent('These are one-off overrides of the config file options'))
|
||||
overrides = parser.add_argument_group(
|
||||
"Config file overrides",
|
||||
textwrap.dedent("These are one-off overrides of the config file options"),
|
||||
)
|
||||
overrides.add_argument(
|
||||
"--override",
|
||||
dest="config_override",
|
||||
|
@ -331,7 +334,7 @@ def parse_args(args=[]):
|
|||
For example, to use a different editor for this jrnl entry, call:
|
||||
jrnl --override '{"editor": "nano"}'
|
||||
|
||||
"""
|
||||
""",
|
||||
)
|
||||
|
||||
# Handle '-123' as a shortcut for '-n 123'
|
||||
|
|
|
@ -51,9 +51,9 @@ def run(args):
|
|||
|
||||
# Apply config overrides
|
||||
overrides = args.config_override
|
||||
#TODO: substitute overriden KV pairs in config dict ONLY AFTER ADDING TESTS
|
||||
for k in overrides:
|
||||
logging.debug("Overriding %s from %s to %s"%(k,config[k],overrides[k]))
|
||||
# TODO: substitute overriden KV pairs in config dict ONLY AFTER ADDING TESTS
|
||||
for k in overrides:
|
||||
logging.debug("Overriding %s from %s to %s" % (k, config[k], overrides[k]))
|
||||
config[k] = overrides[k]
|
||||
# --- All the standalone commands are now done --- #
|
||||
|
||||
|
|
|
@ -1,25 +1,31 @@
|
|||
import pytest
|
||||
import pytest_mock
|
||||
import pytest
|
||||
import pytest_mock
|
||||
import mock
|
||||
|
||||
import yaml
|
||||
from jrnl.args import parse_args
|
||||
from jrnl.jrnl import run
|
||||
from jrnl import install
|
||||
from jrnl.jrnl import run
|
||||
from jrnl import install
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def minimal_config():
|
||||
with open('features/data/configs/editor.yaml','r') as cfg_file:
|
||||
with open("features/data/configs/editor.yaml", "r") as cfg_file:
|
||||
yield yaml.load(cfg_file.read())
|
||||
|
||||
|
||||
from jrnl import jrnl
|
||||
@mock.patch.object(jrnl,'write_mode')
|
||||
@mock.patch.object(install,'load_or_install_jrnl')
|
||||
def test_override_configured_editor(mock_load_or_install, mock_write_mode, minimal_config):
|
||||
|
||||
|
||||
@mock.patch.object(jrnl, "write_mode")
|
||||
@mock.patch.object(install, "load_or_install_jrnl")
|
||||
def test_override_configured_editor(
|
||||
mock_load_or_install, mock_write_mode, minimal_config
|
||||
):
|
||||
mock_load_or_install.return_value = minimal_config
|
||||
cli_args = ['--override','{\"editor\": \"nano\"}' ]
|
||||
cli_args = ["--override", '{"editor": "nano"}']
|
||||
parser = parse_args(cli_args)
|
||||
assert parser.config_override.__len__() == 1
|
||||
with mock.patch('subprocess.call'):
|
||||
with mock.patch("subprocess.call"):
|
||||
res = run(parser)
|
||||
assert res==None
|
||||
assert res == None
|
||||
|
|
|
@ -35,7 +35,7 @@ def expected_args(**kwargs):
|
|||
"strict": False,
|
||||
"tags": False,
|
||||
"text": [],
|
||||
"config_override":{}
|
||||
"config_override": {},
|
||||
}
|
||||
return {**default_args, **kwargs}
|
||||
|
||||
|
@ -205,9 +205,13 @@ def test_version_alone():
|
|||
|
||||
assert cli_as_dict("--version") == expected_args(preconfig_cmd=preconfig_version)
|
||||
|
||||
|
||||
def test_editor_override():
|
||||
|
||||
assert cli_as_dict("--override '{\"editor\": \"nano\"}'") == expected_args(config_override={'editor':'nano'})
|
||||
assert cli_as_dict('--override \'{"editor": "nano"}\'') == expected_args(
|
||||
config_override={"editor": "nano"}
|
||||
)
|
||||
|
||||
|
||||
# @see https://github.com/jrnl-org/jrnl/issues/520
|
||||
@pytest.mark.parametrize(
|
||||
|
|
Loading…
Add table
Reference in a new issue