stove/rougail-cli
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: more than two layers

Browse source
This commit is contained in:
egarette@silique.fr 2026-01-01 09:30:34 +01:00
parent 963e82b434
commit d156d7afc5
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/rougail/cli/__main__.py
View file

@ -213,7 +213,7 @@ def load_user_data(rougailconfig):
subconfig.information.set("description_type", rougailconfig["cli.description_type"]) subconfig.information.set("description_type", rougailconfig["cli.description_type"])
metaconfig = subconfig metaconfig = subconfig
if last_layers: if last_layers:
for layer in layers[:-1]: for layer in reversed(layers[:-1]):
layer_name = "_".join(layer) layer_name = "_".join(layer)
metaconfig = MetaConfig([metaconfig], name=layer_name) metaconfig = MetaConfig([metaconfig], name=layer_name)
metaconfig.owner.set(metaconfig.path()) metaconfig.owner.set(metaconfig.path())
@ -225,10 +225,8 @@ def load_user_data(rougailconfig):
for idx, layer in enumerate(layers): for idx, layer in enumerate(layers):
if idx: if idx:
subconfig = subconfig.config("_".join(layer)) subconfig = subconfig.config("_".join(layer))
layer_name = subconfig.path()
subconfig.owner.set(subconfig.path()) subconfig.owner.set(subconfig.path())
else: layer_name = subconfig.path()
layer_name = None
# data user # data user
user_data = [] user_data = []
if has_layers: if has_layers:

12
tests/cli/result_user_datas_layers.txt
View file

@ -1,7 +1,13 @@
╭────────────── Caption ───────────────╮ ╭────────────── Caption ───────────────╮
│ Variable Modified value │ │ Variable Default value │
│ (⏳ Original default value) │ │ (⏳ Original default value) │
╰──────────────────────────────────────╯ ╰──────────────────────────────────────╯
╭─────────── Layers ────────────╮
│ environment variable │
│ the YAML file "yaml/file.yml" │
│ Bitwarden │
╰───────────────────────────────╯
Variables: Variables:
┗━━ 📓 a description: a yaml value ◀ loaded from the YAML file "yaml/file.yml" ┗━━ 📓 a description: a yaml value (⏳ a yaml value ◀ loaded from the YAML file
 (⏳ my env value ◀ loaded from environment variable ⏳ my_value)  "yaml/file.yml" ⏳ my env value ◀ loaded from environment variable ⏳
 my_value)

2
tests/test_load.py
View file

@ -116,7 +116,7 @@ def test_cli_user_datas_user_datas_layers():
save = os.environ.copy() save = os.environ.copy()
os.environ["ROUGAIL_MY_VARIABLE"] = "my env value" os.environ["ROUGAIL_MY_VARIABLE"] = "my env value"
with chdir(test_dir / 'cli'): 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') filename = Path('result_user_datas_layers.txt')
if not filename.is_file(): if not filename.is_file():
with filename.open('w') as fh: with filename.open('w') as fh: