bump: version 0.2.0a6 → 0.2.0a7

CHANGELOG.md

@@ -1,3 +1,62 @@
+## 0.2.0a7 (2025-04-30)
+
+### Fix
+
+- update tests
+
+## 0.2.0a6 (2025-04-09)
+
+### Fix
+
+- version
+
+## 0.2.0a5 (2025-04-09)
+
+### Fix
+
+- better error message
+
+## 0.2.0a4 (2025-04-01)
+
+### Fix
+
+- update tests
+
+## 0.2.0a3 (2025-03-30)
+
+### Fix
+
+- i18n
+
+## 0.2.0a2 (2025-03-30)
+
+### Fix
+
+- update tests
+- update tests, some errors are now in warnings level
+
+## 0.2.0a1 (2025-02-10)
+
+### Feat
+
+- add new parameter yaml.file_with_secrets
+
+### Fix
+
+- update tests
+
+## 0.2.0a0 (2024-12-11)
+
+### Feat
+
+- rename file to yaml
+
+### Fix
+
+- prepare ansible user data
+
+## 0.1.0 (2024-11-06)
+
 ## 0.1.0rc1 (2024-11-06)
 
 ### Fix

README.md

@@ -1,2 +1,2 @@
-# rougail-user-data
+# rougail-user-data-file
 

locale/fr/LC_MESSAGES/rougail_user_data_yaml.po

@@ -0,0 +1,47 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2025-04-09 08:34+0200\n"
+"PO-Revision-Date: 2025-04-09 08:35+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: pygettext.py 1.5\n"
+"X-Generator: Poedit 3.5\n"
+
+#: src/rougail/user_data_yaml/__init__.py:42
+msgid "yaml is not set in step.user_data"
+msgstr "\"yaml\" n'est pas défini dans step.user_data"
+
+#: src/rougail/user_data_yaml/__init__.py:62
+msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\""
+msgstr ""
+"ne peut charger \"{0}\", la valeur racine n'est pas une dictionnaire mais "
+"\"{1}\""
+
+#: src/rougail/user_data_yaml/__init__.py:85
+msgid "the YAML file \"{0}\""
+msgstr "le fichier YAML \"{0}\""
+
+#: src/rougail/user_data_yaml/__init__.py:116
+msgid "\"{0}\" in {1} has an unknown value"
+msgstr "\"{0}\" dans {1}  a une valeur inconnue"
+
+#: src/rougail/user_data_yaml/config.py:29
+msgid "Configuration rougail-user-data-yaml"
+msgstr "Configuration de rougail-user-data-yaml"
+
+#: src/rougail/user_data_yaml/config.py:38
+msgid "Filename"
+msgstr "Nom du fichier"
+
+#: src/rougail/user_data_yaml/config.py:49
+msgid "File that may contain secrets"
+msgstr "Le fichier peut contenir des secrets"

locale/fr/LC_MESSAGES/user_data_file.po

@@ -1,35 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR ORGANIZATION
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: 2024-11-01 12:12+0100\n"
-"PO-Revision-Date: 2024-11-01 12:13+0100\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-"X-Generator: Poedit 3.5\n"
-
-#: src/rougail/user_data_file/__init__.py:40
-msgid "file is not set in step.user_data"
-msgstr "\"file\" n'est pas défini dans step.user_data"
-
-#: src/rougail/user_data_file/__init__.py:58
-msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\""
-msgstr ""
-"ne peut charger \"{0}\", la valeur racine n'est pas une dictionnaire mais "
-"\"{1}\""
-
-#: src/rougail/user_data_file/__init__.py:66
-msgid "file ({0})"
-msgstr "fichier ({0})"
-
-#: src/rougail/user_data_file/__init__.py:88
-msgid "\"{0}\" in {1} has an unknown value"
-msgstr "\"{0}\" dans {1}  a une valeur inconnue"

locale/rougail_user_data_yaml.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-11-01 12:13+0100\n"
+"POT-Creation-Date: 2025-04-29 23:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,19 +15,31 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 
 
-#: src/rougail/user_data_file/__init__.py:40
+#: src/rougail/user_data_yaml/__init__.py:43
-msgid "file is not set in step.user_data"
+msgid "yaml is not set in step.user_data"
 msgstr ""
 
-#: src/rougail/user_data_file/__init__.py:58
+#: src/rougail/user_data_yaml/__init__.py:63
 msgid "cannot load \"{0}\", the root value is not a dict but \"{1}\""
 msgstr ""
 
-#: src/rougail/user_data_file/__init__.py:66
+#: src/rougail/user_data_yaml/__init__.py:86
-msgid "file ({0})"
+msgid "the YAML file \"{0}\""
 msgstr ""
 
-#: src/rougail/user_data_file/__init__.py:88
+#: src/rougail/user_data_yaml/__init__.py:117
 msgid "\"{0}\" in {1} has an unknown value"
 msgstr ""
 
+#: src/rougail/user_data_yaml/config.py:29
+msgid "Configuration rougail-user-data-yaml"
+msgstr ""
+
+#: src/rougail/user_data_yaml/config.py:38
+msgid "Filename"
+msgstr ""
+
+#: src/rougail/user_data_yaml/config.py:49
+msgid "File that may contain secrets"
+msgstr ""
+

pyproject.toml

@@ -3,11 +3,11 @@ build-backend = "flit_core.buildapi"
 requires = ["flit_core >=3.8.0,<4"]
 
 [project]
-name = "rougail.user_data_file"
+name = "rougail.user_data_yaml"
-version = "0.1.0"
+version = "0.2.0a7"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
-description = "Rougail user_data file"
+description = "Rougail user_data yaml"
 requires-python = ">=3.8"
 license = {file = "LICENSE"}
 classifiers = [
@@ -18,6 +18,8 @@ classifiers = [
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
     "Programming Language :: Python :: 3",
     "Operating System :: OS Independent",
     "Natural Language :: English",
@@ -29,12 +31,16 @@ dependencies = [
 ]
 
 [project.urls]
-Home = "https://forge.cloud.silique.fr/stove/rougail-user-data-file"
+Home = "https://forge.cloud.silique.fr/stove/rougail-user-data-yaml"
 
 [tool.commitizen]
 name = "cz_conventional_commits"
 tag_format = "$version"
 version_scheme = "pep440"
 version_provider = "pep621"
-#update_changelog_on_bump = true
+version_files = [
+    "src/rougail/user_data_yaml/__version__.py",
+    "pyproject.toml:version"
+]
+update_changelog_on_bump = true
 changelog_merge_prerelease = true

src/rougail/user_data_yaml/__init__.py

@@ -1,6 +1,6 @@
 """
 Silique (https://www.silique.fr)
-Copyright (C) 2024
+Copyright (C) 2024-2025
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by the
@@ -15,15 +15,16 @@ details.
 You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
-
-from rougail import RougailConfig
 from ruamel.yaml import YAML
+
+from rougail.error import ExtentionError
 from tiramisu.error import ValueOptionError, PropertiesOptionError, LeadershipError
 
 from .i18n import _
+from .__version__ import __version__
 
 
-class RougailUserDataFile:
+class RougailUserDataYaml:
     def __init__(
         self,
         config,
@@ -31,17 +32,18 @@ class RougailUserDataFile:
         rougailconfig=None,
     ) -> None:
         if rougailconfig is None:
+            from rougail import RougailConfig
             rougailconfig = RougailConfig
             user_data = rougailconfig["step.user_data"]
-            if "file" not in user_data:
+            if "yaml" not in user_data:
-                user_data.append("file")
+                user_data.append("yaml")
                 rougailconfig["step.user_data"] = user_data
         user_data = rougailconfig["step.user_data"]
-        if "file" not in user_data:
+        if "yaml" not in user_data:
-            raise Exception(_("file is not set in step.user_data"))
+            raise ExtentionError(_("yaml is not set in step.user_data"))
         self.rougailconfig = rougailconfig
-        self.filenames = self.rougailconfig["file.filename"]
+        self.filenames = self.rougailconfig["yaml.filename"]
-        self.yaml = YAML()
+        self.file_with_secrets = self.rougailconfig["yaml.file_with_secrets"]
         self.config = config
         self.errors = []
         self.warnings = []
@@ -49,36 +51,52 @@ class RougailUserDataFile:
     def run(
         self,
     ) -> None:
+        self.yaml = YAML()
         user_datas = []
-        for filename in self.filenames:
+        for idx, filename in enumerate(self.filenames):
-            with open(filename) as fh_config:
+            file_values = self.open(filename)
-                file_values = self.yaml.load(fh_config)
             if not file_values:
                 continue
+            values = {}
             if not isinstance(file_values, dict):
                 self.errors.append(
                     _(
                         'cannot load "{0}", the root value is not a dict but "{1}"'
                     ).format(filename, file_values)
                 )
-                continue
+            else:
-            values = {}
+                self.parse(
-            self.parse(
+                    values,
-                values,
+                    "",
-                "",
+                    file_values,
-                file_values,
+                    filename,
-                filename,
+                )
-            )
+            if self.file_with_secrets == 'none':
+                allow_secrets_variables = False
+            elif self.file_with_secrets == 'first':
+                allow_secrets_variables = idx == 0
+            elif self.file_with_secrets == 'last':
+                if not idx:
+                    last_filenames = len(self.filenames) - 1
+                allow_secrets_variables = idx == last_filenames
+            else:
+                allow_secrets_variables = True
             user_datas.append(
                 {
-                    "source": _("file ({0})").format(filename),
+                    "source": _('the YAML file "{0}"').format(filename),
                     "errors": self.errors,
                     "warnings": self.warnings,
                     "values": values,
+                    'options': {'allow_secrets_variables': allow_secrets_variables,
+                                },
                 }
             )
         return user_datas
 
+    def open(self, filename: str) -> dict:
+        with open(filename) as fh_config:
+            return self.yaml.load(fh_config)
+
     def parse(
         self,
         values: dict,
@@ -113,7 +131,7 @@ class RougailUserDataFile:
                 values[path] = value
 
 
-RougailUserData = RougailUserDataFile
+RougailUserData = RougailUserDataYaml
 
 
-__all__ = ("RougailUserDataFile",)
+__all__ = ("RougailUserDataYaml",)

src/rougail/user_data_yaml/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.2.0a7"

src/rougail/user_data_yaml/config.py

@@ -1,8 +1,8 @@
 """
-Config file for Rougail-user-data
+Config yaml for Rougail-user-data
 
 Silique (https://www.silique.fr)
-Copyright (C) 2024
+Copyright (C) 2024-2025
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by the
@@ -17,23 +17,25 @@ details.
 You should have received a copy of the GNU Lesser General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
+from .i18n import _
 
 
 def get_rougail_config(
     *,
     backward_compatibility=True,
 ) -> dict:
-    options = """
+    options = f"""
-file:
+yaml:
-  description: Configuration rougail-user-data-file
+  description: {_("Configuration rougail-user-data-yaml")}
   disabled:
     type: jinja
     jinja: |
-      {% if 'file' not in step.user_data %}
+      {{% if 'yaml' not in step.user_data %}}
       disabled
-      {% endif %}
+      {{% endif %}}
+
   filename:
-    description: Filename with user data
+    description: {_("Filename")}
     alternative_name: ff
     type: unix_filename
     multi: true
@@ -42,9 +44,18 @@ file:
        test_existence: True
        types:
          - file
+
+  file_with_secrets:
+    description: {_("File that may contain secrets")}
+    default: all
+    choices:
+      - all
+      - first
+      - last
+      - none
 """
     return {
-        "name": "file",
+        "name": "yaml",
         "process": "user data",
         "options": options,
         "level": 50,

src/rougail/user_data_yaml/i18n.py

@@ -1,6 +1,6 @@
 """Internationalisation utilities
 Silique (https://www.silique.fr)
-Copyright (C) 2024
+Copyright (C) 2024-2025
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by the
@@ -20,7 +20,7 @@ from gettext import translation
 from pathlib import Path
 
 t = translation(
-    "rougail_user_data_file", str(Path(__file__).parent / "locale"), fallback=True
+    "rougail_user_data_yaml", str(Path(__file__).parent / "locale"), fallback=True
 )
 
 _ = t.gettext

tests/errors/60_0family_dynamic_upper_char/file/all_exclude.yml

@@ -0,0 +1,5 @@
+{
+    "dynVal1": {
+        "var": "string1"
+    }
+}

tests/errors/60_0family_dynamic_upper_char/rougail/00-base.yml

@@ -0,0 +1,10 @@
+---
+version: '1.1'
+
+var:  [] # A suffix variable
+
+"dyn{{ identifier }}":
+  description: A dynamic family
+  dynamic:
+    variable: _.var
+  var:  # A dynamic variable

tests/errors/60_0family_dynamic_upper_char2/file/all_exclude.yml

@@ -0,0 +1,5 @@
+{
+    "dynVal1": {
+        "var": "string1"
+    }
+}

tests/errors/60_0family_dynamic_upper_char2/rougail/00-base.yml

@@ -0,0 +1,12 @@
+---
+version: '1.1'
+
+var:  #A suffix variable
+  mandatory: false
+  default: []
+
+"dyn{{ identifier }}":
+  description: A dynamic family
+  dynamic:
+    variable: _.var
+  var:  # A dynamic variable

tests/results/00_0empty/file/all.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_0empty/file/all_exclude.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_0empty/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_0version_underscore/file/all.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  version: string1
+    "rougail": {
+        "version": "string1"
+    }
+}

tests/results/00_0version_underscore/file/all_exclude.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  version: string1
+    "rougail": {
+        "version": "string1"
+    }
+}

tests/results/00_0version_underscore/file/mandatories.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  version: string1
+    "rougail": {
+        "version": "string1"
+    }
+}

tests/results/00_1empty_variable/file/all.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  empty: string1
+    "rougail": {
+        "empty": "string1"
+    }
+}

tests/results/00_1empty_variable/file/all_exclude.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  empty: string1
+    "rougail": {
+        "empty": "string1"
+    }
+}

tests/results/00_1empty_variable/file/mandatories.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  empty: string1
+    "rougail": {
+        "empty": "string1"
+    }
+}

tests/results/00_2default_calculated/file/all.yml

@@ -1,6 +1,10 @@
-rougail:
+{
-  var1: string1
+    "rougail": {
-  var2:
+        "var1": "string1",
-  - string1
+        "var2": [
-  - string2
+            "string1",
-  - string3
+            "string2",
+            "string3"
+        ]
+    }
+}

tests/results/00_2default_calculated/file/all_exclude.yml

@@ -1,6 +1,10 @@
-rougail:
+{
-  var1: string1
+    "rougail": {
-  var2:
+        "var1": "string1",
-  - string1
+        "var2": [
-  - string2
+            "string1",
-  - string3
+            "string2",
+            "string3"
+        ]
+    }
+}

tests/results/00_2default_calculated/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_2default_calculated_multi/file/all.yml

@@ -1,9 +1,14 @@
-rougail:
+{
-  var1:
+    "rougail": {
-  - string1
+        "var1": [
-  - string2
+            "string1",
-  - string3
+            "string2",
-  var2:
+            "string3"
-  - string1
+        ],
-  - string2
+        "var2": [
-  - string3
+            "string1",
+            "string2",
+            "string3"
+        ]
+    }
+}

tests/results/00_2default_calculated_multi/file/all_exclude.yml

@@ -1,9 +1,14 @@
-rougail:
+{
-  var1:
+    "rougail": {
-  - string1
+        "var1": [
-  - string2
+            "string1",
-  - string3
+            "string2",
-  var2:
+            "string3"
-  - string1
+        ],
-  - string2
+        "var2": [
-  - string3
+            "string1",
+            "string2",
+            "string3"
+        ]
+    }
+}

tests/results/00_2default_calculated_multi/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_2default_calculated_variable_transitive/file/all.yml

@@ -1,7 +1,12 @@
-rougail:
+{
-  var1:
+    "rougail": {
-  - domain1.lan
+        "var1": [
-  - domain2.lan
+            "domain1.lan",
-  var2:
+            "domain2.lan"
-  - domain1.lan
+        ],
-  - domain2.lan
+        "var2": [
+            "domain1.lan",
+            "domain2.lan"
+        ]
+    }
+}

tests/results/00_2default_calculated_variable_transitive/file/all_exclude.yml

@@ -1,7 +1,12 @@
-rougail:
+{
-  var1:
+    "rougail": {
-  - domain1.lan
+        "var1": [
-  - domain2.lan
+            "domain1.lan",
-  var2:
+            "domain2.lan"
-  - domain1.lan
+        ],
-  - domain2.lan
+        "var2": [
+            "domain1.lan",
+            "domain2.lan"
+        ]
+    }
+}

tests/results/00_2default_calculated_variable_transitive/file/mandatories.yml

@@ -1,4 +1,8 @@
-rougail:
+{
-  var1:
+    "rougail": {
-  - domain1.lan
+        "var1": [
-  - domain2.lan
+            "domain1.lan",
+            "domain2.lan"
+        ]
+    }
+}

tests/results/00_4load_subfolder/file/all.yml

@@ -1,2 +1,6 @@
-rougail:
+{
-  var1: string1
+    "rougail": {
+        "var1": "string1",
+        "var2": "string1"
+    }
+}

tests/results/00_4load_subfolder/file/all_exclude.yml

@@ -1,2 +1,6 @@
-rougail:
+{
-  var1: string1
+    "rougail": {
+        "var1": "string1",
+        "var2": "string1"
+    }
+}

tests/results/00_4load_subfolder/file/mandatories.yml

@@ -1,2 +1,6 @@
-rougail:
+{
-  var1: string1
+    "rougail": {
+        "var1": "string1",
+        "var2": "string1"
+    }
+}

tests/results/00_4load_subfolder/makedict/all.json

@@ -1,3 +1,4 @@
 {
-    "rougail.var1": "string1"
+    "rougail.var1": "string1",
+    "rougail.var2": "string1"
 }

tests/results/00_4load_subfolder/makedict/mandatories.json

@@ -1,3 +1,4 @@
 {
-    "rougail.var1": "string1"
+    "rougail.var1": "string1",
+    "rougail.var2": "string1"
 }

tests/results/00_5load_notype/file/all.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  without_type: string1
+    "rougail": {
+        "without_type": "string1"
+    }
+}

tests/results/00_5load_notype/file/all_exclude.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  without_type: string1
+    "rougail": {
+        "without_type": "string1"
+    }
+}

tests/results/00_5load_notype/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6boolean/file/all.yml

@@ -1,7 +1,10 @@
-rougail:
+{
-  var1: true
+    "rougail": {
-  var2: true
+        "var1": true,
-  var3: true
+        "var2": true,
-  var4: true
+        "var3": true,
-  var5: true
+        "var4": true,
-  var6: true
+        "var5": true,
+        "var6": true
+    }
+}

tests/results/00_6boolean/file/all_exclude.yml

@@ -1,7 +1,10 @@
-rougail:
+{
-  var1: true
+    "rougail": {
-  var2: true
+        "var1": true,
-  var3: true
+        "var2": true,
-  var4: true
+        "var3": true,
-  var5: true
+        "var4": true,
-  var6: true
+        "var5": true,
+        "var6": true
+    }
+}

tests/results/00_6boolean/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6boolean_no_mandatory/file/all.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  variable: true
+    "rougail": {
+        "variable": true
+    }
+}

tests/results/00_6boolean_no_mandatory/file/all_exclude.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  variable: true
+    "rougail": {
+        "variable": true
+    }
+}

tests/results/00_6boolean_no_mandatory/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6choice/file/all.yml

@@ -1,7 +1,10 @@
-rougail:
+{
-  var1: a
+    "rougail": {
-  var2: a
+        "var1": "a",
-  var3: a
+        "var2": "a",
-  var4:
+        "var3": "a",
-  var5: a
+        "var4": null,
-  var6: 1
+        "var5": "a",
+        "var6": 1
+    }
+}

tests/results/00_6choice/file/all_exclude.yml

@@ -1,7 +1,10 @@
-rougail:
+{
-  var1: a
+    "rougail": {
-  var2: a
+        "var1": "a",
-  var3: a
+        "var2": "a",
-  var4:
+        "var3": "a",
-  var5: a
+        "var4": null,
-  var6: 1
+        "var5": "a",
+        "var6": 1
+    }
+}

tests/results/00_6choice/file/mandatories.yml

@@ -1,3 +1,6 @@
-rougail:
+{
-  var1: a
+    "rougail": {
-  var2: a
+        "var1": "a",
+        "var2": "a"
+    }
+}

tests/results/00_6choice_calculation/file/all.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  var: 0
+    "rougail": {
+        "var": 0
+    }
+}

tests/results/00_6choice_calculation/file/all_exclude.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  var: 0
+    "rougail": {
+        "var": 0
+    }
+}

tests/results/00_6choice_calculation/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6choice_link/file/all.yml

@@ -0,0 +1,6 @@
+{
+    "rougail": {
+        "var1": "a",
+        "var2": "a"
+    }
+}

tests/results/00_6choice_link/file/all_exclude.yml

@@ -0,0 +1,6 @@
+{
+    "rougail": {
+        "var1": "a",
+        "var2": "a"
+    }
+}

tests/results/00_6choice_link/file/mandatories.yml

@@ -0,0 +1,5 @@
+{
+    "rougail": {
+        "var1": "a"
+    }
+}

tests/results/00_6choice_link/makedict/all.json

@@ -0,0 +1,4 @@
+{
+    "rougail.var1": "a",
+    "rougail.var2": "a"
+}

tests/results/00_6choice_link/makedict/mandatories.json

@@ -0,0 +1,4 @@
+{
+    "rougail.var1": "a",
+    "rougail.var2": "a"
+}

tests/results/00_6choice_variable/file/all.yml

@@ -1,6 +1,10 @@
-rougail:
+{
-  var1:
+    "rougail": {
-  - string1
+        "var1": [
-  - string2
+            "string1",
-  - string3
+            "string2",
-  var2: string1
+            "string3"
+        ],
+        "var2": "string1"
+    }
+}

tests/results/00_6choice_variable/file/all_exclude.yml

@@ -1,6 +1,10 @@
-rougail:
+{
-  var1:
+    "rougail": {
-  - string1
+        "var1": [
-  - string2
+            "string1",
-  - string3
+            "string2",
-  var2: string1
+            "string3"
+        ],
+        "var2": "string1"
+    }
+}

tests/results/00_6choice_variable/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6choice_variable_link/file/all.yml

@@ -0,0 +1,11 @@
+{
+    "rougail": {
+        "var1": [
+            "string1",
+            "string2",
+            "string3"
+        ],
+        "var2": "string1",
+        "var3": "string1"
+    }
+}

tests/results/00_6choice_variable_link/file/all_exclude.yml

@@ -0,0 +1,11 @@
+{
+    "rougail": {
+        "var1": [
+            "string1",
+            "string2",
+            "string3"
+        ],
+        "var2": "string1",
+        "var3": "string1"
+    }
+}

tests/results/00_6choice_variable_link/file/mandatories.yml

@@ -0,0 +1 @@
+{}

tests/results/00_6choice_variable_link/makedict/all.json

@@ -0,0 +1,9 @@
+{
+    "rougail.var1": [
+        "string1",
+        "string2",
+        "string3"
+    ],
+    "rougail.var2": "string1",
+    "rougail.var3": "string1"
+}

tests/results/00_6choice_variable_link/makedict/mandatories.json

@@ -0,0 +1,9 @@
+{
+    "rougail.var1": [
+        "a",
+        "b",
+        "c"
+    ],
+    "rougail.var2": "a",
+    "rougail.var3": "a"
+}

tests/results/00_6choice_variable_link2/file/all.yml

@@ -0,0 +1,13 @@
+{
+    "rougail": {
+        "var1": [
+            "string1",
+            "string2",
+            "string3"
+        ],
+        "var2": "string1",
+        "family": {
+            "var3": "string1"
+        }
+    }
+}

tests/results/00_6choice_variable_link2/file/all_exclude.yml

@@ -0,0 +1,13 @@
+{
+    "rougail": {
+        "var1": [
+            "string1",
+            "string2",
+            "string3"
+        ],
+        "var2": "string1",
+        "family": {
+            "var3": "string1"
+        }
+    }
+}

tests/results/00_6choice_variable_link2/file/mandatories.yml

@@ -0,0 +1 @@
+{}

tests/results/00_6choice_variable_link2/makedict/all.json

@@ -0,0 +1,9 @@
+{
+    "rougail.var1": [
+        "string1",
+        "string2",
+        "string3"
+    ],
+    "rougail.var2": "string1",
+    "rougail.family.var3": "string1"
+}

tests/results/00_6choice_variable_link2/makedict/mandatories.json

@@ -0,0 +1,9 @@
+{
+    "rougail.var1": [
+        "a",
+        "b",
+        "c"
+    ],
+    "rougail.var2": "a",
+    "rougail.family.var3": "a"
+}

tests/results/00_6custom/file/all.yml

@@ -1,3 +1,6 @@
-rougail:
+{
-  custom1: string1
+    "rougail": {
-  custom2: string1
+        "custom1": "string1",
+        "custom2": "string1"
+    }
+}

tests/results/00_6custom/file/all_exclude.yml

@@ -1,3 +1,6 @@
-rougail:
+{
-  custom1: string1
+    "rougail": {
-  custom2: string1
+        "custom1": "string1",
+        "custom2": "string1"
+    }
+}

tests/results/00_6custom/file/mandatories.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  custom1: string1
+    "rougail": {
+        "custom1": "string1"
+    }
+}

tests/results/00_6domainname/file/all.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  variable: domain1.lan
+    "rougail": {
+        "variable": "domain1.lan"
+    }
+}

tests/results/00_6domainname/file/all_exclude.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  variable: domain1.lan
+    "rougail": {
+        "variable": "domain1.lan"
+    }
+}

tests/results/00_6domainname/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6domainname_params/file/all.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  variable: domain1.lan
+    "rougail": {
+        "variable": "domain1.lan"
+    }
+}

tests/results/00_6domainname_params/file/all_exclude.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  variable: domain1.lan
+    "rougail": {
+        "variable": "domain1.lan"
+    }
+}

tests/results/00_6domainname_params/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6float/file/all.yml

@@ -1,7 +1,10 @@
-rougail:
+{
-  var1: 1.1
+    "rougail": {
-  var2: 1.1
+        "var1": 1.1,
-  var3: 1.1
+        "var2": 1.1,
-  var4: 1.1
+        "var3": 1.1,
-  var5: 1.1
+        "var4": 1.1,
-  var6: 1.1
+        "var5": 1.1,
+        "var6": 1.1
+    }
+}

tests/results/00_6float/file/all_exclude.yml

@@ -1,7 +1,10 @@
-rougail:
+{
-  var1: 1.1
+    "rougail": {
-  var2: 1.1
+        "var1": 1.1,
-  var3: 1.1
+        "var2": 1.1,
-  var4: 1.1
+        "var3": 1.1,
-  var5: 1.1
+        "var4": 1.1,
-  var6: 1.1
+        "var5": 1.1,
+        "var6": 1.1
+    }
+}

tests/results/00_6float/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6number/file/all.yml

@@ -1,7 +1,10 @@
-rougail:
+{
-  var1: 1
+    "rougail": {
-  var2: 1
+        "var1": 1,
-  var3: 1
+        "var2": 1,
-  var4: 1
+        "var3": 1,
-  var5: 1
+        "var4": 1,
-  var6: 1
+        "var5": 1,
+        "var6": 1
+    }
+}

tests/results/00_6number/file/all_exclude.yml

@@ -1,7 +1,10 @@
-rougail:
+{
-  var1: 1
+    "rougail": {
-  var2: 1
+        "var1": 1,
-  var3: 1
+        "var2": 1,
-  var4: 1
+        "var3": 1,
-  var5: 1
+        "var4": 1,
-  var6: 1
+        "var5": 1,
+        "var6": 1
+    }
+}

tests/results/00_6number/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}

tests/results/00_6port/file/all.yml

@@ -1,4 +1,7 @@
-rougail:
+{
-  variable1: '80'
+    "rougail": {
-  variable2: '80'
+        "variable1": "80",
-  variable3: '80'
+        "variable2": "80",
+        "variable3": "80"
+    }
+}

tests/results/00_6port/file/all_exclude.yml

@@ -1,4 +1,7 @@
-rougail:
+{
-  variable1: '80'
+    "rougail": {
-  variable2: '80'
+        "variable1": "80",
-  variable3: '80'
+        "variable2": "80",
+        "variable3": "80"
+    }
+}

tests/results/00_6port/file/mandatories.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  variable1: '80'
+    "rougail": {
+        "variable1": "80"
+    }
+}

tests/results/00_6regexp/file/all.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  var: '#b1b1b1'
+    "rougail": {
+        "var": "#b1b1b1"
+    }
+}

tests/results/00_6regexp/file/all_exclude.yml

@@ -1,2 +1,5 @@
-rougail:
+{
-  var: '#b1b1b1'
+    "rougail": {
+        "var": "#b1b1b1"
+    }
+}

tests/results/00_6regexp/file/mandatories.yml

@@ -1 +1 @@
-{}
+{}