diff --git a/src/rougail/output_formatter/__init__.py b/src/rougail/output_formatter/__init__.py index 15015b1..e9f55f6 100644 --- a/src/rougail/output_formatter/__init__.py +++ b/src/rougail/output_formatter/__init__.py @@ -22,6 +22,7 @@ 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 @@ -44,6 +45,21 @@ 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' @@ -112,7 +128,9 @@ class RougailOutputFormatter: self.families = {None: CommentedMap()} self.parse() self.yaml.indent(mapping=2, sequence=4, offset=2) - self.yaml.explicit_start=True + self.yaml.version = '1.2' + 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) @@ -137,7 +155,9 @@ 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: @@ -194,7 +214,16 @@ class RougailOutputFormatter: 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"] + '\n\n' + else: + description = family["description"] + ret.yaml_add_eol_comment(description, name, column=column) else: self.add_space(family) ret[name] = family @@ -257,22 +286,35 @@ class RougailOutputFormatter: # 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: - ret[name] = default + if default is None: + ret[name] = "" + else: + ret[name] = default + add_column += len(str(default)) + 1 if "description" in variable: description = variable["description"] - if not multi or not default: + 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) @@ -295,7 +337,8 @@ class RougailOutputFormatter: func = parent.yaml_key_comment_extend else: func = parent.yaml_value_comment_extend - func(param, [CommentToken(enter, CommentMark(0)), None]) + if self.remaining: + func(param, [CommentToken(enter, CommentMark(0)), None]) def object_to_yaml(self, key, type_, value, multi, object_path): if isinstance(value, list): diff --git a/tests/results/00_0version_underscore/rougail/00-base.yml b/tests/results/00_0version_underscore/rougail/00-base.yml index f7d5594..8837f6c 100644 --- a/tests/results/00_0version_underscore/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_1empty_variable/rougail/00-base.yml b/tests/results/00_1empty_variable/rougail/00-base.yml index 7c4a5cf..9c3354f 100644 --- a/tests/results/00_1empty_variable/rougail/00-base.yml +++ b/tests/results/00_1empty_variable/rougail/00-base.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- version: 1.1 empty: +... diff --git a/tests/results/00_2default_calculated/rougail/00-base.yml b/tests/results/00_2default_calculated/rougail/00-base.yml index 629cc39..6213474 100644 --- a/tests/results/00_2default_calculated/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_2default_calculated_multi/rougail/00-base.yml b/tests/results/00_2default_calculated_multi/rougail/00-base.yml index c08d67f..700b222 100644 --- a/tests/results/00_2default_calculated_multi/rougail/00-base.yml +++ b/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 @@ -15,3 +16,4 @@ var2: {{ val }} {% endfor %} description: the value of _.var1 +... diff --git a/tests/results/00_2default_calculated_variable_transitive/rougail/00-base.yml b/tests/results/00_2default_calculated_variable_transitive/rougail/00-base.yml index 65234a1..1a5cf06 100644 --- a/tests/results/00_2default_calculated_variable_transitive/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_4load_subfolder/rougail/99-base.yml b/tests/results/00_4load_subfolder/rougail/99-base.yml index c74b712..54d5c8e 100644 --- a/tests/results/00_4load_subfolder/rougail/99-base.yml +++ b/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 +... diff --git a/tests/results/00_4load_subfolder/rougail2/00-base.yml b/tests/results/00_4load_subfolder/rougail2/00-base.yml index 4a603f3..47dd9ad 100644 --- a/tests/results/00_4load_subfolder/rougail2/00-base.yml +++ b/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 +... diff --git a/tests/results/00_5load_notype/rougail/00-base.yml b/tests/results/00_5load_notype/rougail/00-base.yml index 59f0f43..992528b 100644 --- a/tests/results/00_5load_notype/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6boolean/rougail/00-base.yml b/tests/results/00_6boolean/rougail/00-base.yml index 8ebc395..4550a00 100644 --- a/tests/results/00_6boolean/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6boolean_no_mandatory/rougail/00-base.yml b/tests/results/00_6boolean_no_mandatory/rougail/00-base.yml index 7c798f0..a88750f 100644 --- a/tests/results/00_6boolean_no_mandatory/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6choice/rougail/00-base.yml b/tests/results/00_6choice/rougail/00-base.yml index ae8e18b..bba585d 100644 --- a/tests/results/00_6choice/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6choice_calculation/rougail/00-base.yml b/tests/results/00_6choice_calculation/rougail/00-base.yml index 48b4ad2..95f6afe 100644 --- a/tests/results/00_6choice_calculation/rougail/00-base.yml +++ b/tests/results/00_6choice_calculation/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -11,3 +12,4 @@ var: return_type: number description: choices is 0 to 9 default: 9 +... diff --git a/tests/results/00_6choice_link/rougail/00-base.yml b/tests/results/00_6choice_link/rougail/00-base.yml index 77cb2d6..ded7556 100644 --- a/tests/results/00_6choice_link/rougail/00-base.yml +++ b/tests/results/00_6choice_link/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -12,3 +13,4 @@ var2: description: the second variable default: variable: _.var1 +... diff --git a/tests/results/00_6choice_variable/rougail/00-base.yml b/tests/results/00_6choice_variable/rougail/00-base.yml index ae7ac15..02d8d4d 100644 --- a/tests/results/00_6choice_variable/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6choice_variable_link/rougail/00-base.yml b/tests/results/00_6choice_variable_link/rougail/00-base.yml index a8f0453..ee93703 100644 --- a/tests/results/00_6choice_variable_link/rougail/00-base.yml +++ b/tests/results/00_6choice_variable_link/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 @@ -16,3 +17,4 @@ var3: description: a third variable default: variable: _.var2 +... diff --git a/tests/results/00_6choice_variable_link2/rougail/00-base.yml b/tests/results/00_6choice_variable_link2/rougail/00-base.yml index 496ccd5..ccd0e19 100644 --- a/tests/results/00_6choice_variable_link2/rougail/00-base.yml +++ b/tests/results/00_6choice_variable_link2/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 @@ -18,3 +19,4 @@ family: description: a third variable default: variable: __.var2 +... diff --git a/tests/results/00_6custom/rougail/00-base.yml b/tests/results/00_6custom/rougail/00-base.yml index 768a414..ab3f603 100644 --- a/tests/results/00_6custom/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6domainname/rougail/00-base.yml b/tests/results/00_6domainname/rougail/00-base.yml index 5b7c674..8034aef 100644 --- a/tests/results/00_6domainname/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6domainname_params/rougail/00-base.yml b/tests/results/00_6domainname_params/rougail/00-base.yml index 265ebf6..9e87782 100644 --- a/tests/results/00_6domainname_params/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6float/rougail/00-base.yml b/tests/results/00_6float/rougail/00-base.yml index cf8562e..097e261 100644 --- a/tests/results/00_6float/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6number/rougail/00-base.yml b/tests/results/00_6number/rougail/00-base.yml index f6d3bfa..50ca4eb 100644 --- a/tests/results/00_6number/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6port/rougail/00-base.yml b/tests/results/00_6port/rougail/00-base.yml index a0d7ad7..2a9d4c8 100644 --- a/tests/results/00_6port/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_6regexp/rougail/00-base.yml b/tests/results/00_6regexp/rougail/00-base.yml index 97175a0..d276d25 100644 --- a/tests/results/00_6regexp/rougail/00-base.yml +++ b/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' +... diff --git a/tests/results/00_6regexp_link/rougail/00-base.yml b/tests/results/00_6regexp_link/rougail/00-base.yml index b529989..9c079c3 100644 --- a/tests/results/00_6regexp_link/rougail/00-base.yml +++ b/tests/results/00_6regexp_link/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -16,3 +17,4 @@ var2: - '#b3b2b2' default: variable: _.var1 +... diff --git a/tests/results/00_6secret/rougail/00-base.yml b/tests/results/00_6secret/rougail/00-base.yml index 32dd82b..c858310 100644 --- a/tests/results/00_6secret/rougail/00-base.yml +++ b/tests/results/00_6secret/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -9,3 +10,4 @@ secret2: description: the second variable type: secret default: value +... diff --git a/tests/results/00_6secret_param/rougail/00-base.yml b/tests/results/00_6secret_param/rougail/00-base.yml index e1cfe44..dd2851c 100644 --- a/tests/results/00_6secret_param/rougail/00-base.yml +++ b/tests/results/00_6secret_param/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -25,3 +26,4 @@ secret3: forbidden_char: - $ default: value +... diff --git a/tests/results/00_6string/rougail/00-base.yml b/tests/results/00_6string/rougail/00-base.yml index e26e447..19ba92a 100644 --- a/tests/results/00_6string/rougail/00-base.yml +++ b/tests/results/00_6string/rougail/00-base.yml @@ -1,14 +1,16 @@ +%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 +... diff --git a/tests/results/00_7choice_quote/rougail/00-base.yml b/tests/results/00_7choice_quote/rougail/00-base.yml index 651d61c..1eea5b9 100644 --- a/tests/results/00_7choice_quote/rougail/00-base.yml +++ b/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' +... diff --git a/tests/results/00_7help/rougail/00-base.yml b/tests/results/00_7help/rougail/00-base.yml index ded1ab7..514b049 100644 --- a/tests/results/00_7help/rougail/00-base.yml +++ b/tests/results/00_7help/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -16,3 +17,4 @@ var2: Multi line Help With useful information +... diff --git a/tests/results/00_7help_quote/rougail/00-base.yml b/tests/results/00_7help_quote/rougail/00-base.yml index f985145..ff2bd2f 100644 --- a/tests/results/00_7help_quote/rougail/00-base.yml +++ b/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 " +... diff --git a/tests/results/00_7help_sup/rougail/00-base.yml b/tests/results/00_7help_sup/rougail/00-base.yml index 1e6d0b1..37f75b0 100644 --- a/tests/results/00_7help_sup/rougail/00-base.yml +++ b/tests/results/00_7help_sup/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -16,3 +17,4 @@ var2: Multi line With useful information +... diff --git a/tests/results/00_7value_doublequote/rougail/00-base.yml b/tests/results/00_7value_doublequote/rougail/00-base.yml index 97c9740..9a0faeb 100644 --- a/tests/results/00_7value_doublequote/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_7value_doublequote2/rougail/00-base.yml b/tests/results/00_7value_doublequote2/rougail/00-base.yml index 4a3edc4..3677cf2 100644 --- a/tests/results/00_7value_doublequote2/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_7value_doublequote3/rougail/00-base.yml b/tests/results/00_7value_doublequote3/rougail/00-base.yml index 1e5cbb9..1559187 100644 --- a/tests/results/00_7value_doublequote3/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_7value_quote/rougail/00-base.yml b/tests/results/00_7value_quote/rougail/00-base.yml index 94acfe0..9f63772 100644 --- a/tests/results/00_7value_quote/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_8calculation_information/rougail/00-base.yml b/tests/results/00_8calculation_information/rougail/00-base.yml index ca0460b..b57a22f 100644 --- a/tests/results/00_8calculation_information/rougail/00-base.yml +++ b/tests/results/00_8calculation_information/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -10,3 +11,4 @@ variable: params: test_information: information: test_information +... diff --git a/tests/results/00_8calculation_namespace/rougail/00-base.yml b/tests/results/00_8calculation_namespace/rougail/00-base.yml index ba7231d..50e8796 100644 --- a/tests/results/00_8calculation_namespace/rougail/00-base.yml +++ b/tests/results/00_8calculation_namespace/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ variable: default: type: namespace mandatory: false +... diff --git a/tests/results/00_8calculation_param_namespace/rougail/00-base.yml b/tests/results/00_8calculation_param_namespace/rougail/00-base.yml index 90e3cf6..55c82a6 100644 --- a/tests/results/00_8calculation_param_namespace/rougail/00-base.yml +++ b/tests/results/00_8calculation_param_namespace/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -10,3 +11,4 @@ variable: namespace: type: namespace mandatory: false +... diff --git a/tests/results/00_8test/rougail/00-base.yml b/tests/results/00_8test/rougail/00-base.yml index 8fae93d..0e701b8 100644 --- a/tests/results/00_8test/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9choice_variable_multi/rougail/00-base.yml b/tests/results/00_9choice_variable_multi/rougail/00-base.yml index d2cc9dd..ba5a849 100644 --- a/tests/results/00_9choice_variable_multi/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9choice_variables/rougail/00-base.yml b/tests/results/00_9choice_variables/rougail/00-base.yml index ac905ac..63fd4f7 100644 --- a/tests/results/00_9choice_variables/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_calculation/rougail/00-base.yml b/tests/results/00_9default_calculation/rougail/00-base.yml index 9766fc0..5a617db 100644 --- a/tests/results/00_9default_calculation/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_calculation_information/rougail/00-base.yml b/tests/results/00_9default_calculation_information/rougail/00-base.yml index 2adfcaa..07b647c 100644 --- a/tests/results/00_9default_calculation_information/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_calculation_information_other_variable/rougail/00-base.yml b/tests/results/00_9default_calculation_information_other_variable/rougail/00-base.yml index e4d3bbc..9efea0b 100644 --- a/tests/results/00_9default_calculation_information_other_variable/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_calculation_multi_optional/rougail/00-base.yml b/tests/results/00_9default_calculation_multi_optional/rougail/00-base.yml index b02f898..3dada99 100644 --- a/tests/results/00_9default_calculation_multi_optional/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_calculation_multi_optional2/rougail/00-base.yml b/tests/results/00_9default_calculation_multi_optional2/rougail/00-base.yml index 872b5da..77fdfa5 100644 --- a/tests/results/00_9default_calculation_multi_optional2/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_calculation_optional/rougail/00-base.yml b/tests/results/00_9default_calculation_optional/rougail/00-base.yml index 1089f32..0ffe1ae 100644 --- a/tests/results/00_9default_calculation_optional/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_calculation_optional_exists/rougail/00-base.yml b/tests/results/00_9default_calculation_optional_exists/rougail/00-base.yml index d89fb51..1afa927 100644 --- a/tests/results/00_9default_calculation_optional_exists/rougail/00-base.yml +++ b/tests/results/00_9default_calculation_optional_exists/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -10,3 +11,4 @@ my_calculated_variable: default: variable: _.my_variable optional: true +... diff --git a/tests/results/00_9default_calculation_param_optional/rougail/00-base.yml b/tests/results/00_9default_calculation_param_optional/rougail/00-base.yml index 820261b..a4dd753 100644 --- a/tests/results/00_9default_calculation_param_optional/rougail/00-base.yml +++ b/tests/results/00_9default_calculation_param_optional/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -28,3 +29,4 @@ var1: mandatory: false var2: no # a second variable +... diff --git a/tests/results/00_9default_information_other_variable/rougail/00-base.yml b/tests/results/00_9default_information_other_variable/rougail/00-base.yml index 1b62a57..bc3be01 100644 --- a/tests/results/00_9default_information_other_variable/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_information_other_variable2/rougail/00-base.yml b/tests/results/00_9default_information_other_variable2/rougail/00-base.yml index 1b62a57..bc3be01 100644 --- a/tests/results/00_9default_information_other_variable2/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9default_integer/rougail/00-base.yml b/tests/results/00_9default_integer/rougail/00-base.yml index e0e6ff3..23067c1 100644 --- a/tests/results/00_9default_integer/rougail/00-base.yml +++ b/tests/results/00_9default_integer/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -11,3 +12,4 @@ var: return_type: number description: choice for 0 to 9 default: 9 +... diff --git a/tests/results/00_9extra/extra/00-base.yml b/tests/results/00_9extra/extra/00-base.yml index 310df13..d240b1c 100644 --- a/tests/results/00_9extra/extra/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9extra/rougail/00-base.yml b/tests/results/00_9extra/rougail/00-base.yml index ad22b62..a1c1557 100644 --- a/tests/results/00_9extra/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9extra_calculation/extra/00-base.yml b/tests/results/00_9extra_calculation/extra/00-base.yml index 9e42b35..8a32aea 100644 --- a/tests/results/00_9extra_calculation/extra/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9extra_calculation/rougail/00-base.yml b/tests/results/00_9extra_calculation/rougail/00-base.yml index 8a65454..d992a6c 100644 --- a/tests/results/00_9extra_calculation/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9extra_ouside/extra/00-base.yml b/tests/results/00_9extra_ouside/extra/00-base.yml index c427895..96bcf5d 100644 --- a/tests/results/00_9extra_ouside/extra/00-base.yml +++ b/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 +... diff --git a/tests/results/00_9extra_ouside/rougail/00-base.yml b/tests/results/00_9extra_ouside/rougail/00-base.yml index 01633f2..4bbbce8 100644 --- a/tests/results/00_9extra_ouside/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/01_6boolean_multi/rougail/00-base.yml b/tests/results/01_6boolean_multi/rougail/00-base.yml index 029cab4..05baf0e 100644 --- a/tests/results/01_6boolean_multi/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/01_6custom_multi/rougail/00-base.yml b/tests/results/01_6custom_multi/rougail/00-base.yml index 2aaf882..ebf5764 100644 --- a/tests/results/01_6custom_multi/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/01_6float_multi/rougail/00-base.yml b/tests/results/01_6float_multi/rougail/00-base.yml index 021c239..945ca98 100644 --- a/tests/results/01_6float_multi/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/01_6number_multi/rougail/00-base.yml b/tests/results/01_6number_multi/rougail/00-base.yml index 7afe3f0..c1dfeaf 100644 --- a/tests/results/01_6number_multi/rougail/00-base.yml +++ b/tests/results/01_6number_multi/rougail/00-base.yml @@ -1,26 +1,28 @@ +%YAML 1.2 --- version: 1.1 -var1: # the first variable +var1: # the first variable - 0 -var2: # the second variable +var2: # the second variable - 0 -var3: # the third variable +var3: # the third variable - 0 -var4: # the forth variable +var4: # the forth variable - 10 -var5: # the fifth variable +var5: # the fifth variable - 10 -var6: # the sixth variable +var6: # the sixth variable - 10 -var7: # the seventh variable +var7: # the seventh variable - 0 -var8: # the eighth variable +var8: # the eighth variable - 0 +... diff --git a/tests/results/01_6string_empty/rougail/00-base.yml b/tests/results/01_6string_empty/rougail/00-base.yml index 4ef9b52..d770b29 100644 --- a/tests/results/01_6string_empty/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/01_6string_multi/rougail/00-base.yml b/tests/results/01_6string_multi/rougail/00-base.yml index fcd5865..199e19f 100644 --- a/tests/results/01_6string_multi/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/01_7value_multi_doublequote/rougail/00-base.yml b/tests/results/01_7value_multi_doublequote/rougail/00-base.yml index 9139fc9..6aa9f5d 100644 --- a/tests/results/01_7value_multi_doublequote/rougail/00-base.yml +++ b/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" +... diff --git a/tests/results/01_7value_multi_doublequote2/rougail/00-base.yml b/tests/results/01_7value_multi_doublequote2/rougail/00-base.yml index eb91b94..151c3cb 100644 --- a/tests/results/01_7value_multi_doublequote2/rougail/00-base.yml +++ b/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'" +... diff --git a/tests/results/01_7value_multi_quote/rougail/00-base.yml b/tests/results/01_7value_multi_quote/rougail/00-base.yml index eef8035..f56b359 100644 --- a/tests/results/01_7value_multi_quote/rougail/00-base.yml +++ b/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' +... diff --git a/tests/results/01_8calculation_information_multi/rougail/00-base.yml b/tests/results/01_8calculation_information_multi/rougail/00-base.yml index 16cbee9..6d473e2 100644 --- a/tests/results/01_8calculation_information_multi/rougail/00-base.yml +++ b/tests/results/01_8calculation_information_multi/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -13,3 +14,4 @@ variable: params: test_information: information: test_information_list +... diff --git a/tests/results/01_9choice_variable_multi/rougail/00-base.yml b/tests/results/01_9choice_variable_multi/rougail/00-base.yml index 442e709..172a7ca 100644 --- a/tests/results/01_9choice_variable_multi/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/04_0type_param/rougail/00-base.yml b/tests/results/04_0type_param/rougail/00-base.yml index 3bbd4ff..9bf8b11 100644 --- a/tests/results/04_0type_param/rougail/00-base.yml +++ b/tests/results/04_0type_param/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -7,3 +8,4 @@ int: min_number: 0 max_number: 100 default: 10 +... diff --git a/tests/results/04_1auto_save/rougail/00-base.yml b/tests/results/04_1auto_save/rougail/00-base.yml index 206db87..60c7e83 100644 --- a/tests/results/04_1auto_save/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/04_1auto_save_and_calculated/rougail/00-base.yml b/tests/results/04_1auto_save_and_calculated/rougail/00-base.yml index 80472de..6316c5a 100644 --- a/tests/results/04_1auto_save_and_calculated/rougail/00-base.yml +++ b/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 +... diff --git a/tests/results/04_1auto_save_and_calculated_hidden/rougail/00-base.yml b/tests/results/04_1auto_save_and_calculated_hidden/rougail/00-base.yml index 0ac60d7..90b9044 100644 --- a/tests/results/04_1auto_save_and_calculated_hidden/rougail/00-base.yml +++ b/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 @@ -16,3 +17,4 @@ var2: _.var1 is yes {% endif %} description: only if the variable var1 has value "yes" +... diff --git a/tests/results/04_1auto_save_and_hidden/rougail/00-base.yml b/tests/results/04_1auto_save_and_hidden/rougail/00-base.yml index d3f709b..171ed03 100644 --- a/tests/results/04_1auto_save_and_hidden/rougail/00-base.yml +++ b/tests/results/04_1auto_save_and_hidden/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -7,3 +8,4 @@ var: auto_save: true mandatory: false hidden: true +... diff --git a/tests/results/04_1default_calculation_hidden/rougail/00-base.yml b/tests/results/04_1default_calculation_hidden/rougail/00-base.yml index 6ec374c..06b76a4 100644 --- a/tests/results/04_1default_calculation_hidden/rougail/00-base.yml +++ b/tests/results/04_1default_calculation_hidden/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: value # a first variable +var1: value # a first variable var2: description: a second variable @@ -16,3 +17,4 @@ var3: {% if _.var1 == 'value' or _.var2 == 'blah' %} value {% endif %} +... diff --git a/tests/results/04_1default_calculation_hidden_2/rougail/00-base.yml b/tests/results/04_1default_calculation_hidden_2/rougail/00-base.yml index 49a32c6..815fd6f 100644 --- a/tests/results/04_1default_calculation_hidden_2/rougail/00-base.yml +++ b/tests/results/04_1default_calculation_hidden_2/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: value # a first variable +var1: value # a first variable var2: description: a second variable @@ -16,3 +17,4 @@ var3: {% if _.var2 is propertyerror %} value {% endif %} +... diff --git a/tests/results/04_5disabled_calculation/rougail/00-base.yml b/tests/results/04_5disabled_calculation/rougail/00-base.yml index 39ad38c..87998cb 100644 --- a/tests/results/04_5disabled_calculation/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a conditional variable +condition: no # a conditional variable variable1: description: a first variable @@ -20,3 +21,4 @@ variable2: condition is yes {% endif %} description: if condition is egal to "yes" +... diff --git a/tests/results/04_5disabled_calculation_default/rougail/00-base.yml b/tests/results/04_5disabled_calculation_default/rougail/00-base.yml index e6dacef..c3a289e 100644 --- a/tests/results/04_5disabled_calculation_default/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_default/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a condition +condition: no # a condition var1: description: a first variable @@ -28,3 +29,4 @@ var2: condition is yes {% endif %} description: if condition is yes +... diff --git a/tests/results/04_5disabled_calculation_multi/rougail/00-base.yml b/tests/results/04_5disabled_calculation_multi/rougail/00-base.yml index 6127572..39dacb4 100644 --- a/tests/results/04_5disabled_calculation_multi/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_multi/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a conditional variable +condition: no # a conditional variable variable1: description: a first variable @@ -22,3 +23,4 @@ variable2: condition is yes {% endif %} description: if condition is egal to "yes" +... diff --git a/tests/results/04_5disabled_calculation_optional/rougail/00-base.yml b/tests/results/04_5disabled_calculation_optional/rougail/00-base.yml index 898dfc7..7867375 100644 --- a/tests/results/04_5disabled_calculation_optional/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_optional/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a condition +condition: no # a condition var1: description: a first variable @@ -34,3 +35,4 @@ var2: condition: variable: _.condition optional: true +... diff --git a/tests/results/04_5disabled_calculation_variable/rougail/00-base.yml b/tests/results/04_5disabled_calculation_variable/rougail/00-base.yml index 7db17e1..edbfc2a 100644 --- a/tests/results/04_5disabled_calculation_variable/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_variable/rougail/00-base.yml @@ -1,9 +1,11 @@ +%YAML 1.2 --- version: 1.1 -condition: false # a condition +condition: false # a condition variable: description: a variable disabled: variable: _.condition +... diff --git a/tests/results/04_5disabled_calculation_variable2/rougail/00-base.yml b/tests/results/04_5disabled_calculation_variable2/rougail/00-base.yml index 9f7e7f4..dfbf09f 100644 --- a/tests/results/04_5disabled_calculation_variable2/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_variable2/rougail/00-base.yml @@ -1,9 +1,11 @@ +%YAML 1.2 --- version: 1.1 -condition: true # a condition +condition: true # a condition variable: description: a variable disabled: variable: _.condition +... diff --git a/tests/results/04_5disabled_calculation_variable3/rougail/00-base.yml b/tests/results/04_5disabled_calculation_variable3/rougail/00-base.yml index 364ad5d..fd3d336 100644 --- a/tests/results/04_5disabled_calculation_variable3/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_variable3/rougail/00-base.yml @@ -1,10 +1,12 @@ +%YAML 1.2 --- version: 1.1 -condition: yes # a condition +condition: yes # a condition variable: description: a variable disabled: variable: _.condition when: yes +... diff --git a/tests/results/04_5disabled_calculation_variable4/rougail/00-base.yml b/tests/results/04_5disabled_calculation_variable4/rougail/00-base.yml index b44b54e..d79fa64 100644 --- a/tests/results/04_5disabled_calculation_variable4/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_variable4/rougail/00-base.yml @@ -1,10 +1,12 @@ +%YAML 1.2 --- version: 1.1 -condition: yes # a condition +condition: yes # a condition variable: description: a variable disabled: variable: _.condition when_not: yes +... diff --git a/tests/results/04_5disabled_calculation_variable_multi/rougail/00-base.yml b/tests/results/04_5disabled_calculation_variable_multi/rougail/00-base.yml index fde0c53..f0045a6 100644 --- a/tests/results/04_5disabled_calculation_variable_multi/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_variable_multi/rougail/00-base.yml @@ -1,10 +1,12 @@ +%YAML 1.2 --- version: 1.1 -condition: false # a condition +condition: false # a condition variable: description: a variable multi: true disabled: variable: _.condition +... diff --git a/tests/results/04_5disabled_calculation_variable_multi2/rougail/00-base.yml b/tests/results/04_5disabled_calculation_variable_multi2/rougail/00-base.yml index 0091bd0..16cfe57 100644 --- a/tests/results/04_5disabled_calculation_variable_multi2/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_variable_multi2/rougail/00-base.yml @@ -1,10 +1,12 @@ +%YAML 1.2 --- version: 1.1 -condition: [] # a condition +condition: [] # a condition variable: description: a variable multi: true disabled: variable: _.condition +... diff --git a/tests/results/04_5disabled_calculation_variable_multi3/rougail/00-base.yml b/tests/results/04_5disabled_calculation_variable_multi3/rougail/00-base.yml index aff17ad..af56fa3 100644 --- a/tests/results/04_5disabled_calculation_variable_multi3/rougail/00-base.yml +++ b/tests/results/04_5disabled_calculation_variable_multi3/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: # a condition +condition: # a condition - val1 - val2 @@ -10,3 +11,4 @@ variable: multi: true disabled: variable: _.condition +... diff --git a/tests/results/04_5hidden_calculation/rougail/00-base.yml b/tests/results/04_5hidden_calculation/rougail/00-base.yml index fffc089..4459f4e 100644 --- a/tests/results/04_5hidden_calculation/rougail/00-base.yml +++ b/tests/results/04_5hidden_calculation/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # the condition +condition: no # the condition var1: description: a first variable @@ -22,3 +23,4 @@ var2: condition is yes {% endif %} description: if condition is yes +... diff --git a/tests/results/04_5hidden_calculation2/rougail/00-base.yml b/tests/results/04_5hidden_calculation2/rougail/00-base.yml index 5cbf335..5211d61 100644 --- a/tests/results/04_5hidden_calculation2/rougail/00-base.yml +++ b/tests/results/04_5hidden_calculation2/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a condition +condition: no # a condition var1: description: a first variable @@ -28,3 +29,4 @@ var2: condition is yes {% endif %} description: if condition is yes +... diff --git a/tests/results/04_5hidden_calculation_default_calculation/rougail/00-base.yml b/tests/results/04_5hidden_calculation_default_calculation/rougail/00-base.yml index a49c9d2..2978547 100644 --- a/tests/results/04_5hidden_calculation_default_calculation/rougail/00-base.yml +++ b/tests/results/04_5hidden_calculation_default_calculation/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a condition +condition: no # a condition var1: description: a first variable @@ -28,3 +29,4 @@ var2: condition is yes {% endif %} description: if condition is yes +... diff --git a/tests/results/04_5validators/rougail/00-base.yml b/tests/results/04_5validators/rougail/00-base.yml index 251d8b6..36081d5 100644 --- a/tests/results/04_5validators/rougail/00-base.yml +++ b/tests/results/04_5validators/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -10,3 +11,4 @@ int: value is too high {% endif %} description: the max value is 100 +... diff --git a/tests/results/04_5validators_differ/rougail/00-base.yml b/tests/results/04_5validators_differ/rougail/00-base.yml index 90456f5..5cf93e8 100644 --- a/tests/results/04_5validators_differ/rougail/00-base.yml +++ b/tests/results/04_5validators_differ/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -14,3 +15,4 @@ var1: default: oui var2: no # A second variable +... diff --git a/tests/results/04_5validators_multi/rougail/00-base.yml b/tests/results/04_5validators_multi/rougail/00-base.yml index 4951a60..cd062fa 100644 --- a/tests/results/04_5validators_multi/rougail/00-base.yml +++ b/tests/results/04_5validators_multi/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -12,3 +13,4 @@ var1: default: - no - yes +... diff --git a/tests/results/04_5validators_multi2/rougail/00-base.yml b/tests/results/04_5validators_multi2/rougail/00-base.yml index 31fbdd4..9ff4dce 100644 --- a/tests/results/04_5validators_multi2/rougail/00-base.yml +++ b/tests/results/04_5validators_multi2/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -19,3 +20,4 @@ var1: default: - no - yes +... diff --git a/tests/results/05_0multi_not_uniq/rougail/00-base.yml b/tests/results/05_0multi_not_uniq/rougail/00-base.yml index a2f9761..c92556d 100644 --- a/tests/results/05_0multi_not_uniq/rougail/00-base.yml +++ b/tests/results/05_0multi_not_uniq/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ var1: default: - non unique: false +... diff --git a/tests/results/05_0multi_uniq/rougail/00-base.yml b/tests/results/05_0multi_uniq/rougail/00-base.yml index 5254e3d..f27d094 100644 --- a/tests/results/05_0multi_uniq/rougail/00-base.yml +++ b/tests/results/05_0multi_uniq/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ variable: default: - non unique: true +... diff --git a/tests/results/12_1auto_save_expert/rougail/00-base.yml b/tests/results/12_1auto_save_expert/rougail/00-base.yml index 7e72c46..cbdad7c 100644 --- a/tests/results/12_1auto_save_expert/rougail/00-base.yml +++ b/tests/results/12_1auto_save_expert/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ var: mode: advanced default: no auto_save: true +... diff --git a/tests/results/16_0redefine_description/rougail/00-base.yml b/tests/results/16_0redefine_description/rougail/00-base.yml index 77c437c..5f1646a 100644 --- a/tests/results/16_0redefine_description/rougail/00-base.yml +++ b/tests/results/16_0redefine_description/rougail/00-base.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- version: 1.1 -var: # Redefine description +var: # Redefine description +... diff --git a/tests/results/16_0redefine_description/rougail/01-redefine.yml b/tests/results/16_0redefine_description/rougail/01-redefine.yml index 6c05529..98fe19d 100644 --- a/tests/results/16_0redefine_description/rougail/01-redefine.yml +++ b/tests/results/16_0redefine_description/rougail/01-redefine.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 var: redefine: true description: Redefined +... diff --git a/tests/results/16_2family_redefine_calculation/rougail/00-base.yml b/tests/results/16_2family_redefine_calculation/rougail/00-base.yml index 6c75df6..a032ab7 100644 --- a/tests/results/16_2family_redefine_calculation/rougail/00-base.yml +++ b/tests/results/16_2family_redefine_calculation/rougail/00-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 family: var1: +... diff --git a/tests/results/16_2family_redefine_calculation/rougail/01-base.yml b/tests/results/16_2family_redefine_calculation/rougail/01-base.yml index bf8ab55..52dfe48 100644 --- a/tests/results/16_2family_redefine_calculation/rougail/01-base.yml +++ b/tests/results/16_2family_redefine_calculation/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ family: disabled: jinja: |- true +... diff --git a/tests/results/16_2family_redefine_disabled/rougail/00-base.yml b/tests/results/16_2family_redefine_disabled/rougail/00-base.yml index 6c75df6..a032ab7 100644 --- a/tests/results/16_2family_redefine_disabled/rougail/00-base.yml +++ b/tests/results/16_2family_redefine_disabled/rougail/00-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 family: var1: +... diff --git a/tests/results/16_2family_redefine_disabled/rougail/01-base.yml b/tests/results/16_2family_redefine_disabled/rougail/01-base.yml index 996f45a..e40377e 100644 --- a/tests/results/16_2family_redefine_disabled/rougail/01-base.yml +++ b/tests/results/16_2family_redefine_disabled/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 family: redefine: true disabled: true +... diff --git a/tests/results/16_3family_empty_at_ends/rougail/00-base.yml b/tests/results/16_3family_empty_at_ends/rougail/00-base.yml new file mode 100644 index 0000000..a032ab7 --- /dev/null +++ b/tests/results/16_3family_empty_at_ends/rougail/00-base.yml @@ -0,0 +1,8 @@ +%YAML 1.2 +--- +version: 1.1 + +family: + + var1: +... diff --git a/tests/results/16_3family_empty_at_ends/rougail/01-base.yml b/tests/results/16_3family_empty_at_ends/rougail/01-base.yml new file mode 100644 index 0000000..8829eae --- /dev/null +++ b/tests/results/16_3family_empty_at_ends/rougail/01-base.yml @@ -0,0 +1,6 @@ +%YAML 1.2 +--- +version: 1.1 + +family: +... diff --git a/tests/results/16_5exists_nonexists/rougail/00-base.yml b/tests/results/16_5exists_nonexists/rougail/00-base.yml index 96109d3..fe40fdd 100644 --- a/tests/results/16_5exists_nonexists/rougail/00-base.yml +++ b/tests/results/16_5exists_nonexists/rougail/00-base.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- version: 1.1 -var1: no # a variable +var1: no # a variable +... diff --git a/tests/results/16_5exists_nonexists/rougail/01-base.yml b/tests/results/16_5exists_nonexists/rougail/01-base.yml index fb8890e..24e9c43 100644 --- a/tests/results/16_5exists_nonexists/rougail/01-base.yml +++ b/tests/results/16_5exists_nonexists/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,3 +6,4 @@ var2: exists: false description: a new variable default: yes +... diff --git a/tests/results/16_5exists_redefine/rougail/00-base.yml b/tests/results/16_5exists_redefine/rougail/00-base.yml index 75bdbc6..6ccddbb 100644 --- a/tests/results/16_5exists_redefine/rougail/00-base.yml +++ b/tests/results/16_5exists_redefine/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ var1: default: no mandatory: false hidden: true +... diff --git a/tests/results/16_5exists_redefine/rougail/01-base.yml b/tests/results/16_5exists_redefine/rougail/01-base.yml index 30e1480..ffccc70 100644 --- a/tests/results/16_5exists_redefine/rougail/01-base.yml +++ b/tests/results/16_5exists_redefine/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -11,3 +12,4 @@ var2: exists: true description: a second variable default: yes +... diff --git a/tests/results/16_5redefine_calculation/rougail/00-base.yml b/tests/results/16_5redefine_calculation/rougail/00-base.yml index 47b0111..0df2466 100644 --- a/tests/results/16_5redefine_calculation/rougail/00-base.yml +++ b/tests/results/16_5redefine_calculation/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -7,3 +8,4 @@ variable: jinja: >- no description: returns no +... diff --git a/tests/results/16_5redefine_calculation/rougail/01-base.yml b/tests/results/16_5redefine_calculation/rougail/01-base.yml index 5479cc6..4868c8f 100644 --- a/tests/results/16_5redefine_calculation/rougail/01-base.yml +++ b/tests/results/16_5redefine_calculation/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -7,3 +8,4 @@ variable: jinja: >- yes description: returns yes +... diff --git a/tests/results/16_5redefine_choice/rougail/00-base.yml b/tests/results/16_5redefine_choice/rougail/00-base.yml index 0596299..2698f0d 100644 --- a/tests/results/16_5redefine_choice/rougail/00-base.yml +++ b/tests/results/16_5redefine_choice/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -7,3 +8,4 @@ variable: - a - b - c +... diff --git a/tests/results/16_5redefine_choice/rougail/01-redefine.yml b/tests/results/16_5redefine_choice/rougail/01-redefine.yml index aab8b1b..114d583 100644 --- a/tests/results/16_5redefine_choice/rougail/01-redefine.yml +++ b/tests/results/16_5redefine_choice/rougail/01-redefine.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ variable: choices: - a - b +... diff --git a/tests/results/16_5redefine_default/rougail/00-base.yml b/tests/results/16_5redefine_default/rougail/00-base.yml index 07d5d85..0175ac5 100644 --- a/tests/results/16_5redefine_default/rougail/00-base.yml +++ b/tests/results/16_5redefine_default/rougail/00-base.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- version: 1.1 -variable: no # a variable +variable: no # a variable +... diff --git a/tests/results/16_5redefine_default/rougail/01-redefine.yml b/tests/results/16_5redefine_default/rougail/01-redefine.yml index 3ede28d..9b46077 100644 --- a/tests/results/16_5redefine_default/rougail/01-redefine.yml +++ b/tests/results/16_5redefine_default/rougail/01-redefine.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 variable: redefine: true default: yes +... diff --git a/tests/results/16_5redefine_default_calculation/rougail/00-base.yml b/tests/results/16_5redefine_default_calculation/rougail/00-base.yml index 9719521..3908599 100644 --- a/tests/results/16_5redefine_default_calculation/rougail/00-base.yml +++ b/tests/results/16_5redefine_default_calculation/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ variable: default: jinja: >- yes +... diff --git a/tests/results/16_5redefine_default_calculation/rougail/01-base.yml b/tests/results/16_5redefine_default_calculation/rougail/01-base.yml index 22ae069..5be53c4 100644 --- a/tests/results/16_5redefine_default_calculation/rougail/01-base.yml +++ b/tests/results/16_5redefine_default_calculation/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 variable: redefine: true default: +... diff --git a/tests/results/16_5redefine_family/rougail/00-base.yml b/tests/results/16_5redefine_family/rougail/00-base.yml index 170c7f9..f1bc9a5 100644 --- a/tests/results/16_5redefine_family/rougail/00-base.yml +++ b/tests/results/16_5redefine_family/rougail/00-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 -family: # a family +family: # a family variable: # a variable +... diff --git a/tests/results/16_5redefine_family/rougail/01-base.yml b/tests/results/16_5redefine_family/rougail/01-base.yml index 4fbfee0..3de434a 100644 --- a/tests/results/16_5redefine_family/rougail/01-base.yml +++ b/tests/results/16_5redefine_family/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 family: redefine: true description: new description +... diff --git a/tests/results/16_5redefine_help/rougail/00-base.yml b/tests/results/16_5redefine_help/rougail/00-base.yml index 1c09d1b..39037e7 100644 --- a/tests/results/16_5redefine_help/rougail/00-base.yml +++ b/tests/results/16_5redefine_help/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -8,3 +9,4 @@ family: variable: description: redefine help help: redefine help +... diff --git a/tests/results/16_5redefine_help/rougail/01-base.yml b/tests/results/16_5redefine_help/rougail/01-base.yml index 01819af..4319689 100644 --- a/tests/results/16_5redefine_help/rougail/01-base.yml +++ b/tests/results/16_5redefine_help/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -8,3 +9,4 @@ family: variable: redefine: true help: redefine help ok +... diff --git a/tests/results/16_5redefine_hidden/rougail/00-base.yml b/tests/results/16_5redefine_hidden/rougail/00-base.yml index 07d5d85..0175ac5 100644 --- a/tests/results/16_5redefine_hidden/rougail/00-base.yml +++ b/tests/results/16_5redefine_hidden/rougail/00-base.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- version: 1.1 -variable: no # a variable +variable: no # a variable +... diff --git a/tests/results/16_5redefine_hidden/rougail/01-redefine.yml b/tests/results/16_5redefine_hidden/rougail/01-redefine.yml index b174cd3..afdcee1 100644 --- a/tests/results/16_5redefine_hidden/rougail/01-redefine.yml +++ b/tests/results/16_5redefine_hidden/rougail/01-redefine.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,3 +6,4 @@ variable: redefine: true mandatory: false hidden: true +... diff --git a/tests/results/16_5redefine_multi/rougail/00-base.yml b/tests/results/16_5redefine_multi/rougail/00-base.yml index 4d86184..e3cf0ac 100644 --- a/tests/results/16_5redefine_multi/rougail/00-base.yml +++ b/tests/results/16_5redefine_multi/rougail/00-base.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- version: 1.1 -variable: non # a variable +variable: non # a variable +... diff --git a/tests/results/16_5redefine_multi/rougail/01-redefine.yml b/tests/results/16_5redefine_multi/rougail/01-redefine.yml index 1d3ed5e..f02cf34 100644 --- a/tests/results/16_5redefine_multi/rougail/01-redefine.yml +++ b/tests/results/16_5redefine_multi/rougail/01-redefine.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,3 +6,4 @@ variable: redefine: true default: - non +... diff --git a/tests/results/16_5redefine_remove_disable_calculation/rougail/00-base.yml b/tests/results/16_5redefine_remove_disable_calculation/rougail/00-base.yml index 74cb5f2..7aa2e6b 100644 --- a/tests/results/16_5redefine_remove_disable_calculation/rougail/00-base.yml +++ b/tests/results/16_5redefine_remove_disable_calculation/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a condition +condition: no # a condition variable: description: a variable @@ -12,3 +13,4 @@ variable: {% else %} false {% endif %} +... diff --git a/tests/results/16_5redefine_remove_disable_calculation/rougail/01-base.yml b/tests/results/16_5redefine_remove_disable_calculation/rougail/01-base.yml index 3f9167c..2568547 100644 --- a/tests/results/16_5redefine_remove_disable_calculation/rougail/01-base.yml +++ b/tests/results/16_5redefine_remove_disable_calculation/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 variable: redefine: true disabled: false +... diff --git a/tests/results/16_5test_redefine/rougail/00-base.yml b/tests/results/16_5test_redefine/rougail/00-base.yml index 8406166..81541d3 100644 --- a/tests/results/16_5test_redefine/rougail/00-base.yml +++ b/tests/results/16_5test_redefine/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,3 +14,4 @@ var3: description: a third variable test: - test +... diff --git a/tests/results/16_5test_redefine/rougail/10-base.yml b/tests/results/16_5test_redefine/rougail/10-base.yml index 7bfe6f9..dee2e1a 100644 --- a/tests/results/16_5test_redefine/rougail/10-base.yml +++ b/tests/results/16_5test_redefine/rougail/10-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -13,4 +14,5 @@ var2: var3: redefine: true - test: + test: null +... diff --git a/tests/results/16_6choice_redefine/rougail/00-base.yml b/tests/results/16_6choice_redefine/rougail/00-base.yml index 60750f3..58d3662 100644 --- a/tests/results/16_6choice_redefine/rougail/00-base.yml +++ b/tests/results/16_6choice_redefine/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -9,3 +10,4 @@ var: - b - c default: c +... diff --git a/tests/results/16_6choice_redefine/rougail/01-base.yml b/tests/results/16_6choice_redefine/rougail/01-base.yml index b01cc1f..10e7489 100644 --- a/tests/results/16_6choice_redefine/rougail/01-base.yml +++ b/tests/results/16_6choice_redefine/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ var: choices: - a - c +... diff --git a/tests/results/16_6exists_family/rougail/00-test.yml b/tests/results/16_6exists_family/rougail/00-test.yml index 3c06dc4..fc39df8 100644 --- a/tests/results/16_6exists_family/rougail/00-test.yml +++ b/tests/results/16_6exists_family/rougail/00-test.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,3 +6,4 @@ family: exists: true variable: +... diff --git a/tests/results/16_6exists_redefine_family/rougail/00-base.yml b/tests/results/16_6exists_redefine_family/rougail/00-base.yml index 473ed7d..6958c09 100644 --- a/tests/results/16_6exists_redefine_family/rougail/00-base.yml +++ b/tests/results/16_6exists_redefine_family/rougail/00-base.yml @@ -1,10 +1,12 @@ +%YAML 1.2 --- version: 1.1 -family1: # a family +family1: # a family variable1: # a variable -family2: # a second family +family2: # a second family variable2: # a second variable +... diff --git a/tests/results/16_6exists_redefine_family/rougail/01-base.yml b/tests/results/16_6exists_redefine_family/rougail/01-base.yml index c415f21..2a38c88 100644 --- a/tests/results/16_6exists_redefine_family/rougail/01-base.yml +++ b/tests/results/16_6exists_redefine_family/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -14,3 +15,4 @@ family3: redefine: true exists: true description: new description +... diff --git a/tests/results/16exists_exists/rougail/00-base.yml b/tests/results/16exists_exists/rougail/00-base.yml index 8b31cd7..2f9406a 100644 --- a/tests/results/16exists_exists/rougail/00-base.yml +++ b/tests/results/16exists_exists/rougail/00-base.yml @@ -1,4 +1,6 @@ +%YAML 1.2 --- version: 1.1 -var: # Description +var: # Description +... diff --git a/tests/results/16exists_exists/rougail/01-base.yml b/tests/results/16exists_exists/rougail/01-base.yml index 73630d5..d0dc362 100644 --- a/tests/results/16exists_exists/rougail/01-base.yml +++ b/tests/results/16exists_exists/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 var: exists: false description: New description +... diff --git a/tests/results/17_5redefine_leadership/rougail/00-base.yml b/tests/results/17_5redefine_leadership/rougail/00-base.yml index 56e83aa..a8d86a8 100644 --- a/tests/results/17_5redefine_leadership/rougail/00-base.yml +++ b/tests/results/17_5redefine_leadership/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -13,3 +14,4 @@ leader: follower: description: a follower mandatory: false +... diff --git a/tests/results/17_5redefine_leadership/rougail/01-base.yml b/tests/results/17_5redefine_leadership/rougail/01-base.yml index 88a6a11..b3cb5c4 100644 --- a/tests/results/17_5redefine_leadership/rougail/01-base.yml +++ b/tests/results/17_5redefine_leadership/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 leader: redefine: true hidden: true +... diff --git a/tests/results/20_0empty_family/rougail/00-base.yml b/tests/results/20_0empty_family/rougail/00-base.yml index 58bfa92..d37a68d 100644 --- a/tests/results/20_0empty_family/rougail/00-base.yml +++ b/tests/results/20_0empty_family/rougail/00-base.yml @@ -1,5 +1,7 @@ +%YAML 1.2 --- version: 1.1 my_family: type: family +... diff --git a/tests/results/20_0family_append/rougail/00-base.yml b/tests/results/20_0family_append/rougail/00-base.yml index dd90eb6..d4c9d81 100644 --- a/tests/results/20_0family_append/rougail/00-base.yml +++ b/tests/results/20_0family_append/rougail/00-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 -family: # A family +family: # A family var1: # The first variable +... diff --git a/tests/results/20_0family_append/rougail/01-base.yml b/tests/results/20_0family_append/rougail/01-base.yml index 5d4ac74..4d20d4c 100644 --- a/tests/results/20_0family_append/rougail/01-base.yml +++ b/tests/results/20_0family_append/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 family: var2: # The second variable +... diff --git a/tests/results/20_0family_underscore/rougail/00-base.yml b/tests/results/20_0family_underscore/rougail/00-base.yml index 46f0751..ad15753 100644 --- a/tests/results/20_0family_underscore/rougail/00-base.yml +++ b/tests/results/20_0family_underscore/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -8,12 +9,12 @@ my_family: _hidden: true _disabled: true - type: # a type family + type: # a type family my_variable: mandatory: false - description: # This is a other great family + description: # This is a other great family my_variable: mandatory: false @@ -45,3 +46,4 @@ my_family: my_variable: mandatory: false +... diff --git a/tests/results/20_0multi_family/rougail/00-base.yml b/tests/results/20_0multi_family/rougail/00-base.yml index a826b6b..150d7a8 100644 --- a/tests/results/20_0multi_family/rougail/00-base.yml +++ b/tests/results/20_0multi_family/rougail/00-base.yml @@ -1,10 +1,12 @@ +%YAML 1.2 --- version: 1.1 -family: # a family +family: # a family subfamily: # a sub family variable: description: a variable mandatory: false +... diff --git a/tests/results/20_0multi_family_basic/rougail/00-base.yml b/tests/results/20_0multi_family_basic/rougail/00-base.yml index d75bd86..b83ef3d 100644 --- a/tests/results/20_0multi_family_basic/rougail/00-base.yml +++ b/tests/results/20_0multi_family_basic/rougail/00-base.yml @@ -1,8 +1,10 @@ +%YAML 1.2 --- version: 1.1 -family: # a family +family: # a family subfamily: # a sub family variable: # a variable +... diff --git a/tests/results/20_0multi_family_expert/rougail/00-base.yml b/tests/results/20_0multi_family_expert/rougail/00-base.yml index 1320c08..67760ab 100644 --- a/tests/results/20_0multi_family_expert/rougail/00-base.yml +++ b/tests/results/20_0multi_family_expert/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,8 +6,9 @@ family: description: a family mode: advanced - subfamily: # a sub family + subfamily: # a sub family variable: description: a variable mandatory: false +... diff --git a/tests/results/20_0multi_family_order/rougail/00-base.yml b/tests/results/20_0multi_family_order/rougail/00-base.yml index a1f3c92..fc2607f 100644 --- a/tests/results/20_0multi_family_order/rougail/00-base.yml +++ b/tests/results/20_0multi_family_order/rougail/00-base.yml @@ -1,14 +1,16 @@ +%YAML 1.2 --- version: 1.1 -variable: # a variable +variable: # a variable -family: # a family +family: # a family variable1: # a first variable - subfamily: # a sub family + subfamily: # a sub family variable: # a variable - variable2: # a second variable + variable2: # a second variable +... diff --git a/tests/results/20_0validators_differ_redefine/rougail/00-base.yml b/tests/results/20_0validators_differ_redefine/rougail/00-base.yml index 2dbd892..d500e87 100644 --- a/tests/results/20_0validators_differ_redefine/rougail/00-base.yml +++ b/tests/results/20_0validators_differ_redefine/rougail/00-base.yml @@ -1,9 +1,10 @@ +%YAML 1.2 --- version: 1.1 -var1: no # a first variable +var1: no # a first variable -var2: no # a second variable +var2: no # a second variable var3: description: a third variable @@ -16,3 +17,4 @@ var3: {% endif %} description: var3 must be different than var1 default: yes +... diff --git a/tests/results/20_0validators_differ_redefine/rougail/01-base.yml b/tests/results/20_0validators_differ_redefine/rougail/01-base.yml index bbab07a..a4161b1 100644 --- a/tests/results/20_0validators_differ_redefine/rougail/01-base.yml +++ b/tests/results/20_0validators_differ_redefine/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -9,3 +10,4 @@ var3: var3 must be different than var2 {% endif %} description: var3 must be different than var2 +... diff --git a/tests/results/20_1empty_subfamily/rougail/00-base.yml b/tests/results/20_1empty_subfamily/rougail/00-base.yml index 21c7dcf..d190abe 100644 --- a/tests/results/20_1empty_subfamily/rougail/00-base.yml +++ b/tests/results/20_1empty_subfamily/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,3 +6,4 @@ my_family: my_sub_family: type: family +... diff --git a/tests/results/20_9default_information_parent/rougail/00-base.yml b/tests/results/20_9default_information_parent/rougail/00-base.yml index 652fd5c..2a0365a 100644 --- a/tests/results/20_9default_information_parent/rougail/00-base.yml +++ b/tests/results/20_9default_information_parent/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -10,3 +11,4 @@ family: default: information: test_information variable: __.family +... diff --git a/tests/results/20_9family_absolute/rougail/00-base.yml b/tests/results/20_9family_absolute/rougail/00-base.yml index cf99617..e404e2c 100644 --- a/tests/results/20_9family_absolute/rougail/00-base.yml +++ b/tests/results/20_9family_absolute/rougail/00-base.yml @@ -1,9 +1,10 @@ +%YAML 1.2 --- version: 1.1 -var1: # first variable +var1: # first variable -family: # a family +family: # a family var2: description: a second variable @@ -16,7 +17,7 @@ family: # a family - variable: ___.var1 - variable: __.var2 -family2: # a family +family2: # a family var2: description: a variable2 @@ -34,3 +35,4 @@ family2: # a family - variable: ___.var1 - variable: ___.family.var2 - variable: __.var3 +... diff --git a/tests/results/24_0family_hidden_condition/rougail/00-base.yml b/tests/results/24_0family_hidden_condition/rougail/00-base.yml index 37b5742..5c77f3a 100644 --- a/tests/results/24_0family_hidden_condition/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # the variable use has condition +condition: no # the variable use has condition family: description: possibly hidden family @@ -13,3 +14,4 @@ family: description: if condition is yes var1: # a variable +... diff --git a/tests/results/24_0family_hidden_condition_boolean/rougail/00-base.yml b/tests/results/24_0family_hidden_condition_boolean/rougail/00-base.yml index 3e48668..2a61816 100644 --- a/tests/results/24_0family_hidden_condition_boolean/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition_boolean/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: false # a conditional variable +condition: false # a conditional variable family: description: a family @@ -15,3 +16,4 @@ family: variable: description: a variable mandatory: false +... diff --git a/tests/results/24_0family_hidden_condition_sub_family/rougail/00-base.yml b/tests/results/24_0family_hidden_condition_sub_family/rougail/00-base.yml index edc517a..79148ae 100644 --- a/tests/results/24_0family_hidden_condition_sub_family/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition_sub_family/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # the variable use has condition +condition: no # the variable use has condition family: description: possibly hidden family @@ -15,3 +16,4 @@ family: subfamily: var1: # a variable +... diff --git a/tests/results/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml b/tests/results/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml index 4523bfb..0c9bffa 100644 --- a/tests/results/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition_variable_sub_family/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: true # the variable use has condition +condition: true # the variable use has condition family: description: possibly hidden family @@ -13,3 +14,4 @@ family: var1: description: a variable mandatory: false +... diff --git a/tests/results/24_0family_hidden_condition_with_variable/rougail/00-base.yml b/tests/results/24_0family_hidden_condition_with_variable/rougail/00-base.yml index b81b110..0f0f199 100644 --- a/tests/results/24_0family_hidden_condition_with_variable/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_condition_with_variable/rougail/00-base.yml @@ -1,9 +1,10 @@ +%YAML 1.2 --- version: 1.1 -condition1: false # a first conditional variable +condition1: false # a first conditional variable -condition2: false # a second conditional variable +condition2: false # a second conditional variable family: description: a family @@ -23,3 +24,4 @@ family: condition2 is true {% endif %} description: if condition2 is false +... diff --git a/tests/results/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml b/tests/results/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml index eec2337..8ebda5a 100644 --- a/tests/results/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml +++ b/tests/results/24_0family_hidden_param_condition_sub_family/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # the variable use has condition +condition: no # the variable use has condition family: description: possibly hidden family @@ -18,3 +19,4 @@ family: sub_family: # a subfamily var1: # a variable +... diff --git a/tests/results/24_0family_mandatory_condition/rougail/00-base.yml b/tests/results/24_0family_mandatory_condition/rougail/00-base.yml index 44066bb..c8cbf79 100644 --- a/tests/results/24_0family_mandatory_condition/rougail/00-base.yml +++ b/tests/results/24_0family_mandatory_condition/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a condition +condition: no # a condition var: description: a variable @@ -11,3 +12,4 @@ var: condition is yes {% endif %} description: only if rougail.condition has the value "yes" +... diff --git a/tests/results/24_0family_mandatory_condition_variable/rougail/00-base.yml b/tests/results/24_0family_mandatory_condition_variable/rougail/00-base.yml index 0d57ae9..8c67d30 100644 --- a/tests/results/24_0family_mandatory_condition_variable/rougail/00-base.yml +++ b/tests/results/24_0family_mandatory_condition_variable/rougail/00-base.yml @@ -1,9 +1,11 @@ +%YAML 1.2 --- version: 1.1 -condition: true # a condition +condition: true # a condition var: description: a variable mandatory: variable: _.condition +... diff --git a/tests/results/24_7validators_variable_optional/rougail/00-base.yml b/tests/results/24_7validators_variable_optional/rougail/00-base.yml index b114f35..6cd2251 100644 --- a/tests/results/24_7validators_variable_optional/rougail/00-base.yml +++ b/tests/results/24_7validators_variable_optional/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -general: # a family +general: # a family int: description: a first number @@ -29,3 +30,4 @@ general: # a family optional: true int2: 1 # a second number +... diff --git a/tests/results/24_family_disabled_var_hidden/rougail/00-base.yml b/tests/results/24_family_disabled_var_hidden/rougail/00-base.yml index d919687..fe63ee5 100644 --- a/tests/results/24_family_disabled_var_hidden/rougail/00-base.yml +++ b/tests/results/24_family_disabled_var_hidden/rougail/00-base.yml @@ -1,12 +1,14 @@ +%YAML 1.2 --- version: 1.1 family: disabled: true - var1: true # A description + var1: true # A description var2: description: A description hidden: variable: _.var1 +... diff --git a/tests/results/40_0leadership/rougail/00-base.yml b/tests/results/40_0leadership/rougail/00-base.yml index 0eac439..282b39a 100644 --- a/tests/results/40_0leadership/rougail/00-base.yml +++ b/tests/results/40_0leadership/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,8 +6,9 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - follower1: # a follower + follower1: # a follower - follower2: # an other follower + follower2: # an other follower +... diff --git a/tests/results/40_0leadership_diff_name/rougail/00-base.yml b/tests/results/40_0leadership_diff_name/rougail/00-base.yml index 5ad6bb2..58a50f0 100644 --- a/tests/results/40_0leadership_diff_name/rougail/00-base.yml +++ b/tests/results/40_0leadership_diff_name/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,8 +6,9 @@ leadership: description: a leadership type: leadership - leader: [] # a leader + leader: [] # a leader - follower1: # a follower + follower1: # a follower - follower2: # an other follower + follower2: # an other follower +... diff --git a/tests/results/40_0leadership_empty/rougail/00-base.yml b/tests/results/40_0leadership_empty/rougail/00-base.yml index f58be2d..0a3f37e 100644 --- a/tests/results/40_0leadership_empty/rougail/00-base.yml +++ b/tests/results/40_0leadership_empty/rougail/00-base.yml @@ -1,5 +1,7 @@ +%YAML 1.2 --- version: 1.1 empty_leader: type: leadership +... diff --git a/tests/results/40_0leadership_follower_default_calculation/rougail/00-base.yml b/tests/results/40_0leadership_follower_default_calculation/rougail/00-base.yml index 415a701..68b9f76 100644 --- a/tests/results/40_0leadership_follower_default_calculation/rougail/00-base.yml +++ b/tests/results/40_0leadership_follower_default_calculation/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,9 +6,9 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - follower1: value # a follower + follower1: value # a follower follower2: description: a second follower @@ -15,3 +16,4 @@ leader: jinja: >- {{ _.follower1 }} description: returns follower1 value +... diff --git a/tests/results/40_0leadership_follower_default_submulti/rougail/00-base.yml b/tests/results/40_0leadership_follower_default_submulti/rougail/00-base.yml index 917e2a1..1dc752c 100644 --- a/tests/results/40_0leadership_follower_default_submulti/rougail/00-base.yml +++ b/tests/results/40_0leadership_follower_default_submulti/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,12 +6,13 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - leader - follower1: # a follower1 + follower1: # a follower1 - value - follower2: # a follower2 + follower2: # a follower2 - value1 - value2 +... diff --git a/tests/results/40_0leadership_follower_default_submulti_calculation/rougail/00-base.yml b/tests/results/40_0leadership_follower_default_submulti_calculation/rougail/00-base.yml index 7473096..3da0bed 100644 --- a/tests/results/40_0leadership_follower_default_submulti_calculation/rougail/00-base.yml +++ b/tests/results/40_0leadership_follower_default_submulti_calculation/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,10 +6,10 @@ leader: description: a leadership type: leadership - leader: # the leader + leader: # the leader - leader - follower1: # the follower1 + follower1: # the follower1 - value follower2: @@ -16,3 +17,4 @@ leader: multi: true default: variable: _.follower1 +... diff --git a/tests/results/40_0leadership_follower_default_value/rougail/00-base.yml b/tests/results/40_0leadership_follower_default_value/rougail/00-base.yml index d14f001..0151720 100644 --- a/tests/results/40_0leadership_follower_default_value/rougail/00-base.yml +++ b/tests/results/40_0leadership_follower_default_value/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -11,3 +12,4 @@ leader: mandatory: false follower1: value # a follower with default value +... diff --git a/tests/results/40_0leadership_leader_follower/rougail/00-base.yml b/tests/results/40_0leadership_leader_follower/rougail/00-base.yml index a77ef44..af66225 100644 --- a/tests/results/40_0leadership_leader_follower/rougail/00-base.yml +++ b/tests/results/40_0leadership_leader_follower/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,7 +6,7 @@ leadership: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 @@ -13,3 +14,4 @@ leadership: description: a follower default: variable: _.leader +... diff --git a/tests/results/40_0leadership_leader_not_multi/rougail/00-base.yml b/tests/results/40_0leadership_leader_not_multi/rougail/00-base.yml index b4fd0d5..0b92940 100644 --- a/tests/results/40_0leadership_leader_not_multi/rougail/00-base.yml +++ b/tests/results/40_0leadership_leader_not_multi/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -11,8 +12,9 @@ general1: description: leader type: leadership - leader: # leader + leader: # leader - follower1: # follower1 + follower1: # follower1 - follower2: # follower2 + follower2: # follower2 +... diff --git a/tests/results/40_1leadership_append_follower/rougail/00-base.yml b/tests/results/40_1leadership_append_follower/rougail/00-base.yml index df1707f..ebee0a2 100644 --- a/tests/results/40_1leadership_append_follower/rougail/00-base.yml +++ b/tests/results/40_1leadership_append_follower/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,8 +6,9 @@ leader: description: a leadership type: leadership - leader: [] # the leader + leader: [] # the leader - follower1: # the follower1 + follower1: # the follower1 - follower2: # the follower2 + follower2: # the follower2 +... diff --git a/tests/results/40_1leadership_append_follower/rougail/01-base.yml b/tests/results/40_1leadership_append_follower/rougail/01-base.yml index 2d653ac..2921232 100644 --- a/tests/results/40_1leadership_append_follower/rougail/01-base.yml +++ b/tests/results/40_1leadership_append_follower/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 leader: follower3: # the follower3 +... diff --git a/tests/results/40_2leadership_calculation_index/rougail/00-base.yml b/tests/results/40_2leadership_calculation_index/rougail/00-base.yml index d9d8488..0ca7bb2 100644 --- a/tests/results/40_2leadership_calculation_index/rougail/00-base.yml +++ b/tests/results/40_2leadership_calculation_index/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,7 +6,7 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - a - b - c @@ -15,3 +16,4 @@ leader: type: number default: type: index +... diff --git a/tests/results/40_2leadership_calculation_param_index/rougail/00-base.yml b/tests/results/40_2leadership_calculation_param_index/rougail/00-base.yml index c825de4..1ab96aa 100644 --- a/tests/results/40_2leadership_calculation_param_index/rougail/00-base.yml +++ b/tests/results/40_2leadership_calculation_param_index/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,7 +6,7 @@ leader: description: leadership type: leadership - leader: # a leader + leader: # a leader - a - b - c @@ -20,3 +21,4 @@ leader: params: index: type: index +... diff --git a/tests/results/40_2leadership_leader_calculation/rougail/00-base.yml b/tests/results/40_2leadership_leader_calculation/rougail/00-base.yml index 7302561..1d1b6a0 100644 --- a/tests/results/40_2leadership_leader_calculation/rougail/00-base.yml +++ b/tests/results/40_2leadership_leader_calculation/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -16,4 +17,5 @@ leader: follower1: # a first follower - follower2: # a second follower + follower2: # a second follower +... diff --git a/tests/results/40_6leadership_follower_multi/rougail/00-base.yml b/tests/results/40_6leadership_follower_multi/rougail/00-base.yml index ba9cc1d..9121010 100644 --- a/tests/results/40_6leadership_follower_multi/rougail/00-base.yml +++ b/tests/results/40_6leadership_follower_multi/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,9 +6,10 @@ leadership: description: A leadership type: leadership - leader: [] # The leader + leader: [] # The leader - follower1: [] # The first follower + follower1: [] # The first follower - follower2: # The second follower + follower2: # The second follower - value +... diff --git a/tests/results/40_8calculation_boolean/rougail/00-base.yml b/tests/results/40_8calculation_boolean/rougail/00-base.yml index 7440dfb..12072cd 100644 --- a/tests/results/40_8calculation_boolean/rougail/00-base.yml +++ b/tests/results/40_8calculation_boolean/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -bool: false # a boolean variable +bool: false # a boolean variable multi1: description: a first multi variable @@ -30,3 +31,4 @@ multi2: False {% endif %} description: a calculation +... diff --git a/tests/results/40_8calculation_boolean_return_none/rougail/00-base.yml b/tests/results/40_8calculation_boolean_return_none/rougail/00-base.yml index adadb8b..4a52e41 100644 --- a/tests/results/40_8calculation_boolean_return_none/rougail/00-base.yml +++ b/tests/results/40_8calculation_boolean_return_none/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: yes # a first variable +var1: yes # a first variable var2: description: a second variable @@ -12,3 +13,4 @@ var2: false {% endif %} description: return false if the value of var1 is "no" +... diff --git a/tests/results/40_8calculation_integer/rougail/00-base.yml b/tests/results/40_8calculation_integer/rougail/00-base.yml index 6af852e..1718a79 100644 --- a/tests/results/40_8calculation_integer/rougail/00-base.yml +++ b/tests/results/40_8calculation_integer/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -bool: false # a boolean variable +bool: false # a boolean variable int1: description: first integer variable @@ -26,3 +27,4 @@ int2: 4 {% endif %} description: if bool returns 3 otherwise return 4 +... diff --git a/tests/results/40_8calculation_multi_variable/rougail/00-base.yml b/tests/results/40_8calculation_multi_variable/rougail/00-base.yml index b9cbe06..6836049 100644 --- a/tests/results/40_8calculation_multi_variable/rougail/00-base.yml +++ b/tests/results/40_8calculation_multi_variable/rougail/00-base.yml @@ -1,10 +1,12 @@ +%YAML 1.2 --- version: 1.1 -var: # a first variable +var: # a first variable - variable: _.var2 - variable: _.var3 -var2: no # a second variable +var2: no # a second variable -var3: yes # a third variable +var3: yes # a third variable +... diff --git a/tests/results/40_8calculation_multi_variable_parent/rougail/00-base.yml b/tests/results/40_8calculation_multi_variable_parent/rougail/00-base.yml index 7f7365a..9338525 100644 --- a/tests/results/40_8calculation_multi_variable_parent/rougail/00-base.yml +++ b/tests/results/40_8calculation_multi_variable_parent/rougail/00-base.yml @@ -1,11 +1,13 @@ +%YAML 1.2 --- version: 1.1 -var: no # a variable +var: no # a variable -fam1: # a family +fam1: # a family var: description: a calculated variable default: variable: __.var +... diff --git a/tests/results/40_8calculation_multi_variable_parent2/rougail/00-base.yml b/tests/results/40_8calculation_multi_variable_parent2/rougail/00-base.yml index 7bec40d..289df20 100644 --- a/tests/results/40_8calculation_multi_variable_parent2/rougail/00-base.yml +++ b/tests/results/40_8calculation_multi_variable_parent2/rougail/00-base.yml @@ -1,13 +1,15 @@ +%YAML 1.2 --- version: 1.1 -fam1: # first family +fam1: # first family var: no # a variable -fam2: # second family +fam2: # second family var: - description: a varaible + description: a variable default: variable: __.fam1.var +... diff --git a/tests/results/40_9calculation_variable_leader_follower_multi_inside/rougail/00-base.yml b/tests/results/40_9calculation_variable_leader_follower_multi_inside/rougail/00-base.yml index 181227a..9fee0cd 100644 --- a/tests/results/40_9calculation_variable_leader_follower_multi_inside/rougail/00-base.yml +++ b/tests/results/40_9calculation_variable_leader_follower_multi_inside/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,9 +6,10 @@ leadership: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower: # a follower + follower: # a follower - variable: _.leader +... diff --git a/tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml index 0fe6650..c4a0d1b 100644 --- a/tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,13 +6,13 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower1: val11 # a follower + follower1: val11 # a follower - follower2: val21 # an other follower + follower2: val21 # an other follower calculate: description: a calculated variable @@ -20,3 +21,4 @@ calculate: jinja: |- {{ _.leader.follower1[0] }} unique: false +... diff --git a/tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml index d3290bd..5a80d6f 100644 --- a/tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,13 +6,13 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower1: val11 # a follower + follower1: val11 # a follower - follower2: val21 # an other follower + follower2: val21 # an other follower calculate: description: a calculated variable @@ -20,3 +21,4 @@ calculate: jinja: |- {{ _.leader.follower1[-1] }} unique: false +... diff --git a/tests/results/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml index 7f59b84..dba335e 100644 --- a/tests/results/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-follower-no-mandatory/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -15,3 +16,4 @@ variable: default: variable: _.leader.follower mandatory: false +... diff --git a/tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml index f08f1fa..db36ec8 100644 --- a/tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,13 +6,13 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower1: val11 # a follower + follower1: val11 # a follower - follower2: val21 # an other follower + follower2: val21 # an other follower calculate: description: a calculated variable @@ -19,3 +20,4 @@ calculate: default: variable: _.leader.follower1 unique: false +... diff --git a/tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml index 6d4590f..0ca2242 100644 --- a/tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,16 +6,17 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower1: val11 # a follower + follower1: val11 # a follower - follower2: val21 # an other follower + follower2: val21 # an other follower calculate: description: a calculated variable default: jinja: >- {{ _.leader.leader[0] }} +... diff --git a/tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml index 64fa5cb..59f4224 100644 --- a/tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,16 +6,17 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower1: val11 # a follower + follower1: val11 # a follower - follower2: val21 # an other follower + follower2: val21 # an other follower calculate: description: a calculated variable default: jinja: >- {{ _.leader.leader[-1] }} +... diff --git a/tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml b/tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml index a079fc2..5b380d0 100644 --- a/tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,15 +6,16 @@ leader: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower1: val11 # a follower + follower1: val11 # a follower - follower2: val21 # an other follower + follower2: val21 # an other follower calculate: description: a calculated variable default: variable: _.leader.leader +... diff --git a/tests/results/40_9leadership-calculation-variable/rougail/00-base.yml b/tests/results/40_9leadership-calculation-variable/rougail/00-base.yml index 171959b..ba6100b 100644 --- a/tests/results/40_9leadership-calculation-variable/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-variable/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -calculate: # a calculated variable +calculate: # a calculated variable - value1 - value2 @@ -16,4 +17,5 @@ leader: follower1: val11 # a follower - follower2: val21 # an other follower + follower2: val21 # an other follower +... diff --git a/tests/results/40_9leadership-calculation-variable_leader_follower/rougail/00-base.yml b/tests/results/40_9leadership-calculation-variable_leader_follower/rougail/00-base.yml index b78a0d0..6c88432 100644 --- a/tests/results/40_9leadership-calculation-variable_leader_follower/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-variable_leader_follower/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,11 +6,11 @@ leadership_1: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower: # a follower + follower: # a follower leadership_2: description: a second leadership @@ -21,3 +22,4 @@ leadership_2: variable: __.leadership_1.follower follower: val # a follower +... diff --git a/tests/results/40_9leadership-calculation-variable_leader_follower_not_same/rougail/00-base.yml b/tests/results/40_9leadership-calculation-variable_leader_follower_not_same/rougail/00-base.yml index db80716..53fac7b 100644 --- a/tests/results/40_9leadership-calculation-variable_leader_follower_not_same/rougail/00-base.yml +++ b/tests/results/40_9leadership-calculation-variable_leader_follower_not_same/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,17 +6,17 @@ leadership_1: description: a leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 - follower: # a follower + follower: # a follower leadership_2: description: a second leadership type: leadership - leader: # a leader + leader: # a leader - value1 - value2 @@ -23,3 +24,4 @@ leadership_2: description: a follower default: variable: __.leadership_1.leader +... diff --git a/tests/results/41_0choice_leader/rougail/00-base.yml b/tests/results/41_0choice_leader/rougail/00-base.yml index 60316ad..0ad89f2 100644 --- a/tests/results/41_0choice_leader/rougail/00-base.yml +++ b/tests/results/41_0choice_leader/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -16,3 +17,4 @@ leader: - a - b - c +... diff --git a/tests/results/44_0leadership_hidden/rougail/00-base.yml b/tests/results/44_0leadership_hidden/rougail/00-base.yml index 8f16923..69fd9ff 100644 --- a/tests/results/44_0leadership_hidden/rougail/00-base.yml +++ b/tests/results/44_0leadership_hidden/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -13,3 +14,4 @@ leader: follower: description: a follower mandatory: false +... diff --git a/tests/results/44_0leadership_leader_hidden/rougail/00-base.yml b/tests/results/44_0leadership_leader_hidden/rougail/00-base.yml index 48d59f6..477783d 100644 --- a/tests/results/44_0leadership_leader_hidden/rougail/00-base.yml +++ b/tests/results/44_0leadership_leader_hidden/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -14,3 +15,4 @@ leader: follower: description: a follower mandatory: false +... diff --git a/tests/results/44_1leadership_append_hidden_follower/rougail/00-base.yml b/tests/results/44_1leadership_append_hidden_follower/rougail/00-base.yml index 31ae385..2f9c85d 100644 --- a/tests/results/44_1leadership_append_hidden_follower/rougail/00-base.yml +++ b/tests/results/44_1leadership_append_hidden_follower/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -18,3 +19,4 @@ leader: follower2: description: the follower2 mandatory: false +... diff --git a/tests/results/44_1leadership_append_hidden_follower/rougail/01-base.yml b/tests/results/44_1leadership_append_hidden_follower/rougail/01-base.yml index bb92a74..0c14f3f 100644 --- a/tests/results/44_1leadership_append_hidden_follower/rougail/01-base.yml +++ b/tests/results/44_1leadership_append_hidden_follower/rougail/01-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ leader: follower3: description: follower3 mandatory: false +... diff --git a/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml b/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml index 68a540e..4294fcc 100644 --- a/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml +++ b/tests/results/44_4disabled_calcultion_follower/rougail/00-base.yml @@ -1,13 +1,14 @@ +%YAML 1.2 --- version: 1.1 -condition: true # a condition +condition: true # a condition leader: description: a leadership type: leadership - leader: # aleader + leader: # aleader - a follower: @@ -18,3 +19,4 @@ leader: condition is yes {% endif %} description: if condition is yes +... diff --git a/tests/results/44_4leadership_mandatory/rougail/00-base.yml b/tests/results/44_4leadership_mandatory/rougail/00-base.yml index 370cafa..e292d46 100644 --- a/tests/results/44_4leadership_mandatory/rougail/00-base.yml +++ b/tests/results/44_4leadership_mandatory/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,8 +6,9 @@ leader: description: a leadership type: leadership - leader: [] # a leader + leader: [] # a leader follower1: description: a follower mandatory: false +... diff --git a/tests/results/44_4leadership_mandatory_follower/rougail/00-base.yml b/tests/results/44_4leadership_mandatory_follower/rougail/00-base.yml index 424e996..7c85d5e 100644 --- a/tests/results/44_4leadership_mandatory_follower/rougail/00-base.yml +++ b/tests/results/44_4leadership_mandatory_follower/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -11,3 +12,4 @@ leader: mandatory: false follower: # a follower +... diff --git a/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml b/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml index a2defb7..0510e61 100644 --- a/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml +++ b/tests/results/44_5leadership_leader_hidden_calculation/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -condition: no # a condition +condition: no # a condition leader: description: a leadership @@ -19,3 +20,4 @@ leader: description: if condition is no follower: # a follower +... diff --git a/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml b/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml index 2782f92..415e5b4 100644 --- a/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml +++ b/tests/results/44_6leadership_follower_disabled_calculation/rougail/00-base.yml @@ -1,13 +1,14 @@ +%YAML 1.2 --- version: 1.1 -condition: yes # a condition +condition: yes # a condition leader: description: a leadership type: leadership - leader: [] # a leader + leader: [] # a leader follower: description: a follower @@ -17,3 +18,4 @@ leader: disabled {% endif %} description: if condition is yes +... diff --git a/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml b/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml index 25d18c3..d6e6d4b 100644 --- a/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml +++ b/tests/results/44_9calculated_default_leadership_leader/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -5,7 +6,7 @@ leader: description: leader type: leadership - leader: # a leader + leader: # a leader - a - b @@ -19,3 +20,4 @@ leader: the value of "leader" is "a" {% endif %} description: if the value of "leader" is "a" +... diff --git a/tests/results/60_0family_dynamic/rougail/00-base.yml b/tests/results/60_0family_dynamic/rougail/00-base.yml index 201d4b4..c1dc57c 100644 --- a/tests/results/60_0family_dynamic/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - val1 - val2 @@ -11,3 +12,4 @@ dyn{{ identifier }}: variable: _.var var: # A dynamic variable +... diff --git a/tests/results/60_0family_dynamic_1_0/rougail/00-base.yml b/tests/results/60_0family_dynamic_1_0/rougail/00-base.yml index cc499d5..287d9d8 100644 --- a/tests/results/60_0family_dynamic_1_0/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_1_0/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - val1 - val2 @@ -13,3 +14,4 @@ dyn{{ identifier }}: vardyn: description: Dynamic variable mandatory: false +... diff --git a/tests/results/60_0family_dynamic_1_0_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_1_0_empty/rougail/00-base.yml index 3119287..2950314 100644 --- a/tests/results/60_0family_dynamic_1_0_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_1_0_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -17,3 +18,4 @@ dyn{{ identifier }}: vardyn: description: Dynamic variable mandatory: false +... diff --git a/tests/results/60_0family_dynamic_1_0_type/rougail/00-base.yml b/tests/results/60_0family_dynamic_1_0_type/rougail/00-base.yml index 591c8f8..fff1adc 100644 --- a/tests/results/60_0family_dynamic_1_0_type/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_1_0_type/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - val1 - val2 @@ -11,3 +12,4 @@ dyn{{ identifier }}: propertyerror: false vardyn: # A dyn variable +... diff --git a/tests/results/60_0family_dynamic_1_0_type_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_1_0_type_empty/rougail/00-base.yml index dd94538..7c3e77e 100644 --- a/tests/results/60_0family_dynamic_1_0_type_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_1_0_type_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -15,3 +16,4 @@ dyn{{ identifier }}: propertyerror: false vardyn: # A dyn variable +... diff --git a/tests/results/60_0family_dynamic_1_1/rougail/00-base.yml b/tests/results/60_0family_dynamic_1_1/rougail/00-base.yml index 704162b..6c9f97f 100644 --- a/tests/results/60_0family_dynamic_1_1/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_1_1/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - val1 - val2 @@ -13,3 +14,4 @@ dyn{{ identifier }}: allow_none: true vardyn: # A dynamic variable +... diff --git a/tests/results/60_0family_dynamic_1_1_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_1_1_empty/rougail/00-base.yml index 654f272..6e00caa 100644 --- a/tests/results/60_0family_dynamic_1_1_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_1_1_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -17,3 +18,4 @@ dyn{{ identifier }}: allow_none: true vardyn: # A dynamic variable +... diff --git a/tests/results/60_0family_dynamic_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_empty/rougail/00-base.yml index 4495ea6..8e9893b 100644 --- a/tests/results/60_0family_dynamic_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -12,3 +13,4 @@ dyn{{ identifier }}: variable: _.var var: # A dynamic variable +... diff --git a/tests/results/60_0family_dynamic_forbidden_char/rougail/00-base.yml b/tests/results/60_0family_dynamic_forbidden_char/rougail/00-base.yml index d266109..a5b3c47 100644 --- a/tests/results/60_0family_dynamic_forbidden_char/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_forbidden_char/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - val.1 - val.2 @@ -23,3 +24,4 @@ dyn{{ identifier }}: params: identifier: type: identifier +... diff --git a/tests/results/60_0family_dynamic_jinja_number/rougail/00-base.yml b/tests/results/60_0family_dynamic_jinja_number/rougail/00-base.yml index 6ba0b98..b3fc277 100644 --- a/tests/results/60_0family_dynamic_jinja_number/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_jinja_number/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - 1 - 2 @@ -18,3 +19,4 @@ var2: jinja: >- {{ rougail.dyn1.var }} description: get the value of rougail.dyn1.var +... diff --git a/tests/results/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml index 27d219e..9dafe97 100644 --- a/tests/results/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_jinja_number_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -25,3 +26,4 @@ var2: {{ rougail.dyn1.var }} {% endif %} description: get the value of rougail.dyn1.var +... diff --git a/tests/results/60_0family_dynamic_no_description/rougail/00-base.yml b/tests/results/60_0family_dynamic_no_description/rougail/00-base.yml index bfdd478..e1a5419 100644 --- a/tests/results/60_0family_dynamic_no_description/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_no_description/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - val1 - val2 @@ -11,3 +12,4 @@ dyn{{ identifier }}: variable: _.var var: +... diff --git a/tests/results/60_0family_dynamic_no_description_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_no_description_empty/rougail/00-base.yml index a65ae27..9ec981d 100644 --- a/tests/results/60_0family_dynamic_no_description_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_no_description_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -15,3 +16,4 @@ dyn{{ identifier }}: variable: _.var var: +... diff --git a/tests/results/60_0family_dynamic_static/rougail/00-base.yml b/tests/results/60_0family_dynamic_static/rougail/00-base.yml index 8ff60b5..cad12f4 100644 --- a/tests/results/60_0family_dynamic_static/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_static/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -8,3 +9,4 @@ dyn{{ identifier }}: - val2 var: # a variable inside a dynamic family +... diff --git a/tests/results/60_0family_dynamic_test/rougail/00-base.yml b/tests/results/60_0family_dynamic_test/rougail/00-base.yml index f95265d..6a32447 100644 --- a/tests/results/60_0family_dynamic_test/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_test/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -14,3 +15,4 @@ dyn{{ identifier }}: variable: _.var var: # A dynamic variable +... diff --git a/tests/results/60_0family_dynamic_upper_char/rougail/00-base.yml b/tests/results/60_0family_dynamic_upper_char/rougail/00-base.yml index 18060f7..c2fcb4d 100644 --- a/tests/results/60_0family_dynamic_upper_char/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_upper_char/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - Val1 - VAL2 @@ -11,3 +12,4 @@ dyn{{ identifier }}: variable: _.var var: # A dynamic variable +... diff --git a/tests/results/60_0family_dynamic_variable_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_variable_empty/rougail/00-base.yml index 7b4f280..d5b565d 100644 --- a/tests/results/60_0family_dynamic_variable_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_variable_empty/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: [] # a suffix variable +var: [] # a suffix variable dyn{{ identifier }}: description: a dynamic family @@ -9,3 +10,4 @@ dyn{{ identifier }}: variable: _.var var: val # a variable inside dynamic family +... diff --git a/tests/results/60_0family_dynamic_variable_suffix/rougail/00-base.yml b/tests/results/60_0family_dynamic_variable_suffix/rougail/00-base.yml index 83e9af8..b918c84 100644 --- a/tests/results/60_0family_dynamic_variable_suffix/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_variable_suffix/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - val1 - val2 @@ -11,3 +12,4 @@ dyn{{ identifier }}: variable: _.var var: a value # A dynamic variable with suffix {{ identifier }} +... diff --git a/tests/results/60_0family_dynamic_variable_suffix_empty/rougail/00-base.yml b/tests/results/60_0family_dynamic_variable_suffix_empty/rougail/00-base.yml index 8c79309..587cbee 100644 --- a/tests/results/60_0family_dynamic_variable_suffix_empty/rougail/00-base.yml +++ b/tests/results/60_0family_dynamic_variable_suffix_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -14,3 +15,4 @@ dyn{{ identifier }}: variable: _.var var: a value # A dynamic variable with suffix {{ identifier }} +... diff --git a/tests/results/60_0family_empty/rougail/00-base.yml b/tests/results/60_0family_empty/rougail/00-base.yml index 0992428..566e968 100644 --- a/tests/results/60_0family_empty/rougail/00-base.yml +++ b/tests/results/60_0family_empty/rougail/00-base.yml @@ -1,5 +1,7 @@ +%YAML 1.2 --- version: 1.1 general2: type: family +... diff --git a/tests/results/60_0family_hidden/rougail/00-base.yml b/tests/results/60_0family_hidden/rougail/00-base.yml index 4831a45..bab2fd9 100644 --- a/tests/results/60_0family_hidden/rougail/00-base.yml +++ b/tests/results/60_0family_hidden/rougail/00-base.yml @@ -1,8 +1,10 @@ +%YAML 1.2 --- version: 1.1 -family: # a family +family: # a family var: description: a variable mandatory: false +... diff --git a/tests/results/60_0family_hidden/rougail/01-base.yml b/tests/results/60_0family_hidden/rougail/01-base.yml index d70b25b..a04022d 100644 --- a/tests/results/60_0family_hidden/rougail/01-base.yml +++ b/tests/results/60_0family_hidden/rougail/01-base.yml @@ -1,6 +1,8 @@ +%YAML 1.2 --- version: 1.1 family: redefine: true hidden: true +... diff --git a/tests/results/60_0family_mode/rougail/00-base.yml b/tests/results/60_0family_mode/rougail/00-base.yml index 09cde1f..5aa48c1 100644 --- a/tests/results/60_0family_mode/rougail/00-base.yml +++ b/tests/results/60_0family_mode/rougail/00-base.yml @@ -1,9 +1,11 @@ +%YAML 1.2 --- version: 1.1 -family: # a family +family: # a family var: description: A variable mode: basic default: non +... diff --git a/tests/results/60_1family_dynamic_jinja/rougail/00-base.yml b/tests/results/60_1family_dynamic_jinja/rougail/00-base.yml index 0dcfe16..4d6c47e 100644 --- a/tests/results/60_1family_dynamic_jinja/rougail/00-base.yml +++ b/tests/results/60_1family_dynamic_jinja/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -15,3 +16,4 @@ dyn{{ identifier }}: description: index of suffix value var: val # a dynamic variable +... diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group/rougail/00-base.yml b/tests/results/60_2family_dynamic_jinja_fill_sub_group/rougail/00-base.yml index e47f608..fd34670 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: # a suffix variable +var1: # a suffix variable - val1 - val2 @@ -20,3 +21,4 @@ var2: jinja: >- {{ _.dynval1.family.var }} description: the value of var +... diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/rougail/00-base.yml b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/rougail/00-base.yml index 6d6c1a9..33f01f7 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a identifier variable +var: # a identifier variable - val1 - val2 @@ -23,3 +24,4 @@ var2: jinja: >- {{ _.dynval1.family.var }} description: the value of var +... diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml index e2309f3..e36630f 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_2_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -30,3 +31,4 @@ var2: {% endif %} description: the value of var mandatory: false +... diff --git a/tests/results/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml b/tests/results/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml index b544d21..8f416c9 100644 --- a/tests/results/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_jinja_fill_sub_group_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -27,3 +28,4 @@ var2: {% endif %} description: the value of var mandatory: false +... diff --git a/tests/results/60_2family_dynamic_outside_calc/rougail/00-base.yml b/tests/results/60_2family_dynamic_outside_calc/rougail/00-base.yml index 037f0ab..c3338fd 100644 --- a/tests/results/60_2family_dynamic_outside_calc/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_outside_calc/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: # a suffx variable +var1: # a suffx variable - val1 - val2 @@ -18,3 +19,4 @@ newvar: jinja: >- {{ _.dynval1.var }} description: the value of var +... diff --git a/tests/results/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml b/tests/results/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml index f135147..41dcb81 100644 --- a/tests/results/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml +++ b/tests/results/60_2family_dynamic_outside_calc_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -25,3 +26,4 @@ newvar: {% endif %} description: the value of var mandatory: false +... diff --git a/tests/results/60_5family_dynamic_calc2/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc2/rougail/00-base.yml index 95bba25..9806f04 100644 --- a/tests/results/60_5family_dynamic_calc2/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc2/rougail/00-base.yml @@ -1,11 +1,12 @@ +%YAML 1.2 --- version: 1.1 -var: # A suffix variable +var: # A suffix variable - val1 - val2 -var2: # a second variable +var2: # a second variable dyn{{ identifier }}: description: A dynamic family @@ -19,3 +20,4 @@ dyn{{ identifier }}: variable: _.var vardyn: val # a dynamic variable +... diff --git a/tests/results/60_5family_dynamic_calc2_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc2_empty/rougail/00-base.yml index 06fbe08..619e9ac 100644 --- a/tests/results/60_5family_dynamic_calc2_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc2_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -23,3 +24,4 @@ dyn{{ identifier }}: variable: _.var vardyn: val # a dynamic variable +... diff --git a/tests/results/60_5family_dynamic_calc_suffix/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix/rougail/00-base.yml index 85d3cf5..56754ea 100644 --- a/tests/results/60_5family_dynamic_calc_suffix/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: # A suffix variable +var1: # A suffix variable - val1 - val2 @@ -15,3 +16,4 @@ var2: description: A variable calculated default: variable: _.dynval1.var +... diff --git a/tests/results/60_5family_dynamic_calc_suffix2/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix2/rougail/00-base.yml index b87f8cd..58e541f 100644 --- a/tests/results/60_5family_dynamic_calc_suffix2/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix2/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -14,3 +15,4 @@ dyn{{ identifier }}: description: Suffix has value default: type: identifier +... diff --git a/tests/results/60_5family_dynamic_calc_suffix2_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix2_empty/rougail/00-base.yml index 10b16de..d3f9811 100644 --- a/tests/results/60_5family_dynamic_calc_suffix2_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix2_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -18,3 +19,4 @@ dyn{{ identifier }}: description: Suffix has value default: type: identifier +... diff --git a/tests/results/60_5family_dynamic_calc_suffix_disabled/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_disabled/rougail/00-base.yml index 9aea116..508223c 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_disabled/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_disabled/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -11,3 +12,4 @@ dyn{{ identifier }}: disabled: type: identifier when: val1 +... diff --git a/tests/results/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml index ce33e6c..c9ec105 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_disabled2/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -22,3 +23,4 @@ var2: default: variable: _.dynval1.var optional: true +... diff --git a/tests/results/60_5family_dynamic_calc_suffix_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_empty/rougail/00-base.yml index d2679d2..2b41f49 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -20,3 +21,4 @@ var2: default: variable: _.dynval1.var optional: true +... diff --git a/tests/results/60_5family_dynamic_calc_suffix_empty_2/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_empty_2/rougail/00-base.yml index ece3a58..d41b8f8 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_empty_2/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_empty_2/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -19,3 +20,4 @@ var2: default: variable: _.dynval1.var optional: true +... diff --git a/tests/results/60_5family_dynamic_calc_suffix_empty_3/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_empty_3/rougail/00-base.yml index 89e6963..473a9f6 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_empty_3/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_empty_3/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -20,3 +21,4 @@ dyn{{ identifier }}: variable: _.var1 var: # A dynamic variable +... diff --git a/tests/results/60_5family_dynamic_calc_suffix_param/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_param/rougail/00-base.yml index 2347c6c..7b426d9 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_param/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_param/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A identifier variable +var: # A identifier variable - val1 - val2 @@ -19,3 +20,4 @@ dyn{{ identifier }}: params: identifier: type: identifier +... diff --git a/tests/results/60_5family_dynamic_calc_suffix_param_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_suffix_param_empty/rougail/00-base.yml index 28adc12..f59eb4d 100644 --- a/tests/results/60_5family_dynamic_calc_suffix_param_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_suffix_param_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -23,3 +24,4 @@ dyn{{ identifier }}: params: identifier: type: identifier +... diff --git a/tests/results/60_5family_dynamic_calc_variable/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_variable/rougail/00-base.yml index 94c74e9..cfbf708 100644 --- a/tests/results/60_5family_dynamic_calc_variable/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_variable/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: # A suffix variable +var1: # A suffix variable - val1 - val2 @@ -16,3 +17,4 @@ var2: description: A variable calculated default: variable: _.dynval1.var +... diff --git a/tests/results/60_5family_dynamic_calc_variable_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_calc_variable_empty/rougail/00-base.yml index 8ed8065..55d37f8 100644 --- a/tests/results/60_5family_dynamic_calc_variable_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_calc_variable_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -21,3 +22,4 @@ var2: default: variable: _.dynval1.var optional: true +... diff --git a/tests/results/60_5family_dynamic_hidden_suffix/rougail/00-base.yml b/tests/results/60_5family_dynamic_hidden_suffix/rougail/00-base.yml index 5b3d6e9..2986543 100644 --- a/tests/results/60_5family_dynamic_hidden_suffix/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_hidden_suffix/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -25,3 +26,4 @@ dyn{{ identifier }}: var: description: a new variable mandatory: false +... diff --git a/tests/results/60_5family_dynamic_unknown_suffix/rougail/00-base.yml b/tests/results/60_5family_dynamic_unknown_suffix/rougail/00-base.yml index bf2f7df..2a5226f 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_unknown_suffix/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -41,3 +42,4 @@ var: {% if 'val4' not in __.var %} val4 is not a valid value {% endif %} +... diff --git a/tests/results/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml index 1acc67b..a6d9b6f 100644 --- a/tests/results/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_unknown_suffix_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -40,3 +41,4 @@ var: {% if 'val4' not in __.var %} val4 is not a valid value {% endif %} +... diff --git a/tests/results/60_5family_dynamic_variable_outside/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside/rougail/00-base.yml index 416b527..bfec94f 100644 --- a/tests/results/60_5family_dynamic_variable_outside/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -21,3 +22,4 @@ var2: multi: true default: variable: _.my_dyn_family_{{ identifier }}.var +... diff --git a/tests/results/60_5family_dynamic_variable_outside2/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside2/rougail/00-base.yml index d4651a1..c6a9038 100644 --- a/tests/results/60_5family_dynamic_variable_outside2/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside2/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -21,3 +22,4 @@ my_dyn_family_{{ identifier }}: default: type: identifier mandatory: false +... diff --git a/tests/results/60_5family_dynamic_variable_outside2_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside2_empty/rougail/00-base.yml index 3cfbac2..6724bdc 100644 --- a/tests/results/60_5family_dynamic_variable_outside2_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside2_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -25,3 +26,4 @@ my_dyn_family_{{ identifier }}: default: type: identifier mandatory: false +... diff --git a/tests/results/60_5family_dynamic_variable_outside_1_0/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_1_0/rougail/00-base.yml index 889704d..bfe80df 100644 --- a/tests/results/60_5family_dynamic_variable_outside_1_0/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_1_0/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -22,3 +23,4 @@ var2: multi: true default: variable: _.my_dyn_family_{{ identifier }}.var +... diff --git a/tests/results/60_5family_dynamic_variable_outside_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_empty/rougail/00-base.yml index 60048f1..007e8d7 100644 --- a/tests/results/60_5family_dynamic_variable_outside_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -25,3 +26,4 @@ var2: multi: true default: variable: _.my_dyn_family_{{ identifier }}.var +... diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml index 01189f0..748c6b0 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_jinja/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -27,3 +28,4 @@ var2: params: var: variable: _.my_dyn_family_{{ identifier }}.var +... diff --git a/tests/results/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml index ea57650..d5b9041 100644 --- a/tests/results/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_jinja_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -31,3 +32,4 @@ var2: params: var: variable: _.my_dyn_family_{{ identifier }}.var +... diff --git a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/rougail/00-base.yml index bebd118..5548121 100644 --- a/tests/results/60_5family_dynamic_variable_outside_sub_suffix/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_sub_suffix/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -27,3 +28,4 @@ var2: default: variable: _.my_dyn_family_val1.subdyn_{{ identifier }}.var mandatory: false +... diff --git a/tests/results/60_5family_dynamic_variable_outside_sub_suffix_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_sub_suffix_empty/rougail/00-base.yml index 6a39204..db1081d 100644 --- a/tests/results/60_5family_dynamic_variable_outside_sub_suffix_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_sub_suffix_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -32,3 +33,4 @@ var2: variable: _.my_dyn_family_val1.subdyn_{{ identifier }}.var optional: true mandatory: false +... diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_suffix/rougail/00-base.yml index a8138ce..736fb2d 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_suffix/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -19,3 +20,4 @@ var2: description: a variable default: variable: _.dyn_val1.var +... diff --git a/tests/results/60_5family_dynamic_variable_outside_suffix_empty/rougail/00-base.yml b/tests/results/60_5family_dynamic_variable_outside_suffix_empty/rougail/00-base.yml index 4f53efa..8c4cad1 100644 --- a/tests/results/60_5family_dynamic_variable_outside_suffix_empty/rougail/00-base.yml +++ b/tests/results/60_5family_dynamic_variable_outside_suffix_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -25,3 +26,4 @@ var2: variable: _.dyn_val1.var optional: true mandatory: false +... diff --git a/tests/results/60_6family_dynamic_inside/rougail/00-base.yml b/tests/results/60_6family_dynamic_inside/rougail/00-base.yml index 2cffd93..2250bf3 100644 --- a/tests/results/60_6family_dynamic_inside/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_inside/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -29,3 +30,4 @@ var: # a suffix variable description: value is first variable of val1 default: variable: __.val1_dyn.var1 +... diff --git a/tests/results/60_6family_dynamic_inside_empty/rougail/00-base.yml b/tests/results/60_6family_dynamic_inside_empty/rougail/00-base.yml index d4bf24f..558a5b8 100644 --- a/tests/results/60_6family_dynamic_inside_empty/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_inside_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -33,3 +34,4 @@ var: description: value is first variable of val1 default: variable: __.val1_dyn.var1 +... diff --git a/tests/results/60_6family_dynamic_leadership/rougail/00-base.yml b/tests/results/60_6family_dynamic_leadership/rougail/00-base.yml index b36a29e..982f531 100644 --- a/tests/results/60_6family_dynamic_leadership/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_leadership/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a suffix variable +var: # a suffix variable - val1 - val2 @@ -14,7 +15,7 @@ dyn{{ identifier }}: description: a leadership type: leadership - leader: [] # a leader + leader: [] # a leader follower1: description: a follower1 @@ -23,3 +24,4 @@ dyn{{ identifier }}: follower2: description: a follower2 mandatory: false +... diff --git a/tests/results/60_6family_dynamic_leadership_empty/rougail/00-base.yml b/tests/results/60_6family_dynamic_leadership_empty/rougail/00-base.yml index 05b097f..c195831 100644 --- a/tests/results/60_6family_dynamic_leadership_empty/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_leadership_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -18,7 +19,7 @@ dyn{{ identifier }}: description: a leadership type: leadership - leader: [] # a leader + leader: [] # a leader follower1: description: a follower1 @@ -27,3 +28,4 @@ dyn{{ identifier }}: follower2: description: a follower2 mandatory: false +... diff --git a/tests/results/60_6family_dynamic_sub_dynamic/rougail/00-base.yml b/tests/results/60_6family_dynamic_sub_dynamic/rougail/00-base.yml index 8e13f0d..3eff3ee 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_sub_dynamic/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A identifier variable +var: # A identifier variable - val1 - val2 @@ -46,3 +47,4 @@ dyn{{ identifier }}: identifier: 0 s2: identifier: 1 +... diff --git a/tests/results/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml b/tests/results/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml index d733518..b8da329 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_sub_dynamic_1_0/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # A identifier variable +var: # A identifier variable - val1 - val2 @@ -48,3 +49,4 @@ dyn{{ identifier }}: identifier: 0 s2: identifier: 1 +... diff --git a/tests/results/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml b/tests/results/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml index 794e715..3df0757 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_sub_dynamic_empty/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -50,3 +51,4 @@ dyn{{ identifier }}: identifier: 0 s2: identifier: 1 +... diff --git a/tests/results/60_6family_dynamic_sub_dynamic_empty2/rougail/00-base.yml b/tests/results/60_6family_dynamic_sub_dynamic_empty2/rougail/00-base.yml index 2186117..69525dc 100644 --- a/tests/results/60_6family_dynamic_sub_dynamic_empty2/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_sub_dynamic_empty2/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -44,3 +45,4 @@ dyn{{ identifier }}: identifier: 0 s2: identifier: 1 +... diff --git a/tests/results/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml b/tests/results/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml index 48eb824..19fb39b 100644 --- a/tests/results/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_suffix_auto_multi/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: # A suffix variable +var1: # A suffix variable - val1 - val2 @@ -20,3 +21,4 @@ var2: default: variable: _.dyn{{ identifier }}.dynval1.var unique: false +... diff --git a/tests/results/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml b/tests/results/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml index 67e2948..c8bebc8 100644 --- a/tests/results/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml +++ b/tests/results/60_6family_dynamic_suffix_auto_multi2/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var1: # A suffix variable +var1: # A suffix variable - val1 - val2 @@ -20,3 +21,4 @@ var2: default: variable: _.dynval1.dyn{{ identifier }}.var unique: false +... diff --git a/tests/results/60_9extra_dynamic/extra/00-base.yml b/tests/results/60_9extra_dynamic/extra/00-base.yml index 468364f..a04d085 100644 --- a/tests/results/60_9extra_dynamic/extra/00-base.yml +++ b/tests/results/60_9extra_dynamic/extra/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -6,3 +7,4 @@ dyn_{{ identifier }}: variable: rougail.var var: +... diff --git a/tests/results/60_9extra_dynamic/rougail/00-base.yml b/tests/results/60_9extra_dynamic/rougail/00-base.yml index 37b8779..3bdc6cc 100644 --- a/tests/results/60_9extra_dynamic/rougail/00-base.yml +++ b/tests/results/60_9extra_dynamic/rougail/00-base.yml @@ -1,5 +1,7 @@ +%YAML 1.2 --- version: 1.1 -var: # a variable +var: # a variable - a +... diff --git a/tests/results/60_9extra_dynamic_extra/extra/00-base.yml b/tests/results/60_9extra_dynamic_extra/extra/00-base.yml index fa1aa3a..8ab06b0 100644 --- a/tests/results/60_9extra_dynamic_extra/extra/00-base.yml +++ b/tests/results/60_9extra_dynamic_extra/extra/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: # a varaible +var: # a variable - a dyn_{{ identifier }}: @@ -9,3 +10,4 @@ dyn_{{ identifier }}: variable: _.var var: +... diff --git a/tests/results/60_9extra_dynamic_extra/rougail/00-base.yml b/tests/results/60_9extra_dynamic_extra/rougail/00-base.yml index 846a618..2b80805 100644 --- a/tests/results/60_9extra_dynamic_extra/rougail/00-base.yml +++ b/tests/results/60_9extra_dynamic_extra/rougail/00-base.yml @@ -1,7 +1,9 @@ +%YAML 1.2 --- version: 1.1 -general: # général +general: # général varname: # No change - a +... diff --git a/tests/results/60_9family_dynamic_calc_both/rougail/00-base.yml b/tests/results/60_9family_dynamic_calc_both/rougail/00-base.yml index 27a0713..41dfb0c 100644 --- a/tests/results/60_9family_dynamic_calc_both/rougail/00-base.yml +++ b/tests/results/60_9family_dynamic_calc_both/rougail/00-base.yml @@ -1,7 +1,8 @@ +%YAML 1.2 --- version: 1.1 -var: val2 # a suffix variable +var: val2 # a suffix variable dyn{{ identifier }}: description: a dynamic family @@ -10,3 +11,4 @@ dyn{{ identifier }}: - variable: _.var vardyn: # a dynamic variable +... diff --git a/tests/results/68_0family_leadership_mode/rougail/00-base.yml b/tests/results/68_0family_leadership_mode/rougail/00-base.yml index a9851e0..a67fd70 100644 --- a/tests/results/68_0family_leadership_mode/rougail/00-base.yml +++ b/tests/results/68_0family_leadership_mode/rougail/00-base.yml @@ -1,3 +1,4 @@ +%YAML 1.2 --- version: 1.1 @@ -17,3 +18,4 @@ leader: follower2: description: a follower2 mode: basic +... diff --git a/tests/test_load.py b/tests/test_load.py index 6f60d45..eff0358 100644 --- a/tests/test_load.py +++ b/tests/test_load.py @@ -1,5 +1,9 @@ from pytest import fixture # , raises from pathlib import Path + +from yamllint import linter +from yamllint.config import YamlLintConfig + from rougail import Rougail from rougail.output_formatter import RougailOutputFormatter as RougailOutput @@ -7,11 +11,11 @@ from rougail_tests.utils import get_structures_list, get_rougail_config, config_ excludes = [ -# "16_6exists_family", +# "16_5test_redefine", ] test_ok = get_structures_list(excludes) -# test_ok = [Path('../rougail-tests/structures/00_7help')] +# test_ok = [Path('../rougail-tests/structures/16_3family_empty_at_ends')] def idfn(fixture_value): @@ -38,12 +42,12 @@ def _test_structural_files(file_name, namespace, rougailconfig): if not output_file.parent.is_dir(): output_file.parent.mkdir(parents=True) output_file.write_text(file_name.read_text()) -# with output_file.open('w') as fh: -# print('===', generated_output) -# fh.write(generated_output) with output_file.open() as outfh: attented_output = outfh.read() assert generated_output == attented_output, f'filename {output_file}' + conf = YamlLintConfig('extends: default') + problems = list(linter.run(generated_output, conf, '')) + assert problems == [], f'filename {output_file}' def test_structural_files_formatter(test_dir):