From 1c34145daf478a6e4f5754c0590cd5fb1100c668 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Fri, 20 Jun 2025 07:48:11 +0300 Subject: [PATCH] fix: do now set modified option in second round --- src/rougail/cli/__main__.py | 2 +- tests/cli/versions.txt | 2 +- .../{console.txt => alt_console.txt} | 0 tests/rougailcli_file/mix_console.txt | 1 + tests/rougailcli_file/mix_rougailcli.yml | 6 ++++++ tests/test_load.py | 15 ++++++++++++++- 6 files changed, 23 insertions(+), 3 deletions(-) rename tests/rougailcli_file/{console.txt => alt_console.txt} (100%) create mode 100644 tests/rougailcli_file/mix_console.txt create mode 100644 tests/rougailcli_file/mix_rougailcli.yml diff --git a/src/rougail/cli/__main__.py b/src/rougail/cli/__main__.py index 9e031f3..98b73a9 100644 --- a/src/rougail/cli/__main__.py +++ b/src/rougail/cli/__main__.py @@ -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) diff --git a/tests/cli/versions.txt b/tests/cli/versions.txt index f2cfcea..6ef3fda 100644 --- a/tests/cli/versions.txt +++ b/tests/cli/versions.txt @@ -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"] \ No newline at end of file +["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"] diff --git a/tests/rougailcli_file/console.txt b/tests/rougailcli_file/alt_console.txt similarity index 100% rename from tests/rougailcli_file/console.txt rename to tests/rougailcli_file/alt_console.txt diff --git a/tests/rougailcli_file/mix_console.txt b/tests/rougailcli_file/mix_console.txt new file mode 100644 index 0000000..e027f77 --- /dev/null +++ b/tests/rougailcli_file/mix_console.txt @@ -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" \ No newline at end of file diff --git a/tests/rougailcli_file/mix_rougailcli.yml b/tests/rougailcli_file/mix_rougailcli.yml new file mode 100644 index 0000000..813d33a --- /dev/null +++ b/tests/rougailcli_file/mix_rougailcli.yml @@ -0,0 +1,6 @@ +--- +main_dictionaries: + - structures +doc: + output_format: console + diff --git a/tests/test_load.py b/tests/test_load.py index 776e0f0..03a6ef3 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -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]))