CHANGELOG.md

@@ -1,9 +1,3 @@
-## 0.2.0a31 (2025-11-07)
-
-### Fix
-
-- better layers support
-
 ## 0.2.0a30 (2025-11-07)
 
 ### Feat

pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail.cli"
-version = "0.2.0a31"
+version = "0.2.0a30"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
 description = "CLI for Rougail"

src/rougail/cli/__main__.py

@@ -160,7 +160,7 @@ def manage_warnings(warnings):
 def load_user_datas(rougailconfig):
     layer_datas = {}
     if not rougailconfig["cli.load_config"]:
-        return None, None, None, {"errors": [], "warnings": []}
+        return None, {"errors": [], "warnings": []}
     try:
         user_data_names = rougailconfig["step.user_data"]
     except PropertiesOptionError:
@@ -195,8 +195,7 @@ def load_user_datas(rougailconfig):
             layer_name = None
         # data user
         user_datas = []
-        if has_layers:
-            layer_datas[layer_name] = {}
+        layer_datas[layer_name] = {}
         for user_data_name in layer:
             path = (
                 Path(__file__).parent.parent
@@ -218,8 +217,7 @@ def load_user_datas(rougailconfig):
                     subconfig,
                     rougailconfig=rougailconfig,
                     ).run():
-                if has_layers:
-                    layer_datas[layer_name].setdefault(user_data_name, []).append(user_data["source"])
+                layer_datas[layer_name].setdefault(user_data_name, []).append(user_data["source"])
                 user_datas.append(user_data)
         if user_datas:
             new_err_warn = UserDatas(subconfig).user_datas(user_datas, invalid_user_datas_error=invalid_user_datas_error, unknown_user_datas_error=unknown_user_datas_error)
@@ -228,15 +226,14 @@ def load_user_datas(rougailconfig):
                     err_warn[level].extend(datas)
     for layer_name, interactive_user_data in interactive_user_datas.items():
         for layer, rougail_user_datas in interactive_user_data.items():
-            if has_layers:
-                if len(layers) > 1:
-                    subconfig = subconfig.config("_".join(layer))
-                    subconfig.owner.set(subconfig.path())
-                for user_data in rougail_user_datas(
-                    subconfig,
-                    rougailconfig=rougailconfig,
-                    ).run():
-                    layer_datas[layer_name].setdefault(user_data_name, []).append(user_data["source"])
+            if has_layers and len(layers) > 1:
+                subconfig = subconfig.config("_".join(layer))
+                subconfig.owner.set(subconfig.path())
+            for user_data in rougail_user_datas(
+                subconfig,
+                rougailconfig=rougailconfig,
+                ).run():
+                layer_datas[layer_name].setdefault(user_data_name, []).append(user_data["source"])
 
     return layer_datas, metaconfig, subconfig, err_warn
 

src/rougail/cli/__version__.py

@@ -1 +1 @@
-__version__ = "0.2.0a31"
+__version__ = "0.2.0a30"

tests/cli/result_user_datas_layers.txt

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

tests/cli/versions.txt

@@ -1 +1 @@
-["tiramisu", "tiramisu-cmdline-parser", "rougail", "rougail-cli", "rougail-structural-bitwarden", "rougail-user-data-ansible", "rougail-user-data-bitwarden", "rougail-user-data-commandline", "rougail-user-data-environment", "rougail-user-data-questionary", "rougail-user-data-yaml", "rougail-output-ansible", "rougail-output-console", "rougail-output-doc", "rougail-output-json"]
+["tiramisu", "tiramisu-cmdline-parser", "rougail", "rougail-cli", "rougail-structural-bitwarden", "rougail-user-data-ansible", "rougail-user-data-bitwarden", "rougail-user-data-commandline", "rougail-user-data-environment", "rougail-user-data-yaml", "rougail-output-ansible", "rougail-output-console", "rougail-output-doc", "rougail-output-json"]