diff --git a/README.md b/README.md index 00c46dc9..073d5e48 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ - [Summary](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/branch/1.1/README.md) -- [[tutorial v1.1_000] Creating a structure file](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_000/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_001~1..v1.1_001)) +- [[tutorial v1.1_001] Let’s add our first variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_001/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_002~1..v1.1_002)) -# [tutorial v1.1_001] Let’s add our first variable +# [tutorial v1.1_002] Describe the variable -[Read the tutorial "Let’s add our first variable" in the documentation](https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/preliminary.html#let-s-add-our-first-variable) +[Read the tutorial "Describe the variable" in the documentation](https://pedago.gwenaelremond.fr/bribes/rougail/tutorial/preliminary.html#describe-the-variable) ## Screenshot @@ -29,7 +29,7 @@ pip install rougail-cli rougail-output-exporter rougail-output-doc rougail-user- Then switch to the tutorial page: ```shell -git switch --detach v1.1_001 +git switch --detach v1.1_002 ``` ## Structure @@ -37,9 +37,9 @@ git switch --detach v1.1_001

-.
- └── firefox
-     └── 00-proxy.yml
+.
+ └── firefox
+     └── 00-proxy.yml


Contents of the firefox/00-proxy.yml file @@ -49,7 +49,7 @@ Contents of the firefox/00-proxy.yml file --- version: 1.1 -proxy_mode: +proxy_mode: # Configure Proxy Access to the Internet ... ``` @@ -60,9 +60,9 @@ proxy_mode: ```shell rougail -m firefox/ -o doc ``` -| Variable | -|------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **proxy_mode**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | +| Variable | Description | +|------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------| +| **proxy_mode**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Configure Proxy Access to the Internet. | *** @@ -71,11 +71,11 @@ rougail -m firefox/ -o doc ```shell rougail -m firefox/ -o doc --doc.contents changelog --doc.changelog.previous_json_file previous.yml ``` -#### New variable +#### Modified variable -| Variable | -|------------------------------------------------------------------------------------------------------------------------------------------------------------| -| **proxy_mode**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | +| Variable | Description | +|------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------| +| **proxy_mode**
[`string`](https://rougail.readthedocs.io/en/latest/variable.html#variables-types) `mandatory` | Configure Proxy Access to the Internet. | *** @@ -98,7 +98,7 @@ rougail -m firefox/ -u yaml -yf config/01/config.yml ``` > [!CAUTION] > -> - proxy_mode: :stop_sign: mandatory variable but has no value +> - proxy_mode (Configure Proxy Access to the Internet): :stop_sign: mandatory variable but has no value *** #### Output in read write mode @@ -113,7 +113,7 @@ rougail -m firefox/ -u yaml -yf config/01/config.yml --cli.read_write > - Default value Variables: -- :notebook: proxy_mode: null +- :notebook: proxy_mode (Configure Proxy Access to the Internet): null *** ### Example 2 @@ -139,7 +139,7 @@ rougail -m firefox/ -u yaml -yf config/02/config.yml > - Modified value Variables: -- :notebook: proxy_mode: No proxy ← loaded from the YAML file "config/02/config.yml" +- :notebook: proxy_mode (Configure Proxy Access to the Internet): No proxy ← loaded from the YAML file "config/02/config.yml" *** ### Example 3 @@ -149,7 +149,7 @@ Variables: ```yml --- -proxy_mode: 1 +proxy_mode: foo ``` *** @@ -158,25 +158,16 @@ proxy_mode: 1 ```shell rougail -m firefox/ -u yaml -yf config/03/config.yml ``` -> [!CAUTION] -> -> - proxy_mode -> - :bell: the value "1" is an invalid string, it's not a string, it will be ignored when loading from the YAML file "config/03/config.yml" -> - :stop_sign: mandatory variable but has no value +> [!NOTE] +> +> **Caption:** +> - Variable +> - Modified value -*** -#### Output when invalid user data is an error - -```shell -rougail -m firefox/ -u yaml -yf config/03/config.yml --cli.invalid_user_data_error -``` -> [!CAUTION] -> -> - proxy_mode -> - :stop_sign: the value "1" is an invalid string, it's not a string, it has been loading from the YAML file "config/03/config.yml" -> - :stop_sign: mandatory variable but has no value +Variables: +- :notebook: proxy_mode (Configure Proxy Access to the Internet): foo ← loaded from the YAML file "config/03/config.yml" *** -- [[tutorial v1.1_002] Describe the variable](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_002/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_002~1..v1.1_002)) +- [[tutorial v1.1_003] Set a default value](https://forge.cloud.silique.fr/stove/rougail-tutorials/src/commit/v1.1_003/README.md) ([diff](https://forge.cloud.silique.fr/stove/rougail-tutorials/compare/v1.1_003~1..v1.1_003)) diff --git a/config/01/output_ro.html b/config/01/output_ro.html index d28fe852..208adf8c 100644 --- a/config/01/output_ro.html +++ b/config/01/output_ro.html @@ -1,3 +1,4 @@ 
🛑 Caution
-┗━━ proxy_mode: 🛑 mandatory variable but has no value
+┗━━ proxy_mode (Configure Proxy Access to the Internet): 🛑 mandatory variable 
+    but has no value
diff --git a/config/01/output_rw.html b/config/01/output_rw.html index f6131c09..2495b81f 100644 --- a/config/01/output_rw.html +++ b/config/01/output_rw.html @@ -2,5 +2,5 @@ │ Variable Default value │ ╰────────────────────────╯ Variables: -┗━━ 📓 proxy_mode: null +┗━━ 📓 proxy_mode (Configure Proxy Access to the Internet): null diff --git a/config/02/output_ro.html b/config/02/output_ro.html index fd3af127..74819b24 100644 --- a/config/02/output_ro.html +++ b/config/02/output_ro.html @@ -2,5 +2,6 @@ │ Variable Modified value │ ╰─────────────────────────╯ Variables: -┗━━ 📓 proxy_mode: No proxy ◀ loaded from the YAML file "config/02/config.yml" +┗━━ 📓 proxy_mode (Configure Proxy Access to the Internet): No proxy ◀ loaded + from the YAML file "config/02/config.yml" diff --git a/config/03/cmd_invalid.txt b/config/03/cmd_invalid.txt deleted file mode 100644 index 3fe251f2..00000000 --- a/config/03/cmd_invalid.txt +++ /dev/null @@ -1 +0,0 @@ -rougail -m firefox/ -u yaml -yf config/03/config.yml --cli.invalid_user_data_error \ No newline at end of file diff --git a/config/03/config.yml b/config/03/config.yml index bf6f64ca..e3fa25da 100644 --- a/config/03/config.yml +++ b/config/03/config.yml @@ -1,2 +1,2 @@ --- -proxy_mode: 1 +proxy_mode: foo diff --git a/config/03/output_invalid.html b/config/03/output_invalid.html deleted file mode 100644 index a43ce434..00000000 --- a/config/03/output_invalid.html +++ /dev/null @@ -1,6 +0,0 @@ -
🛑 Caution
-┗━━ proxy_mode
-    ┣━━ 🛑 the value "1" is an invalid string, it's not a string, it has been 
-    ┃   loading from the YAML file "config/03/config.yml"
-    ┗━━ 🛑 mandatory variable but has no value
-
diff --git a/config/03/output_ro.html b/config/03/output_ro.html index e298a887..51687266 100644 --- a/config/03/output_ro.html +++ b/config/03/output_ro.html @@ -1,6 +1,7 @@ -
🛑 Caution
-┗━━ proxy_mode
-    ┣━━ 🔔 the value "1" is an invalid string, it's not a string, it will be 
-    ┃   ignored when loading from the YAML file "config/03/config.yml"
-    ┗━━ 🛑 mandatory variable but has no value
+
╭──────── Caption ────────╮
+│ Variable Modified value │
+╰─────────────────────────╯
+Variables:
+┗━━ 📓 proxy_mode (Configure Proxy Access to the Internet): foo ◀ loaded from 
+    the YAML file "config/03/config.yml"
 

diff --git a/tree.html b/tree.html
index f2712464..631fdc67 100644
--- a/tree.html
+++ b/tree.html
@@ -1,5 +1,5 @@
 

-.

-	└── firefox

-	    └── 00-proxy.yml

+.

+	└── firefox

+	    └── 00-proxy.yml

 


\ No newline at end of file