CHANGELOG.md

@@ -1,9 +1,3 @@
-## 0.2.0a20 (2025-09-22)
-
-### Fix
-
-- dictionary => structure
-
 ## 0.2.0a19 (2025-09-03)
 
 ### Fix

pyproject.toml

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

src/rougail/cli/__version__.py

@@ -1 +1 @@
-__version__ = "0.2.0a20"
+__version__ = "0.2.0a19"

tests/cli/versions.txt

@@ -1 +1 @@
-["tiramisu: 5.2.0a10", "tiramisu-cmdline-parser: 0.7.0a1", "rougail: 1.2.0a30", "rougail-cli: 0.2.0a19", "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.0a12", "rougail-output-console: 0.2.0a11", "rougail-output-doc: 0.2.0a25", "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"]

tests/rougailcli_file/.rougailcli.yml

@@ -1,5 +1,5 @@
 ---
-main_structural_directories:
+main_dictionaries:
   - structures
 step:
   output: doc

tests/rougailcli_file/alt_rougailcli.yml

@@ -1,5 +1,5 @@
 ---
-main_structural_directories:
+main_dictionaries:
   - structures
 step:
   output: doc

tests/rougailcli_file/mix_rougailcli.yml

@@ -1,5 +1,5 @@
 ---
-main_structural_directories:
+main_dictionaries:
   - structures
 doc:
   output_format: console

tests/rougailcli_file/yaml.txt

@@ -1 +1 @@
-"{\n  \"my_variable\": {\n    \"type\": \"variable\",\n    \"default\": {\n      \"name\": \"Default\",\n      \"values\": \"my_value\"\n    },\n    \"properties\": [\n      {\n        \"type\": \"type\",\n        \"name\": \"string\"\n      },\n      {\n        \"type\": \"property\",\n        \"name\": \"mandatory\"\n      }\n    ],\n    \"paths\": [\n      \"my_variable\"\n    ],\n    \"names\": [\n      \"my_variable\"\n    ],\n    \"descriptions\": [\n      \"A description.\"\n    ]\n  }\n}"
+"{\n  \"my_variable\": {\n    \"type\": \"variable\",\n    \"default\": \"my_value\",\n    \"properties\": [\n      {\n        \"type\": \"type\",\n        \"name\": \"string\"\n      },\n      {\n        \"type\": \"property\",\n        \"name\": \"mandatory\"\n      }\n    ],\n    \"paths\": [\n      \"my_variable\"\n    ],\n    \"names\": [\n      \"my_variable\"\n    ],\n    \"descriptions\": [\n      \"A description.\"\n    ]\n  }\n}"

tests/second_step/yaml.txt

@@ -1 +1 @@
-"{\n  \"my_variable\": {\n    \"type\": \"variable\",\n    \"default\": {\n      \"name\": \"Default\",\n      \"values\": \"my_value\"\n    },\n    \"properties\": [\n      {\n        \"type\": \"type\",\n        \"name\": \"string\"\n      },\n      {\n        \"type\": \"property\",\n        \"name\": \"mandatory\"\n      }\n    ],\n    \"paths\": [\n      \"my_variable\"\n    ],\n    \"names\": [\n      \"my_variable\"\n    ],\n    \"descriptions\": [\n      \"A description.\"\n    ]\n  }\n}"
+"{\n  \"my_variable\": {\n    \"type\": \"variable\",\n    \"default\": \"my_value\",\n    \"properties\": [\n      {\n        \"type\": \"type\",\n        \"name\": \"string\"\n      },\n      {\n        \"type\": \"property\",\n        \"name\": \"mandatory\"\n      }\n    ],\n    \"paths\": [\n      \"my_variable\"\n    ],\n    \"names\": [\n      \"my_variable\"\n    ],\n    \"descriptions\": [\n      \"A description.\"\n    ]\n  }\n}"

tests/test_load.py

@@ -11,7 +11,7 @@ test_dir = Path(__file__).parent
 
 def test_cli():
     with chdir(test_dir / 'cli'):
-        ret = main(['--main_structural_directories', 'structures'], do_not_print=True)
+        ret = main(['--main_dictionaries', 'structures'], do_not_print=True)
         filename = Path('result.txt')
         if not filename.is_file():
             with filename.open('w') as fh:
@@ -23,7 +23,7 @@ def test_cli():
 
 def test_cli_boolean():
     with chdir(test_dir / 'cli'):
-        ret = main(['--main_structural_directories', 'structures', '--console.mandatory'], do_not_print=True)
+        ret = main(['--main_dictionaries', 'structures', '--console.mandatory'], do_not_print=True)
         filename = Path('result.txt')
         if not filename.is_file():
             with filename.open('w') as fh:
@@ -35,7 +35,7 @@ def test_cli_boolean():
 
 def test_cli_boolean_no():
     with chdir(test_dir / 'cli'):
-        ret = main(['--main_structural_directories', 'structures', '--console.no-mandatory'], do_not_print=True)
+        ret = main(['--main_dictionaries', 'structures', '--console.no-mandatory'], do_not_print=True)
         filename = Path('result.txt')
         if not filename.is_file():
             with filename.open('w') as fh:
@@ -69,9 +69,9 @@ def test_cli_version_user_data_disabled():
         assert ret == data
 
 
-def test_cli_version_user_data_disabled_2():
+def test_cli_version_user_data_disabled():
     with chdir(test_dir / 'second_step'):
-        ret = main(['--main_structural_directories', 'structures', '--step.output', 'doc'], do_not_print=True)
+        ret = main(['--main_dictionaries', 'structures', '--step.output', 'doc'], do_not_print=True)
         filename = Path('yaml.txt')
         if not filename.is_file():
             with filename.open('w') as fh: