fix: if and for in 3 lines

This commit is contained in:
egarette@silique.fr 2025-03-27 21:45:29 +01:00
parent 4e9e8b082e
commit c09800521c
53 changed files with 83 additions and 73 deletions

View file

@ -78,6 +78,8 @@ class RougailOutputFormatter:
self.config = Config() self.config = Config()
self.config.profile = 'jinja' self.config.profile = 'jinja'
self.config.line_break_after_multiline_tag = True
self.config.indent = " "
self.original_yaml = RougailUpgrade(rougailconfig).run(filename) self.original_yaml = RougailUpgrade(rougailconfig).run(filename)
datas = RougailUpgrade(rougailconfig).run(filename) datas = RougailUpgrade(rougailconfig).run(filename)

View file

@ -12,6 +12,6 @@ var2:
default: default:
jinja: |- jinja: |-
{% for val in _.var1 %} {% for val in _.var1 %}
{{ val }} {{ val }}
{% endfor %} {% endfor %}
description: the value of _.var1 description: the value of _.var1

View file

@ -6,7 +6,7 @@ var:
choices: choices:
jinja: |- jinja: |-
{% for n in trange(0, 10) %} {% for n in trange(0, 10) %}
{{ n }} {{ n }}
{% endfor %} {% endfor %}
return_type: number return_type: number
description: choices is 0 to 9 description: choices is 0 to 9

View file

@ -5,7 +5,7 @@ variable:
description: a variable description: a variable
default: default:
jinja: >- jinja: >-
{{test_information }} {{ test_information }}
description: get information test_information description: get information test_information
params: params:
test_information: test_information:

View file

@ -6,13 +6,13 @@ var1:
default: default:
jinja: >- jinja: >-
{% if var2 is defined %} {% if var2 is defined %}
{{ var2 }} {{ var2 }}
{% elif var3 is defined %} {% elif var3 is defined %}
{{ var3 }} {{ var3 }}
{% elif var4 is defined %} {% elif var4 is defined %}
{{ var4 }} {{ var4 }}
{% else %} {% else %}
{{ _.var2 }} {{ _.var2 }}
{% endif %} {% endif %}
description: returns a value description: returns a value
params: params:

View file

@ -6,7 +6,7 @@ var:
choices: choices:
jinja: |- jinja: |-
{% for item in trange(0, 10) %} {% for item in trange(0, 10) %}
{{ item }} {{ item }}
{%- endfor %} {%- endfor %}
return_type: number return_type: number
description: choice for 0 to 9 description: choice for 0 to 9

View file

@ -7,7 +7,7 @@ variable:
default: default:
jinja: |- jinja: |-
{% for info in test_information %} {% for info in test_information %}
{{ info }} {{ info }}
{% endfor %} {% endfor %}
description: get information test_information description: get information test_information
params: params:

View file

@ -13,6 +13,6 @@ var2:
hidden: hidden:
jinja: |- jinja: |-
{% if _.var1 == "yes" %} {% if _.var1 == "yes" %}
_.var1 is yes _.var1 is yes
{% endif %} {% endif %}
description: only if the variable var1 has value "yes" description: only if the variable var1 has value "yes"

View file

@ -14,5 +14,5 @@ var3:
default: default:
jinja: >- jinja: >-
{% if _.var1 == 'value' or _.var2 == 'blah' %} {% if _.var1 == 'value' or _.var2 == 'blah' %}
value value
{% endif %} {% endif %}

View file

@ -14,5 +14,5 @@ var3:
default: default:
jinja: >- jinja: >-
{% if _.var2 is propertyerror %} {% if _.var2 is propertyerror %}
value value
{% endif %} {% endif %}

View file

@ -8,7 +8,7 @@ variable1:
disabled: disabled:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is egal to "yes" description: if condition is egal to "yes"
@ -17,6 +17,6 @@ variable2:
disabled: disabled:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is egal to "yes" description: if condition is egal to "yes"

View file

@ -12,7 +12,7 @@ var1:
disabled: disabled:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes
@ -25,6 +25,6 @@ var2:
disabled: disabled:
jinja: |- jinja: |-
{% if rougail.condition == "yes" %} {% if rougail.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes

View file

@ -9,7 +9,7 @@ variable1:
disabled: disabled:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is egal to "yes" description: if condition is egal to "yes"
@ -19,6 +19,6 @@ variable2:
disabled: disabled:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is egal to "yes" description: if condition is egal to "yes"

View file

@ -9,9 +9,9 @@ var1:
hidden: hidden:
jinja: |- jinja: |-
{% if unknown is not defined %} {% if unknown is not defined %}
unknown is undefined unknown is undefined
{% elif unknown == "no" %} {% elif unknown == "no" %}
unknown is no unknown is no
{% endif %} {% endif %}
description: calculation from an unknown variable description: calculation from an unknown variable
params: params:
@ -25,9 +25,9 @@ var2:
hidden: hidden:
jinja: |- jinja: |-
{% if condition is not defined %} {% if condition is not defined %}
condition is undefined condition is undefined
{% elif condition == "no" %} {% elif condition == "no" %}
condition is no condition is no
{% endif %} {% endif %}
description: calculation from an condition variable description: calculation from an condition variable
params: params:

View file

@ -9,7 +9,7 @@ var1:
hidden: hidden:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes
@ -19,6 +19,6 @@ var2:
hidden: hidden:
jinja: |- jinja: |-
{% if rougail.condition == "yes" %} {% if rougail.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes

View file

@ -12,7 +12,7 @@ var1:
hidden: hidden:
jinja: |- jinja: |-
{% if _.condition != "yes" %} {% if _.condition != "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes
@ -25,6 +25,6 @@ var2:
hidden: hidden:
jinja: |- jinja: |-
{% if rougail.condition != "yes" %} {% if rougail.condition != "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes

View file

@ -12,7 +12,7 @@ var1:
hidden: hidden:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes
@ -25,6 +25,6 @@ var2:
hidden: hidden:
jinja: |- jinja: |-
{% if rougail.condition == "yes" %} {% if rougail.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes

View file

@ -7,6 +7,6 @@ int:
validators: validators:
- jinja: |- - jinja: |-
{% if _.int > 100 %} {% if _.int > 100 %}
value is too high value is too high
{% endif %} {% endif %}
description: the max value is 100 description: the max value is 100

View file

@ -8,7 +8,7 @@ var1:
validators: validators:
- jinja: |- - jinja: |-
{% if _.var1 == _.var2 %} {% if _.var1 == _.var2 %}
var1 must be different than var2 var1 must be different than var2
{% endif %} {% endif %}
description: var1 must be different than var2 description: var1 must be different than var2
default: oui default: oui

View file

@ -6,7 +6,7 @@ var1:
validators: validators:
- jinja: |- - jinja: |-
{% if _.var1 | length > 9 %} {% if _.var1 | length > 9 %}
length must be less than 10 length must be less than 10
{% endif %} {% endif %}
description: check length is less than 10 description: check length is less than 10
default: default:

View file

@ -9,7 +9,7 @@ var1:
validators: validators:
- jinja: |- - jinja: |-
{% if values | length > 2 %} {% if values | length > 2 %}
length must be less than 3 length must be less than 3
{% endif %} {% endif %}
description: check length is less than 3 description: check length is less than 3
params: params:

View file

@ -8,7 +8,7 @@ variable:
disabled: disabled:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
true true
{% else %} {% else %}
false false
{% endif %} {% endif %}

View file

@ -12,7 +12,7 @@ var3:
validators: validators:
- jinja: |- - jinja: |-
{% if _.var3 == _.var1 %} {% if _.var3 == _.var1 %}
var3 must be different than var1 var3 must be different than var1
{% endif %} {% endif %}
description: var3 must be different than var1 description: var3 must be different than var1
default: yes default: yes

View file

@ -6,6 +6,6 @@ var3:
validators: validators:
- jinja: |- - jinja: |-
{% if _.var3 == _.var2 %} {% if _.var3 == _.var2 %}
var3 must be different than var2 var3 must be different than var2
{% endif %} {% endif %}
description: var3 must be different than var2 description: var3 must be different than var2

View file

@ -8,7 +8,7 @@ family:
hidden: hidden:
jinja: |- jinja: |-
{% if rougail.condition == "yes" %} {% if rougail.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes

View file

@ -8,7 +8,7 @@ family:
hidden: hidden:
jinja: |- jinja: |-
{% if not rougail.condition %} {% if not rougail.condition %}
condition is false condition is false
{% endif %} {% endif %}
description: if not condition description: if not condition

View file

@ -8,7 +8,7 @@ family:
hidden: hidden:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes

View file

@ -10,7 +10,7 @@ family:
hidden: hidden:
jinja: |- jinja: |-
{% if not rougail.condition1 %} {% if not rougail.condition1 %}
condition1 is false condition1 is false
{% endif %} {% endif %}
description: if condition1 is false description: if condition1 is false
@ -20,6 +20,6 @@ family:
hidden: hidden:
jinja: |- jinja: |-
{% if rougail.condition2 %} {% if rougail.condition2 %}
condition2 is true condition2 is true
{% endif %} {% endif %}
description: if condition2 is false description: if condition2 is false

View file

@ -8,7 +8,7 @@ family:
hidden: hidden:
jinja: |- jinja: |-
{% if condition == "yes" %} {% if condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes
params: params:

View file

@ -8,6 +8,6 @@ var:
mandatory: mandatory:
jinja: |- jinja: |-
{% if _.condition == "yes" %} {% if _.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: only if rougail.condition has the value "yes" description: only if rougail.condition has the value "yes"

View file

@ -11,7 +11,7 @@ general: # a family
validators: validators:
- jinja: |- - jinja: |-
{% if _.int == int2 %} {% if _.int == int2 %}
int and int2 must be different int and int2 must be different
{% endif %} {% endif %}
description: int and int2 must be different description: int and int2 must be different
params: params:
@ -20,7 +20,7 @@ general: # a family
optional: true optional: true
- jinja: |- - jinja: |-
{% if int3 is defined and _.int == int3 %} {% if int3 is defined and _.int == int3 %}
int and int3 must be different int and int3 must be different
{% endif %} {% endif %}
description: int and int3 must be different description: int and int3 must be different
params: params:

View file

@ -10,10 +10,10 @@ multi1:
default: default:
jinja: |- jinja: |-
{% if _.bool %} {% if _.bool %}
True True
False False
{% else %} {% else %}
False False
{% endif %} {% endif %}
description: a calculation description: a calculation
@ -24,9 +24,9 @@ multi2:
default: default:
jinja: |- jinja: |-
{% if not _.bool %} {% if not _.bool %}
True True
False False
{% else %} {% else %}
False False
{% endif %} {% endif %}
description: a calculation description: a calculation

View file

@ -9,6 +9,6 @@ var2:
default: default:
jinja: >- jinja: >-
{% if rougail.var1 == 'no' %} {% if rougail.var1 == 'no' %}
false false
{% endif %} {% endif %}
description: return false if the value of var1 is "no" description: return false if the value of var1 is "no"

View file

@ -8,7 +8,11 @@ int1:
type: number type: number
default: default:
jinja: >- jinja: >-
{% if rougail.bool %}1{% else %}2{% endif %} {% if rougail.bool %}
1
{% else %}
2
{% endif %}
description: if bool returns 1 otherwise return 2 description: if bool returns 1 otherwise return 2
int2: int2:
@ -16,5 +20,9 @@ int2:
type: number type: number
default: default:
jinja: >- jinja: >-
{% if not rougail.bool %}3{% else %}4{% endif %} {% if not rougail.bool %}
3
{% else %}
4
{% endif %}
description: if bool returns 3 otherwise return 4 description: if bool returns 3 otherwise return 4

View file

@ -15,6 +15,6 @@ leader:
disabled: disabled:
jinja: |- jinja: |-
{% if rougail.condition == "yes" %} {% if rougail.condition == "yes" %}
condition is yes condition is yes
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes

View file

@ -14,7 +14,7 @@ leader:
hidden: hidden:
jinja: |- jinja: |-
{% if __.condition == "no" %} {% if __.condition == "no" %}
condition is no condition is no
{% endif %} {% endif %}
description: if condition is no description: if condition is no

View file

@ -14,6 +14,6 @@ leader:
disabled: disabled:
jinja: |- jinja: |-
{% if __.condition == "yes" %} {% if __.condition == "yes" %}
disabled disabled
{% endif %} {% endif %}
description: if condition is yes description: if condition is yes

View file

@ -16,6 +16,6 @@ leader:
disabled: disabled:
jinja: |- jinja: |-
{% if _.leader == "a" %} {% if _.leader == "a" %}
the value of "leader" is "a" the value of "leader" is "a"
{% endif %} {% endif %}
description: if the value of "leader" is "a" description: if the value of "leader" is "a"

View file

@ -22,6 +22,6 @@ var2:
default: default:
jinja: >- jinja: >-
{% if rougail.dyn1 is defined %} {% if rougail.dyn1 is defined %}
{{ rougail.dyn1.var }} {{ rougail.dyn1.var }}
{% endif %} {% endif %}
description: get the value of rougail.dyn1.var description: get the value of rougail.dyn1.var

View file

@ -10,7 +10,7 @@ dyn{{ identifier }}:
dynamic: dynamic:
jinja: |- jinja: |-
{% for val in _.var %} {% for val in _.var %}
{{ loop.index }} {{ loop.index }}
{% endfor %} {% endfor %}
description: index of suffix value description: index of suffix value

View file

@ -26,7 +26,7 @@ var2:
default: default:
jinja: >- jinja: >-
{% if _.dynval1 is defined %} {% if _.dynval1 is defined %}
{{ _.dynval1.family.var }} {{ _.dynval1.family.var }}
{% endif %} {% endif %}
description: the value of var description: the value of var
mandatory: false mandatory: false

View file

@ -23,7 +23,7 @@ var2:
default: default:
jinja: >- jinja: >-
{% if _.dynval1 is defined %} {% if _.dynval1 is defined %}
{{ _.dynval1.family.var }} {{ _.dynval1.family.var }}
{% endif %} {% endif %}
description: the value of var description: the value of var
mandatory: false mandatory: false

View file

@ -21,7 +21,7 @@ newvar:
default: default:
jinja: >- jinja: >-
{% if _.dynval1 is defined %} {% if _.dynval1 is defined %}
{{ _.dynval1.var }} {{ _.dynval1.var }}
{% endif %} {% endif %}
description: the value of var description: the value of var
mandatory: false mandatory: false

View file

@ -12,7 +12,7 @@ dyn{{ identifier }}:
hidden: hidden:
jinja: |- jinja: |-
{% if _.var2 == "no" %} {% if _.var2 == "no" %}
var2 is no var2 is no
{% endif %} {% endif %}
description: if var2 is no description: if var2 is no
dynamic: dynamic:

View file

@ -16,7 +16,7 @@ dyn{{ identifier }}:
hidden: hidden:
jinja: |- jinja: |-
{% if _.var2 == "no" %} {% if _.var2 == "no" %}
var2 is no var2 is no
{% endif %} {% endif %}
description: if var2 is no description: if var2 is no
dynamic: dynamic:

View file

@ -6,7 +6,7 @@ dyn{{ identifier }}:
hidden: hidden:
jinja: |- jinja: |-
{% if suffix == 'val2' %} {% if suffix == 'val2' %}
disabled disabled
{% endif %} {% endif %}
description: if suffix == 'val2' description: if suffix == 'val2'
params: params:

View file

@ -39,5 +39,5 @@ var:
disabled: disabled:
jinja: |- jinja: |-
{% if 'val4' not in __.var %} {% if 'val4' not in __.var %}
val4 is not a valid value val4 is not a valid value
{% endif %} {% endif %}

View file

@ -38,5 +38,5 @@ var:
disabled: disabled:
jinja: |- jinja: |-
{% if 'val4' not in __.var %} {% if 'val4' not in __.var %}
val4 is not a valid value val4 is not a valid value
{% endif %} {% endif %}

View file

@ -22,7 +22,7 @@ var2:
default: default:
jinja: |- jinja: |-
{%- for v in var %} {%- for v in var %}
{{ v }} {{ v }}
{%- endfor -%} {%- endfor -%}
params: params:
var: var:

View file

@ -26,7 +26,7 @@ var2:
default: default:
jinja: |- jinja: |-
{%- for v in var %} {%- for v in var %}
{{ v }} {{ v }}
{%- endfor -%} {%- endfor -%}
params: params:
var: var:

View file

@ -16,7 +16,7 @@ dyn{{ identifier }}:
default: default:
jinja: |- jinja: |-
{% for val in __.var %} {% for val in __.var %}
t{{ val }} t{{ val }}
{% endfor %} {% endfor %}
description: add 't' to each var value description: add 't' to each var value

View file

@ -17,7 +17,7 @@ dyn{{ identifier }}:
default: default:
jinja: |- jinja: |-
{% for val in rougail.var %} {% for val in rougail.var %}
t{{ val }} t{{ val }}
{% endfor %} {% endfor %}
description: add 't' to each var value description: add 't' to each var value

View file

@ -20,7 +20,7 @@ dyn{{ identifier }}:
default: default:
jinja: |- jinja: |-
{% for val in __.var %} {% for val in __.var %}
t{{ val }} t{{ val }}
{% endfor %} {% endfor %}
description: add 't' to each var value description: add 't' to each var value