From e0a45ad4a663d635ebc890fa10279af23699992e Mon Sep 17 00:00:00 2001
From: Emmanuel Garette <egarette@silique.fr>
Date: Sun, 5 Oct 2025 21:37:24 +0200
Subject: [PATCH] fix: remove force_apply_user_data support

---
 src/rougail/cli/__main__.py | 26 +-------------------------
 tests/cli/versions.txt      |  1 -
 tests/test_load.py          |  2 ++
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 tests/cli/versions.txt

diff --git a/src/rougail/cli/__main__.py b/src/rougail/cli/__main__.py
index 23467fd..e5b391e 100644
--- a/src/rougail/cli/__main__.py
+++ b/src/rougail/cli/__main__.py
@@ -159,13 +159,13 @@ def _main(arguments, do_not_print):
     if rougailconfig["cli.load_config"]:
         rougail = Rougail(rougailconfig)
         config = rougail.run()
+        config.property.read_write()
     else:
         config = None
     # data user
     if not user_data_names:
         user_datas = None
     else:
-        config.property.read_write()
         user_datas = []
         for user_data_name in user_data_names:
             path = (
@@ -178,11 +178,6 @@ def _main(arguments, do_not_print):
                     _('cannot find "user_data" module "{0}"').format(user_data_name)
                 )
             module = load_modules("rougail.user_data_" + user_data_name, str(path))
-            if (
-                hasattr(module.RougailUserData, "force_apply_user_data")
-                and module.RougailUserData.force_apply_user_data is True
-            ):
-                continue
             user_datas.extend(
                 module.RougailUserData(
                     config,
@@ -193,25 +188,6 @@ def _main(arguments, do_not_print):
         err_warn = rougail.user_datas(user_datas)
     else:
         err_warn = {"errors": [], "warnings": []}
-    if user_data_names:
-        config.property.read_write()
-        for user_data_name in user_data_names:
-            path = (
-                Path(__file__).parent.parent
-                / ("user_data_" + user_data_name)
-                / "__init__.py"
-            )
-            module = load_modules("rougail.user_data_" + user_data_name, str(path))
-            if (
-                hasattr(module.RougailUserData, "force_apply_user_data")
-                and module.RougailUserData.force_apply_user_data is True
-            ):
-                ret = module.RougailUserData(
-                    config,
-                    rougailconfig=rougailconfig,
-                ).run()
-                err_warn["errors"].extend(ret["errors"])
-                err_warn["warnings"].extend(ret["warnings"])
     # output
     if config and (not rougailconfig["cli.load_config"] or not rougailconfig["cli.read_write"]):
         config.property.read_only()
diff --git a/tests/cli/versions.txt b/tests/cli/versions.txt
deleted file mode 100644
index 236a5f9..0000000
--- a/tests/cli/versions.txt
+++ /dev/null
@@ -1 +0,0 @@
-["tiramisu: 5.2.0a12", "tiramisu-cmdline-parser: 0.7.0a2", "rougail: 1.2.0a35", "rougail-cli: 0.2.0a21", "rougail-structural-bitwarden: 0.1.0a5", "rougail-user-data-ansible: 0.1.0a3", "rougail-user-data-bitwarden: 0.1.0a21", "rougail-user-data-environment: 0.1.0a11", "rougail-user-data-yaml: 0.2.0a13", "rougail-output-ansible: 0.2.0a14", "rougail-output-console: 0.2.0a13", "rougail-output-doc: 0.2.0a30", "rougail-output-json: 0.2.0a10"]
diff --git a/tests/test_load.py b/tests/test_load.py
index 88e43fe..1fa250c 100644
--- a/tests/test_load.py
+++ b/tests/test_load.py
@@ -48,6 +48,7 @@ def test_cli_boolean_no():
 def test_cli_version():
     with chdir(test_dir / 'cli'):
         ret = main(['--cli.version'], do_not_print=True)
+        ret = [r.rsplit(': ', 1)[0] for r in ret]
         filename = Path('versions.txt')
         if not filename.is_file():
             with filename.open('w') as fh:
@@ -60,6 +61,7 @@ def test_cli_version():
 def test_cli_version_user_data_disabled():
     with chdir(test_dir / 'cli'):
         ret = main(['--cli.version', '--step.output', 'doc'], do_not_print=True)
+        ret = [r.rsplit(': ', 1)[0] for r in ret]
         filename = Path('versions.txt')
         if not filename.is_file():
             with filename.open('w') as fh: