bump: version 0.1.0a19 → 0.1.0a20

CHANGELOG.md

@@ -0,0 +1,155 @@
+## 0.1.0a20 (2025-11-03)
+
+### Feat
+
+- allow extra kwargs
+
+### Fix
+
+- update tests
+
+## 0.1.0a19 (2025-10-10)
+
+### Fix
+
+- update tests
+- tests
+
+## 0.1.0a18 (2025-09-30)
+
+### Feat
+
+- family or dynamic could needs type attribute
+
+## 0.1.0a17 (2025-09-29)
+
+### Feat
+
+- param line size
+
+### Fix
+
+- support numeric string
+
+## 0.1.0a16 (2025-09-29)
+
+### Feat
+
+- variable with an index is an integer variable
+- default value for a calculated variable with an unknown optional variable
+- **#26**: convert cidr and network_cidr format
+- add integer type which will replace number type
+
+## 0.1.0a15 (2025-09-22)
+
+### Fix
+
+- dictionary => structure
+
+## 0.1.0a14 (2025-06-18)
+
+### Fix
+
+- rougail separation
+
+## 0.1.0a13 (2025-05-15)
+
+### Fix
+
+- no multi empty line when a variable finish by a multi line description
+
+## 0.1.0a12 (2025-05-12)
+
+### Fix
+
+- black
+
+## 0.1.0a11 (2025-05-09)
+
+### Fix
+
+- format with default_dictionary_format_version configuration
+
+## 0.1.0a10 (2025-05-02)
+
+### Fix
+
+- do not load use_data with rougail cli
+- support {{ suffix }} name in 1.1 format version
+
+## 0.1.0a9 (2025-04-30)
+
+### Feat
+
+- add yamllint validation
+
+### Fix
+
+- update tests
+- add version
+
+## 0.1.0a8 (2025-04-01)
+
+### Fix
+
+- update tests
+
+## 0.1.0a7 (2025-03-30)
+
+### Feat
+
+- support multi lines for help
+
+## 0.1.0a6 (2025-03-28)
+
+### Fix
+
+- do not add multi \n at ends of export
+
+## 0.1.0a5 (2025-03-27)
+
+### Fix
+
+- if and for in 3 lines
+
+## 0.1.0a4 (2025-03-27)
+
+### Feat
+
+- format jinja template
+
+## 0.1.0a3 (2025-03-27)
+
+### Feat
+
+- add secret_manager support
+- add Namespace(Param|Calculation) support
+
+### Fix
+
+- do not add namespace in param
+- an empty variable is []
+
+## 0.1.0a2 (2025-03-26)
+
+### Fix
+
+- pyproject.toml
+
+## 0.1.0a1 (2025-03-26)
+
+### Fix
+
+- add pyproject.toml
+
+## 0.1.0a0 (2025-02-10)
+
+### Feat
+
+- output return status too
+
+## 0.0.1a0 (2025-01-04)
+
+### Fix
+
+- remove prefix_path

locale/fr/LC_MESSAGES/rougail_output_formatter.po

@@ -0,0 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"POT-Creation-Date: 2025-09-29 11:38+0200\n"
+"PO-Revision-Date: 2025-09-29 11:46+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.7\n"
+
+#: src/rougail/output_formatter/__init__.py:105
+msgid "the \"step.output\" is not set to \"{0}\""
+msgstr "\"step.output\" n'est pas défini pour \"{0}\""
+
+#: src/rougail/output_formatter/__init__.py:155
+msgid "only one file is allowed"
+msgstr "seulement un fichier est autorisé"
+
+#: src/rougail/output_formatter/__init__.py:158
+msgid "only a file is allowed"
+msgstr "seulement un fichier est autorisé"
+
+#: src/rougail/output_formatter/config.py:59
+msgid "Configuration for rougail-ouput-formatter"
+msgstr "Configuration pour rougail-ouput-formatter"
+
+#: src/rougail/output_formatter/config.py:61
+msgid "Line size"
+msgstr "Taille des lignes"

locale/rougail_output_formatter.pot

@@ -0,0 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR ORGANIZATION
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2025-09-29 11:47+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"
+"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"
+
+
+#: src/rougail/output_formatter/__init__.py:105
+msgid "the \"step.output\" is not set to \"{0}\""
+msgstr ""
+
+#: src/rougail/output_formatter/__init__.py:155
+msgid "only one file is allowed"
+msgstr ""
+
+#: src/rougail/output_formatter/__init__.py:158
+msgid "only a file is allowed"
+msgstr ""
+
+#: src/rougail/output_formatter/config.py:59
+msgid "Configuration for rougail-ouput-formatter"
+msgstr ""
+
+#: src/rougail/output_formatter/config.py:61
+msgid "Line size"
+msgstr ""
+

pyproject.toml

@@ -0,0 +1,44 @@
+[build-system]
+build-backend = "flit_core.buildapi"
+requires = ["flit_core >=3.8.0,<4"]
+
+[project]
+name = "rougail.output_formatter"
+version = "0.1.0a20"
+authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
+readme = "README.md"
+description = "Rougail output formatter"
+requires-python = ">=3.8"
+license = {file = "LICENSE"}
+classifiers = [
+    "License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)",
+    "Programming Language :: Python",
+    "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",
+    "Natural Language :: French",
+
+]
+dependencies = [
+    "rougail >= 1.1,<2",
+    "djlint == 1.36.4",
+]
+
+[project.urls]
+Home = "https://forge.cloud.silique.fr/stove/rougail-output-formatter"
+
+[tool.commitizen]
+name = "cz_conventional_commits"
+tag_format = "$version"
+version_scheme = "pep440"
+version_provider = "pep621"
+version_files = [
+    "src/rougail/output_formatter/__version__.py",
+    "pyproject.toml:version"
+]
+update_changelog_on_bump = true
+changelog_merge_prerelease = true

src/rougail/output_formatter/__init__.py

@@ -1,7 +1,7 @@
 """
 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
 Free Software Foundation, either version 3 of the License, or (at your
@@ -16,33 +16,81 @@ 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 io import BytesIO
 from pathlib import Path
 from typing import Optional
 
 from ruamel.yaml import YAML, CommentedMap
+from ruamel.yaml.representer import RoundTripRepresenter
 from ruamel.yaml.tokens import CommentToken
 from ruamel.yaml.error import CommentMark
 from ruamel.yaml.comments import CommentedSeq
-from ruamel.yaml.scalarstring import LiteralScalarString, FoldedScalarString
+from ruamel.yaml.scalarstring import (
+    LiteralScalarString,
+    FoldedScalarString,
+    ScalarString,
+)
+
+from djlint.settings import Config
+from djlint.reformat import formatter
 
-from tiramisu import undefined
 from tiramisu.config import get_common_path
 
 from rougail.convert import RougailConvert
-from rougail.object_model import Variable, Family, Calculation, JinjaCalculation, IdentifierCalculation, IdentifierPropertyCalculation, IdentifierParam, IndexCalculation, IndexParam, Param
-from rougail.utils import normalize_family
+from rougail.convert.object_model import (
+    Variable,
+    Family,
+    Calculation,
+    JinjaCalculation,
+    IdentifierCalculation,
+    IdentifierPropertyCalculation,
+    NamespaceCalculation,
+    IdentifierParam,
+    IndexCalculation,
+    VariableCalculation,
+    IndexParam,
+    NamespaceParam,
+    Param,
+    AnyParam,
+)
+from rougail.tiramisu import normalize_family, RENAME_TYPE
+from rougail.utils import undefined
 
 from .upgrade import RougailUpgrade
+from .i18n import _
+from .__version__ import __version__
 
 
-def _(text):
-    return text
+# XXX explicit null
+def represent_none(self, data):
+    return self.represent_scalar("tag:yaml.org,2002:null", "null")
+
+
+def represent_str(self, data):
+    if data == "":
+        return self.represent_scalar("tag:yaml.org,2002:null", "")
+    return self.represent_scalar("tag:yaml.org,2002:str", data)
+
+
+RoundTripRepresenter.add_representer(type(None), represent_none)
+RoundTripRepresenter.add_representer(str, represent_str)
+# XXX
+
+
+class RougailConvertFormatter(RougailConvert):
+    def parse_root_file(
+        self,
+        filename: str,
+        path: str,
+        version: str,
+        objects: dict,
+    ) -> None:
+        self.objects = objects
+        super().parse_root_file(filename, path, version, objects)
 
 
 class RougailOutputFormatter:
-    output_name = 'formatter'
+    output_name = "formatter"
 
     def __init__(
         self,
@@ -51,30 +99,82 @@ class RougailOutputFormatter:
         rougailconfig: "RougailConfig" = None,
         user_data_errors: Optional[list] = None,
         user_data_warnings: Optional[list] = None,
+        **kwargs,
     ) -> None:
         self.basic_types = {
             str: "string",
-            int: "number",
+            int: "integer",
             bool: "boolean",
             float: "float",
         }
         if rougailconfig is None:
             from rougail import RougailConfig
+
             rougailconfig = RougailConfig
             rougailconfig["step.output"] = self.output_name
-        if rougailconfig["step.output"] != self.output_name:
-            raise ExtentionError(_('the "step.output" is not set to "{0}"').format(self.output_name))
+        self.rougailconfig = rougailconfig
+        if self.rougailconfig["step.output"] != self.output_name:
+            raise ExtentionError(
+                _('the "step.output" is not set to "{0}"').format(self.output_name)
+            )
         # yaml.top_level_colon_align = True
-        self.main_namespace = rougailconfig["main_namespace"]
-        filenames = rougailconfig["main_dictionaries"]
-        if len(rougailconfig["main_dictionaries"]) > 1:
-            raise Exception(_('only one file is allowed'))
+        self.main_namespace = normalize_family(self.rougailconfig["main_namespace"])
+        self.has_default_structural_format_version = (
+            self.rougailconfig["default_structural_format_version"] is not None
+        )
+        self.config = Config()
+        self.config.profile = "jinja"
+        self.config.line_break_after_multiline_tag = True
+        self.config.indent = "  "
+        self.attributes = {}
+
+        self.yaml = YAML()
+        self.yaml.width = self.rougailconfig["formatter.line_width"]
+        self.conv_yaml = YAML()
+
+    def run(self):
+        self.upgrade()
+        self.families = {self.main_namespace: CommentedMap()}
+        self.parse()
+        self.yaml.indent(mapping=2, sequence=4, offset=2)
+        self.yaml.version = "1.2"
+        self.yaml.explicit_start = True
+        self.yaml.explicit_end = True
+        self.default_flow_style = False
+        with BytesIO() as ymlfh:
+            families = self.families[self.main_namespace]
+            if not families:
+                self.yaml.dump("", ymlfh)
+            else:
+                self.yaml.dump(families, ymlfh)
+            ret = ymlfh.getvalue().decode("utf-8").strip()
+        return True, ret
+
+    def get_attributes(self, obj, excludes=[]) -> dict:
+        type_name = obj.__name__
+        if type_name == "Variable" and excludes == []:
+            raise Exception("pff")
+        if type_name not in self.attributes:
+            self.attributes[type_name] = {
+                str(attr): o.default
+                for attr, o in obj.model_fields.items()
+                if str(attr) not in excludes
+            }
+        return self.attributes[type_name]
+
+    def upgrade(self) -> None:
+        filenames = self.rougailconfig["main_structural_directories"]
+        if len(filenames) > 1:
+            raise Exception(_("only one file is allowed"))
         filename = Path(filenames[0])
         if not filename.is_file():
-            raise Exception(_('only a file is allowed'))
-        self.original_yaml = RougailUpgrade(rougailconfig).run(filename)
-        datas = RougailUpgrade(rougailconfig).run(filename)
-        self.rougail = RougailConvert(rougailconfig)
+            raise Exception(_("only a file is allowed"))
+
+        self.version_name, self.original_yaml = RougailUpgrade(self.rougailconfig).run(
+            filename
+        )
+        self.version_name, datas = RougailUpgrade(self.rougailconfig).run(filename)
+        self.rougail = RougailConvertFormatter(self.rougailconfig)
         self.rougail.load_config()
         self.rougail.init()
         self.filename_str = str(filename)
@@ -93,54 +193,36 @@ class RougailOutputFormatter:
             "1.1",
             datas,
         )
-        self.yaml = YAML()
-
-    def run(self):
-        self.families_attributes = {attr: obj.get("default") for attr, obj in self.rougail.family.model_json_schema()["properties"].items()}
-        self.dynamics_attributes = {attr: obj.get("default") for attr, obj in self.rougail.dynamic.model_json_schema()["properties"].items()}
-        self.variables_attributes = {attr: obj.get("default") for attr, obj in self.rougail.variable.model_json_schema()["properties"].items()}
-        self.families = {None: CommentedMap()}
-        self.parse()
-        self.yaml.indent(mapping=2, sequence=4, offset=2)
-        self.yaml.explicit_start=True
-        self.default_flow_style = False
-        with BytesIO() as ymlfh:
-            self.yaml.dump(self.families[None], ymlfh)
-            ret = ymlfh.getvalue().decode("utf-8").strip() + '\n'
-        return ret
 
     def print(self):
-        print(self.run())
+        ret, data = self.run()
+        print(data)
+        return ret
 
     def parse(self):
-        # FIXME path to relative !
-        if self.rougail.namespace:
-            version_path = f'{self.rougail.namespace}.version'
-        else:
-            version_path = 'version'
-        if version_path in self.rougail.paths._data:
-            version_name = '_version'
-        else:
-            version_name = 'version'
-        self.families[None][version_name] = None
-        self.families[None].yaml_value_comment_extend(version_name, [CommentToken('\n\n', CommentMark(0)), None])
-        version = None
+        self.families[self.main_namespace][self.version_name] = float(
+            self.rougail.version
+        )
+        self.remaining = len(self.rougail.paths._data)
         for path, obj in self.rougail.paths._data.items():
-            if version is None or version == '':
-                version = obj.version
+            self.remaining -= 1
             if path == self.rougail.namespace:
-                self.families[path] = self.families[None]
+                #                self.families[path] = self.families[None]
                 continue
             if isinstance(obj, Family):
                 self.parse_family(path, obj)
-            if isinstance(obj, Variable):
+            elif isinstance(obj, Variable):
                 self.parse_variable(path, obj)
-        if not version:
-            raise Exception(_(f'no variables in file {self.filename_str}'))
-        self.families[None][version_name] = float(version)
+        if list(self.families[self.main_namespace]) != [self.version_name]:
+            # just to add an empty line space after "version"
+            self.families[self.main_namespace].yaml_value_comment_extend(
+                self.version_name, [CommentToken("\n\n", CommentMark(0)), None]
+            )
+        if self.has_default_structural_format_version:
+            del self.families[self.main_namespace][self.version_name]
 
     def parse_family(self, path, obj):
-        children = [p.rsplit('.', 1)[-1] for p in self.rougail.parents[path]]
+        children = [p.rsplit(".", 1)[-1] for p in self.rougail.parents[path]]
         parent, name = self.get_parent_name(path)
         ret = self.families[parent]
         family = CommentedMap()
@@ -155,11 +237,11 @@ class RougailOutputFormatter:
                 force_keys = list(yaml_data)
         type_ = obj.type
         if type_ == "dynamic":
-            attributes = self.dynamics_attributes
+            attributes = self.get_attributes(self.rougail.dynamic)
         else:
-            attributes = self.families_attributes
+            attributes = self.get_attributes(self.rougail.family)
         for attr, default_value in attributes.items():
-            if attr in ["name", "path", "namespace", "version", "path_prefix", "xmlfiles"]:
+            if attr in ["name", "path", "namespace", "version", "xmlfiles"]:
                 continue
             try:
                 value = getattr(obj, attr)
@@ -168,21 +250,58 @@ class RougailOutputFormatter:
             if attr != "type" and attr not in force_keys and value == default_value:
                 continue
             if attr in children:
-                attr = f'_{attr}'
-            value = self.object_to_yaml(attr, type_, value, False, path)
-            family[attr] = value
-        if type_ == "dynamic" or (children and type_ == 'family'):
-            if "_type" in family:
-                del family["_type"]
+                attr = f"_{attr}"
+            family[attr] = self.object_to_yaml(attr, type_, value, False, path)
+        if type_ == "dynamic" or (children and type_ == "family"):
+            tmp_family = family.copy()
+            if "_type" in tmp_family:
+                del tmp_family["_type"]
             else:
-                del family["type"]
+                del tmp_family["type"]
+            for child_path in self.rougail.parents[path]:
+                child = self.rougail.objects
+                if self.rougail.has_namespace:
+                    split_path = child_path.split('.')[1:]
+                else:
+                    split_path = child_path.split('.')
+                for cpath in split_path:
+                    if cpath not in child and '{{ identifier }}' in cpath:
+                        # support format 1.0
+                        if cpath.replace('{{ identifier }}', '') in child:
+                            cpath = cpath.replace('{{ identifier }}', '')
+                        elif cpath.replace('{{ identifier }}', '{{ suffix }}') in child:
+                            cpath = cpath.replace('{{ identifier }}', '{{ suffix }}')
+                    child = child[cpath]
+                tmp_family[cpath] =  child
+            family_type = self.rougail.is_family_or_variable("", tmp_family, False, "")
+            if family_type == "family":
+                family_type = self.rougail.get_family_or_variable_type(tmp_family)
+            if family_type is None:
+                family_type = 'family'
+            if family_type == type_:
+                if "_type" in family:
+                    del family["_type"]
+                else:
+                    del family["type"]
         if not set(family):
             ret[name] = CommentedMap()
-            ret.yaml_value_comment_extend(name, [CommentToken('\n\n', CommentMark(0)), None])
-        elif not set(family) - {'description'}:
-            # 
+            # just add an empty line after a family
+            ret.yaml_value_comment_extend(
+                name, [CommentToken("\n\n", CommentMark(0)), None]
+            )
+        elif not set(family) - {"description"}:
+            #
             ret[name] = CommentedMap()
-            ret.yaml_add_eol_comment(family["description"] + '\n\n', name)
+            add_column = 3
+            path_len = path.count(".")
+            if self.rougail.namespace:
+                path_len -= 1
+            column = path_len * 2 + len(name) + add_column
+            if self.remaining:
+                description = family["description"].strip() + "\n\n"
+            else:
+                description = family["description"].strip()
+            ret.yaml_add_eol_comment(description, name, column=column)
         else:
             self.add_space(family)
             ret[name] = family
@@ -203,61 +322,140 @@ class RougailOutputFormatter:
                 force_keys = list(yaml_data)
         multi = obj.multi or isinstance(obj.default, list)
         type_ = obj.type
-        for attr, default_value in self.variables_attributes.items():
-            if attr in ["name", "path", "namespace", "version", "path_prefix", "xmlfiles"]:
-                continue
-            try:
-                value = getattr(obj, attr)
-            except AttributeError:
-                continue
+        if type_ in RENAME_TYPE:
+            type_ = RENAME_TYPE[type_]
+        if type_ == 'cidr' or type_ == 'network_cidr':
+            if type_ == 'cidr':
+                type_ = 'ip'
+            else:
+                type_ = 'network'
+            if not obj.params:
+                obj.params = []
+            key = 'cidr'
+            param = AnyParam(
+                        key='cidr',
+                        value=True,
+                        type="any",
+                        path=None,
+                        attribute=None,
+                        family_is_dynamic=None,
+                        namespace=self.rougail.namespace,
+                        xmlfiles=obj.xmlfiles,
+                    )
+            obj.params.append(param)
+        for attr, default_value in self.get_attributes(
+            self.rougail.variable, ["name", "path", "namespace", "version", "xmlfiles"]
+        ).items():
+            if attr == "type":
+                value = type_
+            else:
+                try:
+                    value = getattr(obj, attr)
+                except AttributeError:
+                    continue
             if attr not in force_keys and value == default_value:
                 continue
             value = self.object_to_yaml(attr, type_, value, multi, path)
             variable[attr] = value
-        if variable.get("mandatory") is True and None not in variable.get("choices", []):
+        if variable.get("mandatory") is True and None not in variable.get(
+            "choices", []
+        ):
             del variable["mandatory"]
         if "default" in variable:
-            if "type" in variable and variable["type"] in ["string", "boolean", "number", "float"]:
+            if isinstance(obj.default, VariableCalculation):
+                is_multi = "multi" in variable and variable["multi"] is True
+                if "type" in variable or is_multi:
+                    other_path = self.rougail.paths.get_full_path(obj.default.variable, path)
+                    if other_path in self.rougail.paths:
+                        other_obj = self.rougail.paths[other_path]
+                        if "type" in variable and variable["type"] == other_obj.type:
+                            del variable["type"]
+                        if is_multi and obj.multi:
+                            del variable["multi"]
+            if "type" in variable and isinstance(obj.default, IndexCalculation) and variable["type"] == "integer":
+                del variable["type"]
+            if "type" in variable and variable["type"] in [
+                "string",
+                "boolean",
+                "integer",
+                "float",
+            ]:
                 if variable["default"] and isinstance(variable["default"], list):
                     tested_value = variable["default"][0]
                 else:
                     tested_value = variable["default"]
                 if variable["type"] == self.basic_types.get(type(tested_value), None):
                     del variable["type"]
-            if "multi" in variable and variable["multi"] is True and isinstance(variable["default"], list):
+            if (
+                "multi" in variable
+                and variable["multi"] is True
+                and isinstance(variable["default"], list)
+            ):
                 del variable["multi"]
         elif variable.get("type") == "choice" and "choices" in variable:
             del variable["type"]
         elif variable.get("type") == "string":
             # default type is string
             del variable["type"]
-            if set(variable) in [{"multi"}, {'multi', 'description'}]:
+            if set(variable) in [{"multi"}, {"multi", "description"}]:
                 variable["default"] = []
                 variable.pop("multi")
         elif variable.get("type") == "boolean" and not multi:
             # if boolean, the default value is True
             del variable["type"]
             variable["default"] = True
-        if not isinstance(variable.get("default"), dict) and not set(variable) - {'default', 'description'}:
+        if (
+            "default" not in variable
+            and variable.get("multi") is True
+            and not set(variable) - {"default", "description", "multi"}
+        ):
+            variable["default"] = []
+            del variable["multi"]
+        if not isinstance(variable.get("default"), dict) and not set(variable) - {
+            "default",
+            "description",
+        }:
             # shorthand notation
-            default = variable.get('default')
+            default = variable.get("default")
             ret[name] = default
+            add_column = 3
             if isinstance(default, list):
                 ret[name] = CommentedSeq()
+                if not default:
+                    add_column += 3
                 for d in default:
                     ret[name].append(d)
             else:
-                ret[name] = default
+                if default is None:
+                    ret[name] = ""
+                else:
+                    ret[name] = default
+                    add_column += len(str(default)) + 1
+                    if isinstance(default, str):
+                        # some entries have ' (like '8080') those characters are not count, so add it
+                        with BytesIO() as ymlfh:
+                            self.conv_yaml.dump(default, ymlfh)
+                            ret2 = ymlfh.getvalue().decode("utf-8").strip()
+                        if ret2.endswith("..."):
+                            ret2 = ret2[:-3].strip()
+                        if default != ret2:
+                            add_column += len(ret2) - len(default)
             if "description" in variable:
-                description = variable["description"]
-                if not multi or not default:
+                description = variable["description"].strip()
+                if self.remaining and (not multi or not default):
                     description += "\n\n"
-                ret.yaml_add_eol_comment(description, name)
+                path_len = path.count(".")
+                if self.rougail.namespace:
+                    path_len -= 1
+                column = path_len * 2 + len(name) + add_column
+                ret.yaml_add_eol_comment(description, name, column=column)
                 if multi and default:
                     self.add_space(ret)
             else:
                 self.add_space(ret)
         else:
+            if "default" in variable and variable["default"] is None:
+                variable["default"] = ""
             ret[name] = variable
             self.add_space(variable)
 
@@ -265,85 +463,142 @@ class RougailOutputFormatter:
         def _get_last_obj(o, parent, param, typ):
             if isinstance(o, CommentedMap):
                 param = list(o)[-1]
-                return _get_last_obj(o[param], o, param, 'map')
+                return _get_last_obj(o[param], o, param, "map")
             if isinstance(o, CommentedSeq):
                 param = len(o) - 1
-                return _get_last_obj(o[param], o, param, 'seq')
+                return _get_last_obj(o[param], o, param, "seq")
             return typ, parent, param
+
         param = list(obj)[-1]
-        typ, parent, param = _get_last_obj(obj[param], obj, param, 'map')
-        if typ == 'seq':
+        typ, parent, param = _get_last_obj(obj[param], obj, param, "map")
+        if isinstance(parent[param], ScalarString):
+            enter = "\n"
+        else:
+            enter = "\n\n"
+        if typ == "seq":
             func = parent.yaml_key_comment_extend
         else:
             func = parent.yaml_value_comment_extend
-        func(param, [CommentToken('\n\n', CommentMark(0)), None])
+        if self.remaining:
+            # just to add empty line
+            func(param, [CommentToken(enter, CommentMark(0)), None])
 
     def object_to_yaml(self, key, type_, value, multi, object_path):
         if isinstance(value, list):
-            if key == 'params':
+            if key == "params":
                 new_values = CommentedMap()
             else:
                 new_values = CommentedSeq()
             for v in value:
                 new_value = self.object_to_yaml(key, type_, v, multi, object_path)
-                if key == 'params':
+                if key == "params":
+                    if "min_number" in new_value:
+                        new_value["min_integer"] = new_value.pop("min_number")
+                    if "max_number" in new_value:
+                        new_value["max_integer"] = new_value.pop("max_number")
                     new_values.update(new_value)
                 else:
                     new_values.append(new_value)
             return new_values
         if isinstance(value, JinjaCalculation):
             jinja = CommentedMap()
-            # replace \n to space a add index of \n (now a space) to fold_pos
-            jinja_values = value.jinja.strip()
-            if key == 'default' and not multi:
-                jinja["jinja"] = FoldedScalarString(jinja_values.replace('\n', ' '))
-                jinja["jinja"].fold_pos = [i for i, ltr in enumerate(jinja_values) if ltr == '\n']
+            jinja_values = formatter(self.config, value.jinja.strip())[:-1]
+            if key == "default" and not multi:
+                jinja["jinja"] = FoldedScalarString(jinja_values)
+                fold_pos = []
+                old_i = 0
+                for i, ltr in enumerate(jinja_values):
+                    if ltr == "\n":
+                        fold_pos.append(i - old_i)
+                        old_i = 1
+                jinja["jinja"].fold_pos = fold_pos
+            elif key == "secret_manager":
+                return self.object_to_yaml(
+                    "params", type_, value.params, multi, object_path
+                )
             else:
                 jinja["jinja"] = LiteralScalarString(jinja_values)
             if value.return_type:
-                jinja["return_type"] = value.return_type
+                return_type = value.return_type
+                if return_type in RENAME_TYPE:
+                    return_type = RENAME_TYPE[return_type]
+                jinja["return_type"] = return_type
             if value.description:
-                jinja["description"] = value.description
+                if "\n" in value.description:
+                    jinja["description"] = LiteralScalarString(value.description.strip())
+                else:
+                    jinja["description"] = value.description.strip()
             if value.params:
-                jinja["params"] = self.object_to_yaml("params", type_, value.params, multi, object_path)
+                jinja["params"] = self.object_to_yaml(
+                    "params", type_, value.params, multi, object_path
+                )
             return jinja
         elif isinstance(value, Calculation):
-            variable_attributes = self.get_object_informations(value, ['path', 'inside_list', 'version', 'xmlfiles', 'attribute_name', 'namespace'])
+            variable_attributes = self.get_attributes(
+                value.__class__,
+                [
+                    "path",
+                    "inside_list",
+                    "version",
+                    "xmlfiles",
+                    "attribute_name",
+                    "namespace",
+                ],
+            )
             variable = CommentedMap()
-            if isinstance(value, (IdentifierCalculation, IdentifierPropertyCalculation)):
+            if isinstance(
+                value, (IdentifierCalculation, IdentifierPropertyCalculation)
+            ):
                 variable["type"] = "identifier"
-            if isinstance(value, IndexCalculation):
+            elif isinstance(value, IndexCalculation):
                 variable["type"] = "index"
+            elif isinstance(value, NamespaceCalculation):
+                variable["type"] = "namespace"
             for key, default in variable_attributes.items():
                 val = getattr(value, key)
                 if val != default and val is not undefined:
                     variable[key] = val
             if "variable" in variable:
-                variable["variable"] = self.calc_variable_path(object_path, variable["variable"])
-            if variable.get('type') == 'identifier' and 'identifier' in variable:
+                variable["variable"] = self.calc_variable_path(
+                    object_path, variable["variable"]
+                )
+            if variable.get("type") == "identifier" and "identifier" in variable:
                 del variable["type"]
+            if value.description:
+                if "\n" in value.description:
+                    variable["description"] = LiteralScalarString(value.description.strip())
+                else:
+                    variable["description"] = value.description.strip()
             return variable
         elif isinstance(value, Param):
-            param_attributes = self.get_object_informations(value, ["type", "key"])
-            if list(param_attributes) == ['value']:
+            param_attributes = self.get_attributes(
+                value.__class__, ["type", "key", "namespace"]
+            )
+            if list(param_attributes) == ["value"]:
                 variable = value.value
             else:
                 variable = CommentedMap()
                 if isinstance(value, IdentifierParam):
                     variable["type"] = "identifier"
-                if isinstance(value, IndexParam):
+                elif isinstance(value, IndexParam):
                     variable["type"] = "index"
+                elif isinstance(value, NamespaceParam):
+                    variable["type"] = "namespace"
                 for key, default in param_attributes.items():
                     val = getattr(value, key)
                     if val != default and val is not undefined:
                         variable[key] = val
-                if variable.get('type') == 'identifier' and 'identifier' in variable:
+                if variable.get("type") == "identifier" and "identifier" in variable:
                     del variable["type"]
                 if "variable" in variable:
-                    variable["variable"] = self.calc_variable_path(object_path, variable["variable"])
+                    variable["variable"] = self.calc_variable_path(
+                        object_path, variable["variable"]
+                    )
             return {value.key: variable}
-        elif type_ == 'port' and isinstance(value, str) and value.isnumeric():
+        elif type_ == "port" and isinstance(value, str) and value.isnumeric():
             return int(value)
+        elif key == "help" and "\n" in value:
+            return LiteralScalarString(value.strip())
         return value
 
     def calc_variable_path(self, object_path, variable_path):
@@ -355,13 +610,14 @@ class RougailOutputFormatter:
                 else:
                     len_common_path = len(common_path) + 1
                 relative_object_path = object_path[len_common_path:]
-                final_path = "_" * (relative_object_path.count(".") + 1) + '.'
-                return "_" * (relative_object_path.count(".") + 1) + '.' + variable_path[len_common_path:]
+                final_path = "_" * (relative_object_path.count(".") + 1) + "."
+                return (
+                    "_" * (relative_object_path.count(".") + 1)
+                    + "."
+                    + variable_path[len_common_path:]
+                )
         return variable_path
 
-    def get_object_informations(self, value, excludes=[]):
-        return {attr: obj.get("default") for attr, obj in value.__class__.model_json_schema()["properties"].items() if attr not in excludes}
-
     def get_parent_name(self, path):
         if "." in path:
             return path.rsplit(".", 1)
@@ -372,13 +628,17 @@ class RougailOutputFormatter:
             if not subpath:
                 return y
             name = subpath.pop(0)
-            if name not in y and name.endswith('{{ identifier }}'):
-                name = name[:-16]
+            if name not in y and name.endswith("{{ identifier }}"):
+                search_name = name[:-16]
+                if search_name not in y:
+                    search_name = name.replace("{{ identifier }}", "{{ suffix }}")
+                name = search_name
             return _yaml(y[name])
+
         if self.main_namespace:
-            subpath = path.split('.')[1:]
+            subpath = path.split(".")[1:]
         else:
-            subpath = path.split('.')
+            subpath = path.split(".")
         return _yaml(self.original_yaml)
 
 

src/rougail/output_formatter/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.1.0a20"

src/rougail/output_formatter/config.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
@@ -17,33 +17,54 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """
 
 from pathlib import Path
+from .i18n import _
 
 
 def get_rougail_config(
     *,
     backward_compatibility=True,
 ) -> dict:
-    options = """
+    options = f"""
 load_unexist_redefine:
   redefine: true
   type: boolean
   default:
     jinja: >-
-      {% if step.output == 'formatter' %}
-      true
-      {% else %}
-      false
-      {% endif %}
+      {{% if step.output is not propertyerror and step.output == 'formatter' %}}
+        true
+      {{% else %}}
+        false
+      {{% endif %}}
   hidden:
     jinja: >-
-      {% if step.output == 'formatter' %}
-      load_unexist_redefine is always true with 'formatter' output
-      {% endif %}
+      {{% if step.output is not propertyerror and step.output == 'formatter' %}}
+        load_unexist_redefine is always true with 'formatter' output
+      {{% endif %}}
+
+cli:
+
+  load_config:
+    exists: true
+    redefine: true
+    type: boolean
+    default:
+      jinja: >-
+        {{% if step.output is not propertyerror and step.output == 'formatter' %}}
+          false
+        {{% else %}}
+          true
+        {{% endif %}}
+
+formatter:
+  description: {_('Configuration for rougail-ouput-formatter')}
+
+  line_width: 120  # {_('Line size')}
 """
     return {
         "name": "formatter",
         "process": "output",
         "options": options,
+        "allow_user_data": False,
         "level": 90,
     }
 

src/rougail/output_formatter/i18n.py

@@ -0,0 +1,27 @@
+"""Internationalisation utilities
+Silique (https://www.silique.fr)
+Copyright (C) 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
+Free Software Foundation, either version 3 of the License, or (at your
+option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
+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 gettext import translation
+from pathlib import Path
+
+t = translation(
+    "rougail_output_formatter", str(Path(__file__).parent / "locale"), fallback=True
+)
+
+_ = t.gettext
+

src/rougail/output_formatter/upgrade.py

@@ -4,7 +4,7 @@ Cadoles (http://www.cadoles.com)
 Copyright (C) 2021
 
 Silique (https://www.silique.fr)
-Copyright (C) 2022-2024
+Copyright (C) 2022-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
@@ -45,22 +45,33 @@ class RougailUpgrade:
 
     def run(
         self,
-        file,
-    ):
+        file: str,
+    ) -> dict:
         with file.open() as file_fh:
             root = YAML().load(file_fh)
-        search_function_name = get_function_name(str(root["version"]))
+        if not root:
+            root = {}
+        if "_version" in root:
+            version_name = "_version"
+            format_version = str(root.pop("_version"))
+        elif "version" in root:
+            version_name = "version"
+            format_version = str(root.pop("version"))
+        else:
+            version_name = None
+            format_version = self.rougailconfig["default_structural_format_version"]
+        if format_version not in VERSIONS:
+            raise Exception(f'version "{format_version}" is not a valid version')
+        search_function_name = get_function_name(format_version)
         function_found = False
         for version, function_version in FUNCTION_VERSIONS:
             if function_found and hasattr(self, function_version):
                 root = getattr(self, function_version)(root)
             if function_version == search_function_name:
                 function_found = True
-        if '_version' in root:
-            root["_version"] = float(version)
-        elif 'version' in root:
-            root["version"] = float(version)
-        return root
+        if version_name:
+            root[version_name] = float(version)
+        return version_name, root
 
     def update_1_1(
         self,
@@ -69,7 +80,7 @@ class RougailUpgrade:
         new_root = CommentedMap()
         for key, value in root.items():
             if not isinstance(value, dict):
-                if key == 'variable' and "{{ suffix }}" in value:
+                if key == "variable" and "{{ suffix }}" in value:
                     value = value.replace("{{ suffix }}", "{{ identifier }}")
                 new_root[key] = value
                 continue
@@ -94,7 +105,7 @@ class RougailUpgrade:
             new_root[key] = value
             for typ, obj in {
                 "boolean": bool,
-                "number": int,
+                "integer": int,
                 "string": str,
                 "float": float,
             }.items():

tests/results/00_0no_variable/rougail/00-base.yml

@@ -0,0 +1,4 @@
+%YAML 1.2
+---
+version: 1.1
+...

tests/results/00_0no_variable_default_version/rougail/00-base.yml

@@ -0,0 +1,3 @@
+%YAML 1.2
+---
+...

tests/results/00_0no_variable_remove_version/rougail/00-base.yml

@@ -0,0 +1,3 @@
+%YAML 1.2
+---
+...

tests/results/00_0version_underscore/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 _version: 1.1
 
-version: # a variable
+version:  # a variable
+...

tests/results/00_1empty_variable/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
 empty:
+...

tests/results/00_2default_calculated/rougail/00-base.yml

@@ -1,7 +1,8 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: no # a first variable
+var1: no  # a first variable
 
 var2:
   description: a second variable
@@ -10,3 +11,4 @@ var2:
     jinja: |-
       {{ _.var1 }}
     description: the value of var1
+...

tests/results/00_2default_calculated_multi/rougail/00-base.yml

@@ -1,7 +1,8 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # a first variable
+var1:  # a first variable
   - no
   - yes
   - maybe
@@ -12,6 +13,7 @@ var2:
   default:
     jinja: |-
       {% for val in _.var1 %}
-      {{ val }}
+        {{ val }}
       {% endfor %}
     description: the value of _.var1
+...

tests/results/00_2default_calculated_params_permissive/rougail/00-base.yml

@@ -0,0 +1,22 @@
+%YAML 1.2
+---
+version: 1.1
+
+leadership:
+  type: leadership
+  hidden: true
+
+  var1:  # a first variable
+    - a_value
+
+  var2: a_value  # a first variable
+
+var2:
+  description: a second variable
+  default:
+    jinja: >-
+      {{ var1[0] }}
+    params:
+      var1:
+        variable: _.leadership.var1
+...

tests/results/00_2default_calculated_variable/rougail/00-base.yml

@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:
+  description: a first variable
+  type: domainname
+  params:
+    allow_ip: true
+  multi: true
+
+var2:
+  description: a second variable
+  default:
+    variable: _.var1
+...

tests/results/00_2default_calculated_variable_description/rougail/00-base.yml

@@ -0,0 +1,12 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:  # a first variable
+
+var2:
+  description: a second variable
+  default:
+    variable: _.var1
+    description: value of a variable!
+...

tests/results/00_2default_calculated_variable_description_multi_line/rougail/00-base.yml

@@ -0,0 +1,18 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:  # a first variable
+
+var2:
+  description: a second variable
+  default:
+    variable: _.var1
+    description: |-
+      value
+      of
+      a
+      variable!
+
+var3:  # a new variable
+...

tests/results/00_2default_calculated_variable_transitive/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -12,3 +13,4 @@ var2:
   description: a second variable
   default:
     variable: _.var1
+...

tests/results/00_4load_subfolder/rougail/99-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # a variable
+var1:  # a variable
+...

tests/results/00_4load_subfolder/rougail2/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var2: # a variable
+var2:  # a variable
+...

tests/results/00_5load_notype/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-without_type: non # a variable
+without_type: non  # a variable
+...

tests/results/00_6boolean/rougail/00-base.yml

@@ -1,14 +1,16 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: true # the first variable
+var1: true  # the first variable
 
-var2: true # the second variable
+var2: true  # the second variable
 
-var3: true # the third variable
+var3: true  # the third variable
 
-var4: false # the forth variable
+var4: false  # the forth variable
 
-var5: false # the fifth variable
+var5: false  # the fifth variable
 
-var6: false # the sixth variable
+var6: false  # the sixth variable
+...

tests/results/00_6boolean_no_mandatory/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -5,3 +6,4 @@ variable:
   description: a variable
   mandatory: false
   default: true
+...

tests/results/00_6choice/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -26,7 +27,7 @@ var3:
 var4:
   description: the forth variable
   choices:
-    - 
+    - null
     - b
     - c
   mandatory: false
@@ -46,3 +47,4 @@ var6:
     - 2
     - 3
   default: 1
+...

tests/results/00_6choice_calculation/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -6,8 +7,9 @@ var:
   choices:
     jinja: |-
       {% for n in trange(0, 10) %}
-      {{ n }}
+        {{ n }}
       {% endfor %}
-    return_type: number
+    return_type: integer
     description: choices is 0 to 9
   default: 9
+...

tests/results/00_6choice_link/rougail/00-base.yml

@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:
+  description: the first variable
+  choices:
+    - a
+    - b
+    - c
+
+var2:
+  description: the second variable
+  default:
+    variable: _.var1
+...

tests/results/00_6choice_variable/rougail/00-base.yml

@@ -1,7 +1,8 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # a second variable
+var1:  # a second variable
   - a
   - b
   - c
@@ -11,3 +12,4 @@ var2:
   choices:
     variable: _.var1
   default: a
+...

tests/results/00_6choice_variable_link/rougail/00-base.yml

@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:  # a second variable
+  - a
+  - b
+  - c
+
+var2:
+  description: a first variable
+  choices:
+    variable: _.var1
+  default: a
+
+var3:
+  description: a third variable
+  default:
+    variable: _.var2
+...

tests/results/00_6choice_variable_link2/rougail/00-base.yml

@@ -0,0 +1,22 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:  # a second variable
+  - a
+  - b
+  - c
+
+var2:
+  description: a first variable
+  choices:
+    variable: _.var1
+  default: a
+
+family:
+
+  var3:
+    description: a third variable
+    default:
+      variable: __.var2
+...

tests/results/00_6custom/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -9,3 +10,4 @@ custom2:
   description: the seconf variable
   type: custom
   default: value
+...

tests/results/00_6domainname/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -5,3 +6,4 @@ variable:
   description: a domain name variable
   type: domainname
   default: my.domain.name
+...

tests/results/00_6domainname_params/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -7,3 +8,4 @@ variable:
   params:
     allow_ip: true
   default: my.domain.name
+...

tests/results/00_6float/rougail/00-base.yml

@@ -1,14 +1,16 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: 0.0 # the first variable
+var1: 0.0  # the first variable
 
-var2: 0.0 # the second variable
+var2: 0.0  # the second variable
 
-var3: 0.0 # the third variable
+var3: 0.0  # the third variable
 
-var4: 10.1 # the forth variable
+var4: 10.1  # the forth variable
 
-var5: 10.1 # the fifth variable
+var5: 10.1  # the fifth variable
 
-var6: 10.1 # the sixth variable
+var6: 10.1  # the sixth variable
+...

tests/results/00_6integer/rougail/00-base.yml

@@ -0,0 +1,16 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1: 0  # the first variable
+
+var2: 0  # the second variable
+
+var3: 0  # the third variable
+
+var4: 10  # this forth variable
+
+var5: 10  # the fifth variable
+
+var6: 10  # the sixth variable
+...

tests/results/00_6ip/rougail/00-base.yml

@@ -0,0 +1,25 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:
+  description: an IP
+  type: ip
+  default: 1.1.1.1
+
+var2:
+  description: an IP in CIDR format
+  examples:
+    - 192.168.0.128/25
+  type: ip
+  params:
+    cidr: true
+  default: 1.1.1.1/24
+
+var3:
+  description: an IP in CIDR format with obsolete CIDR type
+  type: ip
+  params:
+    cidr: true
+  default: 1.1.1.1/24
+...

tests/results/00_6network/rougail/00-base.yml

@@ -0,0 +1,23 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:
+  description: an network
+  type: network
+  default: 1.1.1.0
+
+var2:
+  description: an network in CIDR format
+  type: network
+  params:
+    cidr: true
+  default: 1.1.1.0/24
+
+var3:
+  description: an network in CIDR format with obsolete CIDR type
+  type: network
+  params:
+    cidr: true
+  default: 1.1.1.0/24
+...

tests/results/00_6number/rougail/00-base.yml

@@ -1,14 +1,16 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: 0 # the first variable
+var1: 0  # the first variable
 
-var2: 0 # the second variable
+var2: 0  # the second variable
 
-var3: 0 # the third variable
+var3: 0  # the third variable
 
-var4: 10 # this forth variable
+var4: 10  # this forth variable
 
-var5: 10 # the fifth variable
+var5: 10  # the fifth variable
 
-var6: 10 # the sixth variable
+var6: 10  # the sixth variable
+...

tests/results/00_6port/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -14,3 +15,4 @@ variable3:
   description: a port variable with integer default value
   type: port
   default: 8080
+...

tests/results/00_6regexp/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -8,3 +9,4 @@ var:
     - '#b2b2b2'
   regexp: ^#(?:[0-9a-f]{3}){1,2}$
   default: '#a1a1a1'
+...

tests/results/00_6regexp_link/rougail/00-base.yml

@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:
+  description: a first variable
+  test:
+    - '#b1b1b1'
+    - '#b2b2b2'
+  regexp: ^#(?:[0-9a-f]{3}){1,2}$
+  default: '#a1a1a1'
+
+var2:
+  description: a second variable
+  test:
+    - '#b2b1b1'
+    - '#b3b2b2'
+  default:
+    variable: _.var1
+...

tests/results/00_6secret/rougail/00-base.yml

@@ -0,0 +1,13 @@
+%YAML 1.2
+---
+version: 1.1
+
+secret1:
+  description: the first variable
+  type: secret
+
+secret2:
+  description: the second variable
+  type: secret
+  default: value
+...

tests/results/00_6secret_param/rougail/00-base.yml

@@ -0,0 +1,29 @@
+%YAML 1.2
+---
+version: 1.1
+
+secret1:
+  description: the first variable
+  type: secret
+  params:
+    min_len: 10
+
+secret2:
+  description: the second variable
+  type: secret
+  params:
+    max_len: 10
+    forbidden_char:
+      - $
+      - ^
+  default: value
+
+secret3:
+  description: the third variable
+  type: secret
+  params:
+    max_len: 10
+    forbidden_char:
+      - $
+  default: value
+...

tests/results/00_6string/rougail/00-base.yml

@@ -1,14 +1,20 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # the first variable
+var1:  # the first variable
 
-var2: # the second variable
+var2:  # the second variable
 
-var3: # the third variable
+var3:  # the third variable
 
-var4: value # the forth variable
+var4: value  # the forth variable
 
-var5: value # the fifth variable
+var5: value  # the fifth variable
 
-var6: value # the sixth variable
+var6: value  # the sixth variable
+
+var7: '8080'  # the seventh variable
+
+var8: 'true'  # the height variable
+...

tests/results/00_7choice_quote/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -9,3 +10,4 @@ var:
     - quote"
     - quote"'
   default: quote'
+...

tests/results/00_7help/rougail/00-base.yml

@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:
+  description: the first variable
+  help: |-
+    Multi line
+
+    Help
+
+    With useful information
+
+var2:
+  description: the second variable
+  help: |-
+    Multi line
+    Help
+    With useful information
+...

tests/results/00_7help_quote/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -8,3 +9,4 @@ var1:
 var2:
   description: the second variable
   help: message with "
+...

tests/results/00_7help_sup/rougail/00-base.yml

@@ -0,0 +1,20 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:
+  description: the first <variable>
+  help: |-
+    Multi line
+
+    <Help>
+
+    With useful information
+
+var2:
+  description: the second <variable>
+  help: |-
+    Multi line
+    <Help>
+    With useful information
+...

tests/results/00_7value_doublequote/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: quote" # a variable
+variable: quote"  # a variable
+...

tests/results/00_7value_doublequote2/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: quote'" # a variable
+variable: quote'"  # a variable
+...

tests/results/00_7value_doublequote3/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: quote\"\' # a variable
+variable: quote\"\'  # a variable
+...

tests/results/00_7value_quote/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: quote' # a variable
+variable: quote'  # a variable
+...

tests/results/00_8calculation_information/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -5,8 +6,9 @@ variable:
   description: a variable
   default:
     jinja: >-
-      {{test_information }}
+      {{ test_information }}
     description: get information test_information
     params:
       test_information:
         information: test_information
+...

tests/results/00_8calculation_namespace/rougail/00-base.yml

@@ -0,0 +1,10 @@
+%YAML 1.2
+---
+version: 1.1
+
+variable:
+  description: a variable
+  default:
+    type: namespace
+  mandatory: false
+...

tests/results/00_8calculation_param_namespace/rougail/00-base.yml

@@ -0,0 +1,14 @@
+%YAML 1.2
+---
+version: 1.1
+
+variable:
+  description: a variable
+  default:
+    jinja: >-
+      {{ namespace }}
+    params:
+      namespace:
+        type: namespace
+  mandatory: false
+...

tests/results/00_8test/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -21,7 +22,7 @@ var3:
 var4:
   description: the forth variable
   test:
-    - 
+    - null
     - test1
     - test2
   mandatory: false
@@ -38,3 +39,4 @@ var6:
     - test1
     - test2
   multi: true
+...

tests/results/00_9choice_variable_multi/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -15,3 +16,4 @@ variable2:
     - val2
   multi: true
   mandatory: false
+...

tests/results/00_9choice_variables/rougail/00-base.yml

@@ -1,9 +1,10 @@
+%YAML 1.2
 ---
 version: 1.1
 
-source_variable_1: val1 # the first source variable
+source_variable_1: val1  # the first source variable
 
-source_variable_2: val2 # the second source variable
+source_variable_2: val2  # the second source variable
 
 my_variable:
   description: a variable
@@ -12,3 +13,4 @@ my_variable:
     - variable: _.source_variable_1
     - variable: _.source_variable_2
   default: val1
+...

tests/results/00_9default_calculation/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -11,4 +12,5 @@ variable:
       param1: string
       param2: 1
       param3: true
-      param4:
+      param4: null
+...

tests/results/00_9default_calculation_information/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -11,3 +12,4 @@ var:
       information:
         information: test_information
         variable: _.var
+...

tests/results/00_9default_calculation_information_other_variable/rougail/00-base.yml

@@ -1,7 +1,8 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # a first variable
+var1:  # a first variable
 
 var2:
   description: a second variable
@@ -12,3 +13,4 @@ var2:
       information:
         information: test_information
         variable: _.var1
+...

tests/results/00_9default_calculation_multi_optional/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -8,3 +9,4 @@ my_calculated_variable:
     optional: true
   - variable: _.my_variable_unexists
     optional: true
+...

tests/results/00_9default_calculation_multi_optional2/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -8,3 +9,4 @@ my_calculated_variable:
     optional: true
   - variable: _.my_variable
     optional: true
+...

tests/results/00_9default_calculation_multi_optional_default/rougail/00-base.yml

@@ -0,0 +1,13 @@
+%YAML 1.2
+---
+version: 1.1
+
+my_variable: val1
+
+my_calculated_variable:
+  - variable: _.my_variable
+    optional: true
+  - variable: _.my_variable_unexists
+    optional: true
+    default: value
+...

tests/results/00_9default_calculation_optional/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -6,3 +7,4 @@ my_calculated_variable:
   default:
     variable: _.my_variable
     optional: true
+...

tests/results/00_9default_calculation_optional_exists/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -6,7 +7,7 @@ my_variable:
   - val2
 
 my_calculated_variable:
-  multi: true
   default:
     variable: _.my_variable
     optional: true
+...

tests/results/00_9default_calculation_param_optional/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -5,8 +6,15 @@ var1:
   description: a first variable
   default:
     jinja: >-
-      {% if var2 is defined %} {{ var2 }} {% elif var3 is defined %} {{ var3 }} {%
-      elif var4 is defined %} {{ var4 }} {% else %} {{ _.var2 }} {% endif %}
+      {% if var2 is defined %}
+        {{ var2 }}
+      {% elif var3 is defined %}
+        {{ var3 }}
+      {% elif var4 is defined %}
+        {{ var4 }}
+      {% else %}
+        {{ _.var2 }}
+      {% endif %}
     description: returns a value
     params:
       var2:
@@ -21,3 +29,4 @@ var1:
   mandatory: false
 
 var2: no  # a second variable
+...

tests/results/00_9default_information_other_variable/rougail/00-base.yml

@@ -1,10 +1,12 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # a first variable
+var1:  # a first variable
 
 var2:
   description: a second variable
   default:
     information: test_information
     variable: _.var1
+...

tests/results/00_9default_information_other_variable2/rougail/00-base.yml

@@ -1,10 +1,12 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # a first variable
+var1:  # a first variable
 
 var2:
   description: a second variable
   default:
     information: test_information
     variable: _.var1
+...

tests/results/00_9default_integer/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -6,8 +7,9 @@ var:
   choices:
     jinja: |-
       {% for item in trange(0, 10) %}
-      {{ item }}
+        {{ item }}
       {%- endfor %}
-    return_type: number
+    return_type: integer
     description: choice for 0 to 9
   default: 9
+...

tests/results/00_9default_number/rougail/00-base.yml

@@ -0,0 +1,15 @@
+%YAML 1.2
+---
+version: 1.1
+
+var:
+  description: a variable
+  choices:
+    jinja: |-
+      {% for item in trange(0, 10) %}
+        {{ item }}
+      {%- endfor %}
+    return_type: integer
+    description: choice for 0 to 9
+  default: 9
+...

tests/results/00_9extra/extra/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -7,3 +8,4 @@ variable:
     jinja: >-
       no
     description: return no
+...

tests/results/00_9extra/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: rougail # a variable
+variable: rougail  # a variable
+...

tests/results/00_9extra_calculation/extra/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -22,3 +23,4 @@ variable3:
     params:
       variable:
         variable: rougail.variable
+...

tests/results/00_9extra_calculation/rougail/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: value # a variable
+variable: value  # a variable
+...

tests/results/00_9extra_ouside/extra/00-base.yml

@@ -1,4 +1,6 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: value in extra # a variable
+variable: value in extra  # a variable
+...

tests/results/00_9extra_ouside/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -5,3 +6,4 @@ variable:
   description: a variable
   default:
     variable: extra.variable
+...

tests/results/01_6boolean_multi/rougail/00-base.yml

@@ -1,26 +1,28 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # the first variable
+var1:  # the first variable
   - true
 
-var2: # the second variable
+var2:  # the second variable
   - true
 
-var3: # the third variable
+var3:  # the third variable
   - true
 
-var4: # the forth variable
+var4:  # the forth variable
   - false
 
-var5: # the fifth variable
+var5:  # the fifth variable
   - false
 
-var6: # the sixth variable
+var6:  # the sixth variable
   - false
 
-var7: # the seventh variable
+var7:  # the seventh variable
   - true
 
-var8: # the eighth variable
+var8:  # the eighth variable
   - true
+...

tests/results/01_6custom_multi/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -11,3 +12,4 @@ custom2:
   type: custom
   default:
     - value
+...

tests/results/01_6float_multi/rougail/00-base.yml

@@ -1,26 +1,28 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: # the first variable
+var1:  # the first variable
   - 0.0
 
-var2: # the second variable
+var2:  # the second variable
   - 0.0
 
-var3: # the third variable
+var3:  # the third variable
   - 0.0
 
-var4: # the forth variable
+var4:  # the forth variable
   - 10.1
 
-var5: # the fifth variable
+var5:  # the fifth variable
   - 10.1
 
-var6: # the sixth variable
+var6:  # the sixth variable
   - 10.1
 
-var7: # the seventh variable
+var7:  # the seventh variable
   - 0.0
 
-var8: # the eighth variable
+var8:  # the eighth variable
   - 0.0
+...

tests/results/01_6integer_multi/rougail/00-base.yml

@@ -0,0 +1,28 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:  # the first variable
+  - 0
+
+var2:  # the second variable
+  - 0
+
+var3:  # the third variable
+  - 0
+
+var4:  # the forth variable
+  - 10
+
+var5:  # the fifth variable
+  - 10
+
+var6:  # the sixth variable
+  - 10
+
+var7:  # the seventh variable
+  - 0
+
+var8:  # the eighth variable
+  - 0
+...

tests/results/01_6integer_multi_mandatory/rougail/00-base.yml

@@ -0,0 +1,9 @@
+%YAML 1.2
+---
+version: 1.1
+
+var:
+  description: the first variable
+  type: integer
+  multi: true
+...

tests/results/01_6number_multi/rougail/00-base.yml

@@ -1,26 +0,0 @@
----
-version: 1.1
-
-var1: # the first variable
-  - 0
-
-var2: # the second variable
-  - 0
-
-var3: # the third variable
-  - 0
-
-var4: # the forth variable
-  - 10
-
-var5: # the fifth variable
-  - 10
-
-var6: # the sixth variable
-  - 10
-
-var7: # the seventh variable
-  - 0
-
-var8: # the eighth variable
-  - 0

tests/results/01_6string_empty/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -5,5 +6,6 @@ var1:
   description: the second variable
   default:
     - value
-    - 
+    - null
   empty: false
+...

tests/results/01_6string_multi/rougail/00-base.yml

@@ -1,23 +1,25 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: [] # the first variable
+var1: []  # the first variable
 
-var2: [] # the second variable
+var2: []  # the second variable
 
-var3: [] # the third variable
+var3: []  # the third variable
 
-var4: # the forth variable
+var4:  # the forth variable
   - value
 
-var5: # the fifth variable
+var5:  # the fifth variable
   - value
 
-var6: # the sixth variable
+var6:  # the sixth variable
   - value
 
-var7: # the seventh variable
+var7:  # the seventh variable
   - value
 
-var8: # the eighth variable
+var8:  # the eighth variable
   - value
+...

tests/results/01_7value_multi_doublequote/rougail/00-base.yml

@@ -1,5 +1,7 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: # a variable
+variable:  # a variable
   - quote"
+...

tests/results/01_7value_multi_doublequote2/rougail/00-base.yml

@@ -1,5 +1,7 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: # a variable
+variable:  # a variable
   - quote'"
+...

tests/results/01_7value_multi_quote/rougail/00-base.yml

@@ -1,5 +1,7 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable: # a variable
+variable:  # a variable
   - quote'
+...

tests/results/01_8calculation_information_multi/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -7,9 +8,10 @@ variable:
   default:
     jinja: |-
       {% for info in test_information %}
-      {{ info }}
+        {{ info }}
       {% endfor %}
     description: get information test_information
     params:
       test_information:
         information: test_information_list
+...

tests/results/01_9choice_variable_multi/rougail/00-base.yml

@@ -1,7 +1,8 @@
+%YAML 1.2
 ---
 version: 1.1
 
-variable1: # a first variable
+variable1:  # a first variable
   - a
   - b
   - c
@@ -10,3 +11,4 @@ variable2:
   description: a second variable
   choices:
     variable: _.variable1
+...

tests/results/01_9choice_variable_optional/rougail/00-base.yml

@@ -0,0 +1,15 @@
+%YAML 1.2
+---
+version: 1.1
+
+variable:
+  description: a variable
+  choices:
+    variable: _.unknown_variable
+    optional: true
+    default:
+      - a
+      - b
+      - c
+  default: c
+...

tests/results/02_0tags/rougail/00-base.yml

@@ -0,0 +1,15 @@
+%YAML 1.2
+---
+version: 1.1
+
+var1:
+  description: the first variable
+  tags:
+    - one_tag
+
+var2:
+  description: the second variable
+  tags:
+    - one_tag
+    - second_tag
+...

tests/results/04_0type_param/rougail/00-base.yml

@@ -1,9 +1,11 @@
+%YAML 1.2
 ---
 version: 1.1
 
 int:
   description: A limited number
   params:
-    min_number: 0
-    max_number: 100
+    min_integer: 0
+    max_integer: 100
   default: 10
+...

tests/results/04_0type_param_integer/rougail/00-base.yml

@@ -0,0 +1,11 @@
+%YAML 1.2
+---
+version: 1.1
+
+int:
+  description: A limited integer
+  params:
+    min_integer: 0
+    max_integer: 100
+  default: 10
+...

tests/results/04_1auto_save/rougail/00-base.yml

@@ -1,3 +1,4 @@
+%YAML 1.2
 ---
 version: 1.1
 
@@ -5,3 +6,4 @@ variable:
   description: an auto save variable
   default: no
   auto_save: true
+...

tests/results/04_1auto_save_and_calculated/rougail/00-base.yml

@@ -1,10 +1,12 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: no # a first variable
+var1: no  # a first variable
 
 var2:
   description: a second variable
   default:
     variable: _.var1
   auto_save: true
+...

tests/results/04_1auto_save_and_calculated_hidden/rougail/00-base.yml

@@ -1,7 +1,8 @@
+%YAML 1.2
 ---
 version: 1.1
 
-var1: no # a first variable
+var1: no  # a first variable
 
 var2:
   description: a second variable
@@ -13,6 +14,7 @@ var2:
   hidden:
     jinja: |-
       {% if _.var1 == "yes" %}
-      _.var1 is yes
+        _.var1 is yes
       {% endif %}
     description: only if the variable var1 has value "yes"
+...