bump: version 0.0.1a0 → 0.1.0a0

CHANGELOG.md

@@ -0,0 +1,11 @@
+## 0.1.0a0 (2025-02-10)
+
+### Feat
+
+- output return status too
+
+## 0.0.1a0 (2025-01-04)
+
+### Fix
+
+- remove prefix_path

src/rougail/output_formatter/__init__.py

@@ -1,6 +1,6 @@
 """
 Silique (https://www.silique.fr)
-Copyright (C) 2024
+Copyright (C) 2024-2025
             
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by the
@@ -107,10 +107,12 @@ class RougailOutputFormatter:
         with BytesIO() as ymlfh:
             self.yaml.dump(self.families[None], ymlfh)
             ret = ymlfh.getvalue().decode("utf-8").strip() + '\n'
-        return ret
+        return True, ret
 
     def print(self):
-        print(self.run())
+        ret, data = self.run()
+        print(data)
+        return ret
 
     def parse(self):
         # FIXME path to relative !
@@ -159,7 +161,7 @@ class RougailOutputFormatter:
         else:
             attributes = self.families_attributes
         for attr, default_value in attributes.items():
-            if attr in ["name", "path", "namespace", "version", "path_prefix", "xmlfiles"]:
+            if attr in ["name", "path", "namespace", "version", "xmlfiles"]:
                 continue
             try:
                 value = getattr(obj, attr)
@@ -204,7 +206,7 @@ class RougailOutputFormatter:
         multi = obj.multi or isinstance(obj.default, list)
         type_ = obj.type
         for attr, default_value in self.variables_attributes.items():
-            if attr in ["name", "path", "namespace", "version", "path_prefix", "xmlfiles"]:
+            if attr in ["name", "path", "namespace", "version", "xmlfiles"]:
                 continue
             try:
                 value = getattr(obj, attr)

src/rougail/output_formatter/config.py

@@ -1,6 +1,6 @@
 """
 Silique (https://www.silique.fr)
-Copyright (C) 2024
+Copyright (C) 2024-2025
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by the

src/rougail/output_formatter/upgrade.py

@@ -4,7 +4,7 @@ Cadoles (http://www.cadoles.com)
 Copyright (C) 2021
 
 Silique (https://www.silique.fr)
-Copyright (C) 2022-2024
+Copyright (C) 2022-2025
 
 This program is free software: you can redistribute it and/or modify it
 under the terms of the GNU Lesser General Public License as published by the

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

@@ -0,0 +1,11 @@
+---
+version: 1.1
+
+secret1:
+  description: the first variable
+  type: secret
+
+secret2:
+  description: the second variable
+  type: secret
+  default: value

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

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

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

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

tests/results/16_6exists_family/rougail/00-test.yml

@@ -0,0 +1,7 @@
+---
+version: 1.1
+
+family:
+  exists: true
+
+  variable:

tests/results/20_9family_absolute/rougail/00-base.yml

@@ -1,27 +1,36 @@
 ---
 version: 1.1
 
-var1: # a variable
+var1: # first variable
 
 family: # a family
 
-  var2:  # a second variable
+  var2:
+    description: a second variable
+    test:
+      - string6
 
-  subfamily: # a sub family
+  subfamily:  # a sub family
 
-    variable:  # a variable
+    variable:  # third variable
       - variable: ___.var1
       - variable: __.var2
 
 family2: # a family
 
   var2:
+    description: a variable2
     default:
       variable: __.family.var2
 
+  var3:
+    test:
+      - string5
+    default: string4
+
   subfamily:  # a sub family
 
-    variable:  # a variable
+    variable:  # fourth variable
       - variable: ___.var1
       - variable: ___.family.var2
-      - variable: __.var2
+      - variable: __.var3

tests/results/40_9leadership-calculation-outside-follower-first/rougail/00-base.yml

@@ -0,0 +1,22 @@
+---
+version: 1.1
+
+leader:
+  description: a leadership
+  type: leadership
+
+  leader: # a leader
+    - value1
+    - value2
+
+  follower1: val11 # a follower
+
+  follower2: val21 # an other follower
+
+calculate:
+  description: a calculated variable
+  multi: true
+  default:
+    jinja: |-
+      {{ _.leader.follower1[0] }}
+  unique: false

tests/results/40_9leadership-calculation-outside-follower-last/rougail/00-base.yml

@@ -0,0 +1,22 @@
+---
+version: 1.1
+
+leader:
+  description: a leadership
+  type: leadership
+
+  leader: # a leader
+    - value1
+    - value2
+
+  follower1: val11 # a follower
+
+  follower2: val21 # an other follower
+
+calculate:
+  description: a calculated variable
+  multi: true
+  default:
+    jinja: |-
+      {{ _.leader.follower1[-1] }}
+  unique: false

tests/results/40_9leadership-calculation-outside-follower/rougail/00-base.yml

@@ -0,0 +1,21 @@
+---
+version: 1.1
+
+leader:
+  description: a leadership
+  type: leadership
+
+  leader: # a leader
+    - value1
+    - value2
+
+  follower1: val11 # a follower
+
+  follower2: val21 # an other follower
+
+calculate:
+  description: a calculated variable
+  multi: true
+  default:
+    variable: _.leader.follower1
+  unique: false

tests/results/40_9leadership-calculation-outside-leader-first/rougail/00-base.yml

@@ -0,0 +1,20 @@
+---
+version: 1.1
+
+leader:
+  description: a leadership
+  type: leadership
+
+  leader: # a leader
+    - value1
+    - value2
+
+  follower1: val11 # a follower
+
+  follower2: val21 # an other follower
+
+calculate:
+  description: a calculated variable
+  default:
+    jinja: >-
+      {{ _.leader.leader[0] }}

tests/results/40_9leadership-calculation-outside-leader-last/rougail/00-base.yml

@@ -0,0 +1,20 @@
+---
+version: 1.1
+
+leader:
+  description: a leadership
+  type: leadership
+
+  leader: # a leader
+    - value1
+    - value2
+
+  follower1: val11 # a follower
+
+  follower2: val21 # an other follower
+
+calculate:
+  description: a calculated variable
+  default:
+    jinja: >-
+      {{ _.leader.leader[-1] }}

tests/results/40_9leadership-calculation-outside-leader/rougail/00-base.yml

@@ -0,0 +1,19 @@
+---
+version: 1.1
+
+leader:
+  description: a leadership
+  type: leadership
+
+  leader: # a leader
+    - value1
+    - value2
+
+  follower1: val11 # a follower
+
+  follower2: val21 # an other follower
+
+calculate:
+  description: a calculated variable
+  default:
+    variable: _.leader.leader

tests/test_load.py

@@ -7,11 +7,11 @@ from rougail_tests.utils import get_structures_list, get_rougail_config, config_
 
 
 excludes = [
-#        "24_0family_hidden_condition_sub_family",
+#        "16_6exists_family",
         ]
 
 test_ok = get_structures_list(excludes)
-# test_ok = [Path('../rougail-tests/structures/20_9family_absolute')]
+# test_ok = [Path('../rougail-tests/structures/16_6exists_family')]
 
 
 def idfn(fixture_value):
@@ -32,7 +32,7 @@ def _test_structural_files(file_name, namespace, rougailconfig):
     rougailconfig['step.output'] = 'formatter'
     ##################################
     config = None
-    generated_output = RougailOutput(config, rougailconfig=rougailconfig).run()
+    generated_output = RougailOutput(config, rougailconfig=rougailconfig).run()[1]
     output_file = get_output_director(namespace) / file_name.parent.parent.name / file_name.parent.name / file_name.name
     if not output_file.is_file():
         if not output_file.parent.is_dir():