CHANGELOG.md

@@ -1,76 +0,0 @@
-## 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

pyproject.toml

@@ -1,47 +0,0 @@
-[build-system]
-build-backend = "flit_core.buildapi"
-requires = ["flit_core >=3.8.0,<4"]
-
-[project]
-name = "rougail.output_formatter"
-version = "0.1.0a9"
-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.8",
-    "Programming Language :: Python :: 3.9",
-    "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",
-    "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,6 +1,6 @@
 """
 Silique (https://www.silique.fr)
-Copyright (C) 2024-2025
+Copyright (C) 2024
             
 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
@@ -22,44 +22,24 @@ 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, ScalarString
+from ruamel.yaml.scalarstring import LiteralScalarString, FoldedScalarString
-
-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, NamespaceCalculation, IdentifierParam, IndexCalculation, IndexParam, NamespaceParam, Param
+from rougail.object_model import Variable, Family, Calculation, JinjaCalculation, IdentifierCalculation, IdentifierPropertyCalculation, IdentifierParam, IndexCalculation, IndexParam, Param
 from rougail.utils import normalize_family
 
 from .upgrade import RougailUpgrade
-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 RougailOutputFormatter:
     output_name = 'formatter'
@@ -92,12 +72,6 @@ class RougailOutputFormatter:
         filename = Path(filenames[0])
         if not filename.is_file():
             raise Exception(_('only a file is allowed'))
-
-        self.config = Config()
-        self.config.profile = 'jinja'
-        self.config.line_break_after_multiline_tag = True
-        self.config.indent = "  "
-
         self.original_yaml = RougailUpgrade(rougailconfig).run(filename)
         datas = RougailUpgrade(rougailconfig).run(filename)
         self.rougail = RougailConvert(rougailconfig)
@@ -128,19 +102,15 @@ class RougailOutputFormatter:
         self.families = {None: 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_start = True
-        self.yaml.explicit_end = True
         self.default_flow_style = False
         with BytesIO() as ymlfh:
             self.yaml.dump(self.families[None], ymlfh)
-            ret = ymlfh.getvalue().decode("utf-8").strip()
+            ret = ymlfh.getvalue().decode("utf-8").strip() + '\n'
-        return True, ret
+        return ret
 
     def print(self):
-        ret, data = self.run()
+        print(self.run())
-        print(data)
-        return ret
 
     def parse(self):
         # FIXME path to relative !
@@ -155,9 +125,7 @@ class RougailOutputFormatter:
         self.families[None][version_name] = None
         self.families[None].yaml_value_comment_extend(version_name, [CommentToken('\n\n', CommentMark(0)), None])
         version = None
-        self.remaining = len(self.rougail.paths._data)
         for path, obj in self.rougail.paths._data.items():
-            self.remaining -= 1
             if version is None or version == '':
                 version = obj.version
             if path == self.rougail.namespace:
@@ -191,7 +159,7 @@ class RougailOutputFormatter:
         else:
             attributes = self.families_attributes
         for attr, default_value in attributes.items():
-            if attr in ["name", "path", "namespace", "version", "xmlfiles"]:
+            if attr in ["name", "path", "namespace", "version", "path_prefix", "xmlfiles"]:
                 continue
             try:
                 value = getattr(obj, attr)
@@ -214,16 +182,7 @@ class RougailOutputFormatter:
         elif not set(family) - {'description'}:
             # 
             ret[name] = CommentedMap()
-            add_column = 3
+            ret.yaml_add_eol_comment(family["description"] + '\n\n', name)
-            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"] + '\n\n'
-            else:
-                description = family["description"]
-            ret.yaml_add_eol_comment(description, name, column=column)
         else:
             self.add_space(family)
             ret[name] = family
@@ -245,7 +204,7 @@ class RougailOutputFormatter:
         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", "xmlfiles"]:
+            if attr in ["name", "path", "namespace", "version", "path_prefix", "xmlfiles"]:
                 continue
             try:
                 value = getattr(obj, attr)
@@ -279,42 +238,26 @@ class RougailOutputFormatter:
             # if boolean, the default value is True
             del variable["type"]
             variable["default"] = True
-        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')
             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:
-                if default is None:
-                    ret[name] = ""
             else:
                 ret[name] = default
-                    add_column += len(str(default)) + 1
             if "description" in variable:
                 description = variable["description"]
-                if self.remaining and (not multi or not default):
+                if not multi or not default:
                     description += "\n\n"
-                path_len = path.count('.')
+                ret.yaml_add_eol_comment(description, name)
-                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)
 
@@ -328,17 +271,12 @@ class RougailOutputFormatter:
                 return _get_last_obj(o[param], o, param, 'seq')
             return typ, parent, param
         param = list(obj)[-1]
-        if isinstance(obj[param], ScalarString):
-            enter = '\n'
-        else:
-            enter = '\n\n'
         typ, parent, param = _get_last_obj(obj[param], obj, param, 'map')
         if typ == 'seq':
             func = parent.yaml_key_comment_extend
         else:
             func = parent.yaml_value_comment_extend
-        if self.remaining:
+        func(param, [CommentToken('\n\n', CommentMark(0)), None])
-            func(param, [CommentToken(enter, CommentMark(0)), None])
 
     def object_to_yaml(self, key, type_, value, multi, object_path):
         if isinstance(value, list):
@@ -355,18 +293,11 @@ class RougailOutputFormatter:
             return new_values
         if isinstance(value, JinjaCalculation):
             jinja = CommentedMap()
-            jinja_values = formatter(self.config, value.jinja.strip())[:-1]
+            # 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)
+                jinja["jinja"] = FoldedScalarString(jinja_values.replace('\n', ' '))
-                fold_pos = []
+                jinja["jinja"].fold_pos = [i for i, ltr in enumerate(jinja_values) if ltr == '\n']
-                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:
@@ -381,10 +312,8 @@ class RougailOutputFormatter:
             variable = CommentedMap()
             if isinstance(value, (IdentifierCalculation, IdentifierPropertyCalculation)):
                 variable["type"] = "identifier"
-            elif isinstance(value, IndexCalculation):
+            if 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:
@@ -395,17 +324,15 @@ class RougailOutputFormatter:
                 del variable["type"]
             return variable
         elif isinstance(value, Param):
-            param_attributes = self.get_object_informations(value, ["type", "key", "namespace"])
+            param_attributes = self.get_object_informations(value, ["type", "key"])
             if list(param_attributes) == ['value']:
                 variable = value.value
             else:
                 variable = CommentedMap()
                 if isinstance(value, IdentifierParam):
                     variable["type"] = "identifier"
-                elif isinstance(value, IndexParam):
+                if 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:
@@ -417,8 +344,6 @@ class RougailOutputFormatter:
             return {value.key: variable}
         elif type_ == 'port' and isinstance(value, str) and value.isnumeric():
             return int(value)
-        elif key == 'help' and '\n' in value:
-            return LiteralScalarString(value)
         return value
 
     def calc_variable_path(self, object_path, variable_path):

src/rougail/output_formatter/__version__.py

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

src/rougail/output_formatter/config.py

@@ -1,6 +1,6 @@
 """
 Silique (https://www.silique.fr)
-Copyright (C) 2024-2025
+Copyright (C) 2024
 
 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
@@ -29,14 +29,14 @@ load_unexist_redefine:
   type: boolean
   default:
     jinja: >-
-      {% if step.output is not propertyerror and step.output == 'formatter' %}
+      {% if step.output == 'formatter' %}
       true
       {% else %}
       false
       {% endif %}
   hidden:
     jinja: >-
-      {% if step.output is not propertyerror and step.output == 'formatter' %}
+      {% if step.output == 'formatter' %}
       load_unexist_redefine is always true with 'formatter' output
       {% endif %}
 """

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-2025
+Copyright (C) 2022-2024
 
 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

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -11,4 +10,3 @@ var2:
     jinja: |-
       {{ _.var1 }}
     description: the value of var1
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -16,4 +15,3 @@ var2:
       {{ val }}
       {% endfor %}
     description: the value of _.var1
-...

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -13,4 +12,3 @@ var4: false  # the forth variable
 var5: false # the fifth variable
 
 var6: false # the sixth variable
-...

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -12,4 +11,3 @@ var:
     return_type: number
     description: choices is 0 to 9
   default: 9
-...

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

@@ -1,16 +0,0 @@
-%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,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -12,4 +11,3 @@ var2:
   choices:
     variable: _.var1
   default: a
-...

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

@@ -1,20 +0,0 @@
-%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

@@ -1,22 +0,0 @@
-%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,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -10,4 +9,3 @@ custom2:
   description: the seconf variable
   type: custom
   default: value
-...

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -13,4 +12,3 @@ var4: 10.1  # the forth variable
 var5: 10.1 # the fifth variable
 
 var6: 10.1 # the sixth variable
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -13,4 +12,3 @@ var4: 10  # this forth variable
 var5: 10 # the fifth variable
 
 var6: 10 # the sixth variable
-...

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

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

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

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

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

@@ -1,20 +0,0 @@
-%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

@@ -1,13 +0,0 @@
-%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

@@ -1,29 +0,0 @@
-%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,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -13,4 +12,3 @@ var4: value  # the forth variable
 var5: value # the fifth variable
 
 var6: value # the sixth variable
-...

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

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

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

@@ -1,20 +0,0 @@
-%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,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -9,4 +8,3 @@ var1:
 var2:
   description: the second variable
   help: message with "
-...

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

@@ -1,20 +0,0 @@
-%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,6 +1,4 @@
-%YAML 1.2
 ---
 version: 1.1
 
 variable: quote" # a variable
-...

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -6,9 +5,8 @@ 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

@@ -1,10 +0,0 @@
-%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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -13,4 +12,3 @@ my_variable:
     - variable: _.source_variable_1
     - variable: _.source_variable_2
   default: val1
-...

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -13,4 +12,3 @@ var2:
       information:
         information: test_information
         variable: _.var1
-...

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -9,4 +8,3 @@ var2:
   default:
     information: test_information
     variable: _.var1
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -9,4 +8,3 @@ var2:
   default:
     information: test_information
     variable: _.var1
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -12,4 +11,3 @@ var:
     return_type: number
     description: choice for 0 to 9
   default: 9
-...

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -25,4 +24,3 @@ var7:  # the seventh variable
 
 var8: # the eighth variable
   - true
-...

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -25,4 +24,3 @@ var7:  # the seventh variable
 
 var8: # the eighth variable
   - 0.0
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -25,4 +24,3 @@ var7:  # the seventh variable
 
 var8: # the eighth variable
   - 0
-...

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -22,4 +21,3 @@ var7:  # the seventh variable
 
 var8: # the eighth variable
   - value
-...

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

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

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

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

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -14,4 +13,3 @@ variable:
     params:
       test_information:
         information: test_information_list
-...

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -8,4 +7,3 @@ int:
     min_number: 0
     max_number: 100
   default: 10
-...

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

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

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -9,4 +8,3 @@ var2:
   default:
     variable: _.var1
   auto_save: true
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -17,4 +16,3 @@ var2:
       _.var1 is yes
       {% endif %}
     description: only if the variable var1 has value "yes"
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -8,4 +7,3 @@ var:
   auto_save: true
   mandatory: false
   hidden: true
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -17,4 +16,3 @@ var3:
       {% if _.var1 == 'value' or _.var2 == 'blah' %}
       value
       {% endif %}
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -17,4 +16,3 @@ var3:
       {% if _.var2 is propertyerror %}
       value
       {% endif %}
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -21,4 +20,3 @@ variable2:
       condition is yes
       {% endif %}
     description: if condition is egal to "yes"
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -29,4 +28,3 @@ var2:
       condition is yes
       {% endif %}
     description: if condition is yes
-...

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

@@ -1,26 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-condition: no  # a conditional variable
-
-variable1:
-  description: a first variable
-  multi: true
-  disabled:
-    jinja: |-
-      {% if _.condition == "yes" %}
-        condition is yes
-      {% endif %}
-    description: if condition is egal to "yes"
-
-variable2:
-  description: a second variable
-  multi: true
-  disabled:
-    jinja: |-
-      {% if _.condition == "yes" %}
-        condition is yes
-      {% endif %}
-    description: if condition is egal to "yes"
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -35,4 +34,3 @@ var2:
       condition:
         variable: _.condition
         optional: true
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -8,4 +7,3 @@ variable:
   description: a variable
   disabled:
     variable: _.condition
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -8,4 +7,3 @@ variable:
   description: a variable
   disabled:
     variable: _.condition
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -9,4 +8,3 @@ variable:
   disabled:
     variable: _.condition
     when: yes
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -9,4 +8,3 @@ variable:
   disabled:
     variable: _.condition
     when_not: yes
-...

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

@@ -1,12 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-condition: false  # a condition
-
-variable:
-  description: a variable
-  multi: true
-  disabled:
-    variable: _.condition
-...

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

@@ -1,12 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-condition: []  # a condition
-
-variable:
-  description: a variable
-  multi: true
-  disabled:
-    variable: _.condition
-...

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

@@ -1,14 +0,0 @@
-%YAML 1.2
----
-version: 1.1
-
-condition:  # a condition
-  - val1
-  - val2
-
-variable:
-  description: a variable
-  multi: true
-  disabled:
-    variable: _.condition
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -23,4 +22,3 @@ var2:
       condition is yes
       {% endif %}
     description: if condition is yes
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -29,4 +28,3 @@ var2:
       condition is yes
       {% endif %}
     description: if condition is yes
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -29,4 +28,3 @@ var2:
       condition is yes
       {% endif %}
     description: if condition is yes
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -11,4 +10,3 @@ int:
         value is too high
         {% endif %}
       description: the max value is 100
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -15,4 +14,3 @@ var1:
   default: oui
 
 var2: no  # A second variable
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -13,4 +12,3 @@ var1:
   default:
     - no
     - yes
-...

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

@@ -1,4 +1,3 @@
-%YAML 1.2
 ---
 version: 1.1
 
@@ -20,4 +19,3 @@ var1:
   default:
     - no
     - yes
-...