fix: do now set modified option in second round
This commit is contained in:
parent
346401912c
commit
1c34145daf
6 changed files with 23 additions and 3 deletions
|
|
@ -95,7 +95,7 @@ def _main(arguments, do_not_print):
|
|||
)
|
||||
parser.parse_args(arguments)
|
||||
if user_datas:
|
||||
user_data = UserDatas(cmd_config).user_datas(user_datas, user_datas_type="values")
|
||||
user_data = UserDatas(cmd_config).user_datas(user_datas, user_datas_type="values", only_default=True)
|
||||
if user_data["warnings"] and cmd_config.option("cli.warnings").value.get():
|
||||
for warning in user_data["warnings"]:
|
||||
warn(warning)
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
["tiramisu: 5.2.0a9", "tiramisu-cmdline-parser: 0.7.0a1", "rougail: 1.2.0a24", "rougail-cli: 0.2.0a17", "rougail-structural-bitwarden: 0.1.0a4", "rougail-user-data-ansible: 0.1.0a3", "rougail-user-data-bitwarden: 0.1.0a20", "rougail-user-data-environment: 0.1.0a8", "rougail-user-data-yaml: 0.2.0a9", "rougail-output-ansible: 0.2.0a8", "rougail-output-console: 0.2.0a11", "rougail-output-doc: 0.2.0a21", "rougail-output-json: 0.2.0a8"]
|
||||
["tiramisu: 5.2.0a9", "tiramisu-cmdline-parser: 0.7.0a1", "rougail: 1.2.0a28", "rougail-cli: 0.2.0a18", "rougail-structural-bitwarden: 0.1.0a5", "rougail-user-data-ansible: 0.1.0a3", "rougail-user-data-bitwarden: 0.1.0a21", "rougail-user-data-environment: 0.1.0a9", "rougail-user-data-yaml: 0.2.0a11", "rougail-output-ansible: 0.2.0a9", "rougail-output-console: 0.2.0a11", "rougail-output-doc: 0.2.0a24", "rougail-output-json: 0.2.0a8"]
|
||||
|
|
|
|||
1
tests/rougailcli_file/mix_console.txt
Normal file
1
tests/rougailcli_file/mix_console.txt
Normal file
|
|
@ -0,0 +1 @@
|
|||
"[cols=\"1a,1a\"]\n|====\n| Variable | Description \n| \n\n**my_variable** +\n`https://rougail.readthedocs.io/en/latest/variable.html#variables-types[string]` `mandatory` | \nA description. +\n**Default**: my_value \n|====\n\n"
|
||||
6
tests/rougailcli_file/mix_rougailcli.yml
Normal file
6
tests/rougailcli_file/mix_rougailcli.yml
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
---
|
||||
main_dictionaries:
|
||||
- structures
|
||||
doc:
|
||||
output_format: console
|
||||
|
||||
|
|
@ -97,7 +97,20 @@ def test_cli_alt_rougailcli():
|
|||
with chdir(test_dir / 'rougailcli_file'):
|
||||
os.environ["ROUGAILCLI_CLI.CONFIG_FILE"] = 'alt_rougailcli.yml'
|
||||
ret = main([], do_not_print=True)
|
||||
filename = Path('console.txt')
|
||||
filename = Path('alt_console.txt')
|
||||
if not filename.is_file():
|
||||
with filename.open('w') as fh:
|
||||
fh.write(dumps(ret[1]))
|
||||
with filename.open() as fh:
|
||||
data = loads(fh.read())
|
||||
assert ret == (True, data)
|
||||
|
||||
|
||||
def test_cli_rougailcli_mix():
|
||||
with chdir(test_dir / 'rougailcli_file'):
|
||||
os.environ["ROUGAILCLI_CLI.CONFIG_FILE"] = 'mix_rougailcli.yml'
|
||||
ret = main(["-o", "doc", "--doc.output_format", "asciidoc"], do_not_print=True)
|
||||
filename = Path('mix_console.txt')
|
||||
if not filename.is_file():
|
||||
with filename.open('w') as fh:
|
||||
fh.write(dumps(ret[1]))
|
||||
|
|
|
|||
Loading…
Reference in a new issue