bump: version 0.2.0a9 → 0.2.0a10

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.2.0a10 (2025-09-29)
+
+### Feat
+
+- remove json.read_write option
+- default value for a calculated variable with an unknown optional variable
+- update tests for integer type
+
 ## 0.2.0a9 (2025-09-22)
 
 ### Fix

pyproject.toml

@@ -4,7 +4,7 @@ requires = ["flit_core >=3.8.0,<4"]
 
 [project]
 name = "rougail.output_json"
-version = "0.2.0a9"
+version = "0.2.0a10"
 authors = [{name = "Emmanuel Garette", email = "gnunux@gnunux.info"}]
 readme = "README.md"
 description = "Rougail output json"

src/rougail/output_json/__init__.py

@@ -57,7 +57,6 @@ class RougailOutputJson:
             self.warnings = user_data_warnings
         else:
             self.warnings = []
-        self.read_write = self.rougailconfig["json.read_write"]
         self.is_mandatory = self.rougailconfig["json.mandatory"]
         self.get = self.rougailconfig["json.get"]
         self.dico = {}
@@ -76,14 +75,14 @@ class RougailOutputJson:
         return ret
 
     def exporter(self) -> None:
+        if self.is_mandatory:
+            ori_properties = self.config.property.exportation()
             self.config.property.read_write()
             self.mandatory()
-        self.config.property.read_only()
+            self.config.property.importation(ori_properties)
         if self.manage_errors():
             return False
         self.manage_warnings()
-        if self.read_write:
-            self.config.property.read_write()
         if self.get:
             config = self.config.option(self.get)
             if not config.isoptiondescription():
@@ -98,8 +97,6 @@ class RougailOutputJson:
         return True
 
     def mandatory(self):
-        if not self.is_mandatory:
-            return
         title = False
         options_with_error = []
         try:
@@ -114,7 +111,6 @@ class RougailOutputJson:
             try:
                 option.value.get()
                 if not title:
-                    # self.errors.append("Les variables suivantes sont obligatoires mais n'ont pas de valeur :")
                     self.errors.append(
                         _("The following variables are mandatory but have no value:")
                     )
@@ -125,7 +121,6 @@ class RougailOutputJson:
         if not title:
             for idx, option in enumerate(options_with_error):
                 if not idx:
-                    # self.errors.append("Les variables suivantes sont inaccessibles mais sont vides et obligatoires :")
                     self.errors.append(
                         _(
                             "The following variables are inaccessible but are empty and mandatory :"

src/rougail/output_json/__version__.py

@@ -1 +1 @@
-__version__ = "0.2.0a9"
+__version__ = "0.2.0a10"

src/rougail/output_json/config.py

@@ -28,19 +28,21 @@ def get_rougail_config(
 json:
   description: {_('configuration rougail-json')}
   disabled:
-    type: jinja
     jinja: |
       {{% if step.output is propertyerror or step.output != 'json' %}}
       disabled
       {{% endif %}}
 
-  read_write:
-    description: {_('display variables available in read_write mode')}
-    default: false
-
   mandatory:
     description: {_('test mandatories variables before display in json')}
-    default: true
+    type: boolean
+    default:
+      jinja: |-
+        {{% if cli.read_write is defined and cli.read_write %}}
+          false
+        {{% else %}}
+          true
+        {{% endif %}}
 
   get:
     description: {_('get value for a variable or a family')}

tests/results/test/00_2default_calculated_variable.json

@@ -0,0 +1,10 @@
+{
+  "var1": [
+    "domain1.lan",
+    "domain2.lan"
+  ],
+  "var2": [
+    "domain1.lan",
+    "domain2.lan"
+  ]
+}

tests/results/test/00_6integer.json

@@ -0,0 +1,8 @@
+{
+  "var1": 1,
+  "var2": 1,
+  "var3": 1,
+  "var4": 1,
+  "var5": 1,
+  "var6": 1
+}

tests/results/test/00_6ip.json

@@ -0,0 +1,5 @@
+{
+  "var1": "192.168.1.6",
+  "var2": "192.168.1.6/24",
+  "var3": "192.168.1.6/24"
+}

tests/results/test/00_6network.json

@@ -0,0 +1,5 @@
+{
+  "var1": "192.168.1.0",
+  "var2": "192.168.1.6/32",
+  "var3": "192.168.1.6/32"
+}

tests/results/test/00_9default_calculation_multi_optional_default.json

@@ -0,0 +1,8 @@
+{
+  "my_variable": "string1",
+  "my_calculated_variable": [
+    "string1",
+    "string2",
+    "string3"
+  ]
+}

tests/results/test/00_9default_number.json

@@ -0,0 +1,3 @@
+{
+  "var": 0
+}

tests/results/test/01_9choice_variable_optional.json

@@ -0,0 +1,3 @@
+{
+  "variable": "a"
+}

tests/results/test/04_0type_param_integer.json

@@ -0,0 +1,3 @@
+{
+  "int": 1
+}

tests/results/test/04_5disabled_calculation_optional_default.json

@@ -0,0 +1,7 @@
+{
+  "condition": true,
+  "var1": null,
+  "var2": null,
+  "var3": null,
+  "var4": null
+}

tests/results/test/40_2leadership_calculation_index.json

@@ -0,0 +1,16 @@
+{
+  "leader": [
+    {
+      "leader": "string1",
+      "follower1": 1
+    },
+    {
+      "leader": "string2",
+      "follower1": 2
+    },
+    {
+      "leader": "string3",
+      "follower1": 3
+    }
+  ]
+}

tests/results/test/40_2leadership_calculation_index_2.json

@@ -0,0 +1,16 @@
+{
+  "leader": [
+    {
+      "leader": "string1",
+      "follower1": 1
+    },
+    {
+      "leader": "string2",
+      "follower1": 2
+    },
+    {
+      "leader": "string3",
+      "follower1": 3
+    }
+  ]
+}

tests/results/test/60_0family_dynamic_variable_optional.json

@@ -0,0 +1,8 @@
+{
+  "dyna": {
+    "var": "string1"
+  },
+  "dynb": {
+    "var": "string1"
+  }
+}

tests/results/test_mandatory/00_2default_calculated_variable.json

@@ -0,0 +1,10 @@
+{
+  "var1": [
+    "domain1.lan",
+    "domain2.lan"
+  ],
+  "var2": [
+    "domain1.lan",
+    "domain2.lan"
+  ]
+}

tests/results/test_mandatory/00_6integer.json

@@ -0,0 +1,8 @@
+{
+  "var1": 1,
+  "var2": 1,
+  "var3": 1,
+  "var4": 1,
+  "var5": 1,
+  "var6": 1
+}

tests/results/test_mandatory/00_6ip.json

@@ -0,0 +1,5 @@
+{
+  "var1": "192.168.1.6",
+  "var2": "192.168.1.6/24",
+  "var3": "192.168.1.6/24"
+}

tests/results/test_mandatory/00_6network.json

@@ -0,0 +1,5 @@
+{
+  "var1": "192.168.1.0",
+  "var2": "192.168.1.6/32",
+  "var3": "192.168.1.6/32"
+}

tests/results/test_mandatory/00_9default_calculation_multi_optional_default.json

@@ -0,0 +1,8 @@
+{
+  "my_variable": "string1",
+  "my_calculated_variable": [
+    "string1",
+    "string2",
+    "string3"
+  ]
+}

tests/results/test_mandatory/00_9default_number.json

@@ -0,0 +1,3 @@
+{
+  "var": 0
+}

tests/results/test_mandatory/01_9choice_variable_optional.json

@@ -0,0 +1,3 @@
+{
+  "variable": "a"
+}

tests/results/test_mandatory/04_0type_param_integer.json

@@ -0,0 +1,3 @@
+{
+  "int": 1
+}

tests/results/test_mandatory/04_5disabled_calculation_optional_default.json

@@ -0,0 +1,7 @@
+{
+  "condition": true,
+  "var1": null,
+  "var2": null,
+  "var3": null,
+  "var4": null
+}

tests/results/test_mandatory/40_2leadership_calculation_index.json

@@ -0,0 +1,16 @@
+{
+  "leader": [
+    {
+      "leader": "string1",
+      "follower1": 1
+    },
+    {
+      "leader": "string2",
+      "follower1": 2
+    },
+    {
+      "leader": "string3",
+      "follower1": 3
+    }
+  ]
+}

tests/results/test_mandatory/40_2leadership_calculation_index_2.json

@@ -0,0 +1,16 @@
+{
+  "leader": [
+    {
+      "leader": "string1",
+      "follower1": 1
+    },
+    {
+      "leader": "string2",
+      "follower1": 2
+    },
+    {
+      "leader": "string3",
+      "follower1": 3
+    }
+  ]
+}

tests/results/test_mandatory/60_0family_dynamic_variable_optional.json

@@ -0,0 +1,8 @@
+{
+  "dyna": {
+    "var": "string1"
+  },
+  "dynb": {
+    "var": "string1"
+  }
+}

tests/results/test_namespace/00_2default_calculated_variable.json

@@ -0,0 +1,12 @@
+{
+  "rougail": {
+    "var1": [
+      "domain1.lan",
+      "domain2.lan"
+    ],
+    "var2": [
+      "domain1.lan",
+      "domain2.lan"
+    ]
+  }
+}

tests/results/test_namespace/00_6integer.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "var1": 1,
+    "var2": 1,
+    "var3": 1,
+    "var4": 1,
+    "var5": 1,
+    "var6": 1
+  }
+}

tests/results/test_namespace/00_6ip.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "192.168.1.6",
+    "var2": "192.168.1.6/24",
+    "var3": "192.168.1.6/24"
+  }
+}

tests/results/test_namespace/00_6network.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "192.168.1.0",
+    "var2": "192.168.1.6/32",
+    "var3": "192.168.1.6/32"
+  }
+}

tests/results/test_namespace/00_9default_calculation_multi_optional_default.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "my_variable": "string1",
+    "my_calculated_variable": [
+      "string1",
+      "string2",
+      "string3"
+    ]
+  }
+}

tests/results/test_namespace/00_9default_number.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "var": 0
+  }
+}

tests/results/test_namespace/01_9choice_variable_optional.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "variable": "a"
+  }
+}

tests/results/test_namespace/04_0type_param_integer.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "int": 1
+  }
+}

tests/results/test_namespace/04_5disabled_calculation_optional_default.json

@@ -0,0 +1,9 @@
+{
+  "rougail": {
+    "condition": true,
+    "var1": null,
+    "var2": null,
+    "var3": null,
+    "var4": null
+  }
+}

tests/results/test_namespace/40_2leadership_calculation_index_2.json

@@ -0,0 +1,18 @@
+{
+  "rougail": {
+    "leader": [
+      {
+        "leader": "string1",
+        "follower1": 1
+      },
+      {
+        "leader": "string2",
+        "follower1": 2
+      },
+      {
+        "leader": "string3",
+        "follower1": 3
+      }
+    ]
+  }
+}

tests/results/test_namespace/60_0family_dynamic_variable_optional.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "dyna": {
+      "var": "string1"
+    },
+    "dynb": {
+      "var": "string1"
+    }
+  }
+}

tests/results/test_namespace_mandatory/00_2default_calculated_variable.json

@@ -0,0 +1,12 @@
+{
+  "rougail": {
+    "var1": [
+      "domain1.lan",
+      "domain2.lan"
+    ],
+    "var2": [
+      "domain1.lan",
+      "domain2.lan"
+    ]
+  }
+}

tests/results/test_namespace_mandatory/00_6integer.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "var1": 1,
+    "var2": 1,
+    "var3": 1,
+    "var4": 1,
+    "var5": 1,
+    "var6": 1
+  }
+}

tests/results/test_namespace_mandatory/00_6ip.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "192.168.1.6",
+    "var2": "192.168.1.6/24",
+    "var3": "192.168.1.6/24"
+  }
+}

tests/results/test_namespace_mandatory/00_6network.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "192.168.1.0",
+    "var2": "192.168.1.6/32",
+    "var3": "192.168.1.6/32"
+  }
+}

tests/results/test_namespace_mandatory/00_9default_calculation_multi_optional_default.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "my_variable": "string1",
+    "my_calculated_variable": [
+      "string1",
+      "string2",
+      "string3"
+    ]
+  }
+}

tests/results/test_namespace_mandatory/00_9default_number.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "var": 0
+  }
+}

tests/results/test_namespace_mandatory/01_9choice_variable_optional.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "variable": "a"
+  }
+}

tests/results/test_namespace_mandatory/04_0type_param_integer.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "int": 1
+  }
+}

tests/results/test_namespace_mandatory/04_5disabled_calculation_optional_default.json

@@ -0,0 +1,9 @@
+{
+  "rougail": {
+    "condition": true,
+    "var1": null,
+    "var2": null,
+    "var3": null,
+    "var4": null
+  }
+}

tests/results/test_namespace_mandatory/40_2leadership_calculation_index_2.json

@@ -0,0 +1,18 @@
+{
+  "rougail": {
+    "leader": [
+      {
+        "leader": "string1",
+        "follower1": 1
+      },
+      {
+        "leader": "string2",
+        "follower1": 2
+      },
+      {
+        "leader": "string3",
+        "follower1": 3
+      }
+    ]
+  }
+}

tests/results/test_namespace_mandatory/60_0family_dynamic_variable_optional.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "dyna": {
+      "var": "string1"
+    },
+    "dynb": {
+      "var": "string1"
+    }
+  }
+}

tests/results/test_namespace_read_write/00_2default_calculated_variable.json

@@ -0,0 +1,6 @@
+{
+  "rougail": {
+    "var1": [],
+    "var2": []
+  }
+}

tests/results/test_namespace_read_write/00_6integer.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "var1": 0,
+    "var2": 0,
+    "var3": 0,
+    "var4": 10,
+    "var5": 10,
+    "var6": 10
+  }
+}

tests/results/test_namespace_read_write/00_6ip.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "1.1.1.1",
+    "var2": "1.1.1.1/24",
+    "var3": "1.1.1.1/24"
+  }
+}

tests/results/test_namespace_read_write/00_6network.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "1.1.1.0",
+    "var2": "1.1.1.0/24",
+    "var3": "1.1.1.0/24"
+  }
+}

tests/results/test_namespace_read_write/00_9default_calculation_multi_optional_default.json

@@ -0,0 +1,9 @@
+{
+  "rougail": {
+    "my_variable": "val1",
+    "my_calculated_variable": [
+      "val1",
+      "value"
+    ]
+  }
+}

tests/results/test_namespace_read_write/00_9default_number.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "var": 9
+  }
+}

tests/results/test_namespace_read_write/01_9choice_variable_optional.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "variable": "c"
+  }
+}

tests/results/test_namespace_read_write/04_0type_param_integer.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "int": 10
+  }
+}

tests/results/test_namespace_read_write/04_5disabled_calculation_optional_default.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "condition": false,
+    "var3": null,
+    "var4": null
+  }
+}

tests/results/test_namespace_read_write/40_2leadership_calculation_index_2.json

@@ -0,0 +1,18 @@
+{
+  "rougail": {
+    "leader": [
+      {
+        "leader": "a",
+        "follower1": 0
+      },
+      {
+        "leader": "b",
+        "follower1": 1
+      },
+      {
+        "leader": "c",
+        "follower1": 2
+      }
+    ]
+  }
+}

tests/results/test_namespace_read_write/60_0family_dynamic_variable_optional.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "dyna": {
+      "var": "val"
+    },
+    "dynb": {
+      "var": "val"
+    }
+  }
+}

tests/results/test_namespace_read_write_mandatory/00_2default_calculated_variable.json

@@ -0,0 +1,12 @@
+{
+  "rougail": {
+    "var1": [
+      "domain1.lan",
+      "domain2.lan"
+    ],
+    "var2": [
+      "domain1.lan",
+      "domain2.lan"
+    ]
+  }
+}

tests/results/test_namespace_read_write_mandatory/00_6integer.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "var1": 1,
+    "var2": 1,
+    "var3": 1,
+    "var4": 1,
+    "var5": 1,
+    "var6": 1
+  }
+}

tests/results/test_namespace_read_write_mandatory/00_6ip.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "192.168.1.6",
+    "var2": "192.168.1.6/24",
+    "var3": "192.168.1.6/24"
+  }
+}

tests/results/test_namespace_read_write_mandatory/00_6network.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "192.168.1.0",
+    "var2": "192.168.1.6/32",
+    "var3": "192.168.1.6/32"
+  }
+}

tests/results/test_namespace_read_write_mandatory/00_9default_calculation_multi_optional_default.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "my_variable": "string1",
+    "my_calculated_variable": [
+      "string1",
+      "string2",
+      "string3"
+    ]
+  }
+}

tests/results/test_namespace_read_write_mandatory/00_9default_number.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "var": 0
+  }
+}

tests/results/test_namespace_read_write_mandatory/01_9choice_variable_optional.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "variable": "a"
+  }
+}

tests/results/test_namespace_read_write_mandatory/04_0type_param_integer.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "int": 1
+  }
+}

tests/results/test_namespace_read_write_mandatory/04_5disabled_calculation_optional_default.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "condition": true
+  }
+}

tests/results/test_namespace_read_write_mandatory/40_2leadership_calculation_index_2.json

@@ -0,0 +1,18 @@
+{
+  "rougail": {
+    "leader": [
+      {
+        "leader": "string1",
+        "follower1": 1
+      },
+      {
+        "leader": "string2",
+        "follower1": 2
+      },
+      {
+        "leader": "string3",
+        "follower1": 3
+      }
+    ]
+  }
+}

tests/results/test_namespace_read_write_mandatory/60_0family_dynamic_variable_optional.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "dyna": {
+      "var": "string1"
+    },
+    "dynb": {
+      "var": "string1"
+    }
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/00_2default_calculated_variable.json

@@ -0,0 +1,7 @@
+{
+  "_errors": [
+    "The following variables are mandatory but have no value:",
+    "  - rougail.var1 (a first variable)",
+    "  - rougail.var2 (a second variable)"
+  ]
+}

tests/results/test_namespace_read_write_mandatory_errors/00_6integer.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "var1": 0,
+    "var2": 0,
+    "var3": 0,
+    "var4": 10,
+    "var5": 10,
+    "var6": 10
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/00_6ip.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "1.1.1.1",
+    "var2": "1.1.1.1/24",
+    "var3": "1.1.1.1/24"
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/00_6network.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "var1": "1.1.1.0",
+    "var2": "1.1.1.0/24",
+    "var3": "1.1.1.0/24"
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/00_9default_calculation_multi_optional_default.json

@@ -0,0 +1,9 @@
+{
+  "rougail": {
+    "my_variable": "val1",
+    "my_calculated_variable": [
+      "val1",
+      "value"
+    ]
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/00_9default_number.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "var": 9
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/01_9choice_variable_optional.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "variable": "c"
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/04_0type_param_integer.json

@@ -0,0 +1,5 @@
+{
+  "rougail": {
+    "int": 10
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/04_5disabled_calculation_optional_default.json

@@ -0,0 +1,7 @@
+{
+  "rougail": {
+    "condition": false,
+    "var3": null,
+    "var4": null
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/04_5validators.json

@@ -1,6 +1,6 @@
 {
   "_errors": [
     "The following variables are mandatory but have no value:",
-    "  - rougail.int (A number)"
+    "  - rougail.int (An integer)"
   ]
 }

tests/results/test_namespace_read_write_mandatory_errors/24_7validators_variable_optional.json

@@ -1,6 +1,6 @@
 {
   "_errors": [
     "The following variables are mandatory but have no value:",
-    "  - rougail.general.int (a first number)"
+    "  - rougail.general.int (a first integer)"
   ]
 }

tests/results/test_namespace_read_write_mandatory_errors/40_2leadership_calculation_index_2.json

@@ -0,0 +1,18 @@
+{
+  "rougail": {
+    "leader": [
+      {
+        "leader": "a",
+        "follower1": 0
+      },
+      {
+        "leader": "b",
+        "follower1": 1
+      },
+      {
+        "leader": "c",
+        "follower1": 2
+      }
+    ]
+  }
+}

tests/results/test_namespace_read_write_mandatory_errors/60_0family_dynamic_variable_optional.json

@@ -0,0 +1,10 @@
+{
+  "rougail": {
+    "dyna": {
+      "var": "val"
+    },
+    "dynb": {
+      "var": "val"
+    }
+  }
+}

tests/results/test_read_write/00_2default_calculated_variable.json

@@ -0,0 +1,4 @@
+{
+  "var1": [],
+  "var2": []
+}

tests/results/test_read_write/00_6integer.json

@@ -0,0 +1,8 @@
+{
+  "var1": 0,
+  "var2": 0,
+  "var3": 0,
+  "var4": 10,
+  "var5": 10,
+  "var6": 10
+}