diff --git a/src/rougail/cli/__main__.py b/src/rougail/cli/__main__.py index 5ba8a9f..51cbd11 100644 --- a/src/rougail/cli/__main__.py +++ b/src/rougail/cli/__main__.py @@ -213,7 +213,7 @@ def load_user_data(rougailconfig): subconfig.information.set("description_type", rougailconfig["cli.description_type"]) metaconfig = subconfig if last_layers: - for layer in layers[:-1]: + for layer in reversed(layers[:-1]): layer_name = "_".join(layer) metaconfig = MetaConfig([metaconfig], name=layer_name) metaconfig.owner.set(metaconfig.path()) @@ -225,10 +225,8 @@ def load_user_data(rougailconfig): for idx, layer in enumerate(layers): if idx: subconfig = subconfig.config("_".join(layer)) - layer_name = subconfig.path() subconfig.owner.set(subconfig.path()) - else: - layer_name = None + layer_name = subconfig.path() # data user user_data = [] if has_layers: diff --git a/tests/cli/result_user_datas_layers.txt b/tests/cli/result_user_datas_layers.txt index e284499..614a8db 100644 --- a/tests/cli/result_user_datas_layers.txt +++ b/tests/cli/result_user_datas_layers.txt @@ -1,7 +1,13 @@ ╭────────────── Caption ───────────────╮ -│ Variable Modified value │ +│ Variable Default value │ │ (⏳ Original default value) │ ╰──────────────────────────────────────╯ +╭─────────── Layers ────────────╮ +│ environment variable │ +│ the YAML file "yaml/file.yml" │ +│ Bitwarden │ +╰───────────────────────────────╯ Variables: -┗━━ 📓 a description: a yaml value ◀ loaded from the YAML file "yaml/file.yml" - (⏳ my env value ◀ loaded from environment variable ⏳ my_value) +┗━━ 📓 a description: a yaml value (⏳ a yaml value ◀ loaded from the YAML file + "yaml/file.yml" ⏳ my env value ◀ loaded from environment variable ⏳ + my_value) diff --git a/tests/test_load.py b/tests/test_load.py index 2ca89b1..cdf5a46 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -116,7 +116,7 @@ def test_cli_user_datas_user_datas_layers(): save = os.environ.copy() os.environ["ROUGAIL_MY_VARIABLE"] = "my env value" with chdir(test_dir / 'cli'): - ret = main(['--main_structural_directories', 'structures', '--cli.layers', '--step.user_data', 'environment', 'yaml', '--yaml.filename', 'yaml/file.yml'], do_not_print=True) + ret = main(['--main_structural_directories', 'structures', '--cli.layers', '--step.user_data', 'environment', 'yaml', 'bitwarden', '--yaml.filename', 'yaml/file.yml', '--bitwarden.mock_enable'], do_not_print=True) filename = Path('result_user_datas_layers.txt') if not filename.is_file(): with filename.open('w') as fh: