stove/rougail-cli
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: remove force_apply_user_data support

Browse source
This commit is contained in:
egarette@silique.fr 2025-10-05 21:37:24 +02:00
parent 52069f00c3
commit e0a45ad4a6
3 changed files with 3 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/rougail/cli/__main__.py
View file

@ -159,13 +159,13 @@ def _main(arguments, do_not_print):
if rougailconfig["cli.load_config"]: if rougailconfig["cli.load_config"]:
rougail = Rougail(rougailconfig) rougail = Rougail(rougailconfig)
config = rougail.run() config = rougail.run()
config.property.read_write()
else: else:
config = None config = None
# data user # data user
if not user_data_names: if not user_data_names:
user_datas = None user_datas = None
else: else:
config.property.read_write()
user_datas = [] user_datas = []
for user_data_name in user_data_names: for user_data_name in user_data_names:
path = ( path = (
@ -178,11 +178,6 @@ def _main(arguments, do_not_print):
_('cannot find "user_data" module "{0}"').format(user_data_name) _('cannot find "user_data" module "{0}"').format(user_data_name)
) )
module = load_modules("rougail.user_data_" + user_data_name, str(path)) 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( user_datas.extend(
module.RougailUserData( module.RougailUserData(
config, config,
@ -193,25 +188,6 @@ def _main(arguments, do_not_print):
err_warn = rougail.user_datas(user_datas) err_warn = rougail.user_datas(user_datas)
else: else:
err_warn = {"errors": [], "warnings": []} 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 # output
if config and (not rougailconfig["cli.load_config"] or not rougailconfig["cli.read_write"]): if config and (not rougailconfig["cli.load_config"] or not rougailconfig["cli.read_write"]):
config.property.read_only() config.property.read_only()

1
tests/cli/versions.txt
View file

@ -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"]

2
tests/test_load.py
View file

@ -48,6 +48,7 @@ def test_cli_boolean_no():
def test_cli_version(): def test_cli_version():
with chdir(test_dir / 'cli'): with chdir(test_dir / 'cli'):
ret = main(['--cli.version'], do_not_print=True) ret = main(['--cli.version'], do_not_print=True)
ret = [r.rsplit(': ', 1)[0] for r in ret]
filename = Path('versions.txt') filename = Path('versions.txt')
if not filename.is_file(): if not filename.is_file():
with filename.open('w') as fh: with filename.open('w') as fh:
@ -60,6 +61,7 @@ def test_cli_version():
def test_cli_version_user_data_disabled(): def test_cli_version_user_data_disabled():
with chdir(test_dir / 'cli'): with chdir(test_dir / 'cli'):
ret = main(['--cli.version', '--step.output', 'doc'], do_not_print=True) ret = main(['--cli.version', '--step.output', 'doc'], do_not_print=True)
ret = [r.rsplit(': ', 1)[0] for r in ret]
filename = Path('versions.txt') filename = Path('versions.txt')
if not filename.is_file(): if not filename.is_file():
with filename.open('w') as fh: with filename.open('w') as fh: