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

fix: black

Browse source
This commit is contained in:
egarette@silique.fr 2026-06-21 16:53:22 +02:00
parent 385687fb11
commit 30aa3fd947
2 changed files with 157 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,11 +63,14 @@ def _main(arguments, do_not_print):
print(version) print(version)
exit() exit()
layer_datas, metaconfig, config, err_warn = load_user_data(rougailconfig, parser) layer_datas, metaconfig, config, err_warn = load_user_data(rougailconfig, parser)
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()
if config and rougailconfig["cli.mandatory"]: if config and rougailconfig["cli.mandatory"]:
mandatories(config, err_warn["errors"]) mandatories(config, err_warn["errors"])
output = get_output(rougailconfig, output = get_output(
rougailconfig,
metaconfig, metaconfig,
config, config,
err_warn, err_warn,
@ -93,17 +96,31 @@ def load_cmd_user_data(rougailconfig, arguments):
if RougailUserDataYaml: if RougailUserDataYaml:
_config_files = os.environ.pop(f"{ENV_PREFIX}_CLI.CONFIG_FILE", None) _config_files = os.environ.pop(f"{ENV_PREFIX}_CLI.CONFIG_FILE", None)
if _config_files: if _config_files:
_config_files = _config_files.split(',') _config_files = _config_files.split(",")
else: else:
_config_files = cmd_config.forcepermissive.option("cli.config_file").value.get() _config_files = cmd_config.forcepermissive.option(
_config_files = [_config_file for _config_file in _config_files if Path(_config_file).is_file()] "cli.config_file"
).value.get()
_config_files = [
_config_file
for _config_file in _config_files
if Path(_config_file).is_file()
]
if _config_files: if _config_files:
config_files = _config_files config_files = _config_files
if RougailUserDataEnvironment: if RougailUserDataEnvironment:
env_prefix = ENV_PREFIX env_prefix = ENV_PREFIX
else: else:
env_prefix = None env_prefix = None
user_data = rougailconfig_load(rougailconfig, config_files, env_prefix, True, _arguments=arguments, _generate=False, _add_help=False) user_data = rougailconfig_load(
rougailconfig,
config_files,
env_prefix,
True,
_arguments=arguments,
_generate=False,
_add_help=False,
)
display_warnings = rougailconfig["cli.warnings"] display_warnings = rougailconfig["cli.warnings"]
manage_warnings(display_warnings) manage_warnings(display_warnings)
if not cmd_config.option("cli.versions").value.get(): if not cmd_config.option("cli.versions").value.get():
@ -112,7 +129,16 @@ def load_cmd_user_data(rougailconfig, arguments):
if isinstance(warning, dict): if isinstance(warning, dict):
for w, var in warning.items(): for w, var in warning.items():
if var: if var:
warn(UserWarning(_('unable to load {0}, {1}').format(var.option.impl_get_display_name(var, with_quote=True), w))) warn(
UserWarning(
_("unable to load {0}, {1}").format(
var.option.impl_get_display_name(
var, with_quote=True
),
w,
)
)
)
else: else:
warn(w) warn(w)
else: else:
@ -124,7 +150,10 @@ def load_cmd_user_data(rougailconfig, arguments):
short_name_max_len=2, short_name_max_len=2,
) )
try: try:
is_commandline = "commandline" in cmd_config.unrestraint.option(f'step.user_data').value.get() is_commandline = (
"commandline"
in cmd_config.unrestraint.option(f"step.user_data").value.get()
)
except: except:
is_commandline = False is_commandline = False
if is_commandline: if is_commandline:
@ -147,33 +176,35 @@ def load_cmd_user_data(rougailconfig, arguments):
def display_version(cmd_config): def display_version(cmd_config):
versions = [] versions = []
from tiramisu import __version__ from tiramisu import __version__
yield(f"tiramisu: {__version__}")
yield (f"tiramisu: {__version__}")
from tiramisu_cmdline_parser import __version__ from tiramisu_cmdline_parser import __version__
yield(f"tiramisu-cmdline-parser: {__version__}")
yield (f"tiramisu-cmdline-parser: {__version__}")
from rougail import __version__ from rougail import __version__
yield(f"rougail: {__version__}")
yield (f"rougail: {__version__}")
from . import __version__ from . import __version__
yield(f"rougail-cli: {__version__}")
yield (f"rougail-cli: {__version__}")
for step in ["structural", "user_data", "output"]: for step in ["structural", "user_data", "output"]:
display_step = step.replace("_", "-") display_step = step.replace("_", "-")
for step_name in sorted(cmd_config.unrestraint.option(f"step.{step}").value.list()): for step_name in sorted(
cmd_config.unrestraint.option(f"step.{step}").value.list()
):
path = ( path = (
Path(__file__).parent.parent Path(__file__).parent.parent / (step + "_" + step_name) / "__init__.py"
/ (step + "_" + step_name)
/ "__init__.py"
) )
if path.is_file(): if path.is_file():
try: try:
module = load_modules( module = load_modules(
"rougail." + step + "_" + step_name, str(path) "rougail." + step + "_" + step_name, str(path)
) )
yield( yield (f"rougail-{display_step}-{step_name}: {module.__version__}")
f"rougail-{display_step}-{step_name}: {module.__version__}"
)
except Exception as err: except Exception as err:
pass pass
@ -220,16 +251,29 @@ def load_user_data(rougailconfig, cmdline_parser):
read_write |= modes read_write |= modes
if read_write: if read_write:
metaconfig.property.setdefault( metaconfig.property.setdefault(
frozenset(metaconfig.property.default("read_write", "append") | read_write), "read_write", "append" frozenset(
metaconfig.property.default("read_write", "append") | read_write
),
"read_write",
"append",
) )
metaconfig.property.setdefault( metaconfig.property.setdefault(
frozenset(metaconfig.property.default("read_only", "remove") | (read_write - read_only)), "read_only", "remove" frozenset(
metaconfig.property.default("read_only", "remove")
| (read_write - read_only)
),
"read_only",
"remove",
) )
for p in read_write: for p in read_write:
metaconfig.permissive.add(p) metaconfig.permissive.add(p)
if read_only: if read_only:
metaconfig.property.setdefault( metaconfig.property.setdefault(
frozenset(metaconfig.property.default("read_only", "append") | read_only), "read_only", "append" frozenset(
metaconfig.property.default("read_only", "append") | read_only
),
"read_only",
"append",
) )
for p in read_only: for p in read_only:
metaconfig.permissive.add(p) metaconfig.permissive.add(p)
@ -237,7 +281,9 @@ def load_user_data(rougailconfig, cmdline_parser):
metaconfig.property.read_write() metaconfig.property.read_write()
except: except:
pass pass
metaconfig.information.set("description_type", rougailconfig["cli.description_type"]) metaconfig.information.set(
"description_type", rougailconfig["cli.description_type"]
)
rougail_user_datas = {} rougail_user_datas = {}
interactive_user_datas = {} interactive_user_datas = {}
for ud_idx, user_data_name in enumerate(reversed(user_data_names)): for ud_idx, user_data_name in enumerate(reversed(user_data_names)):
@ -252,19 +298,31 @@ def load_user_data(rougailconfig, cmdline_parser):
) )
module = load_modules("rougail.user_data_" + user_data_name, str(path)) module = load_modules("rougail.user_data_" + user_data_name, str(path))
rougail_user_data = module.RougailUserData rougail_user_data = module.RougailUserData
has_several_layers = hasattr(rougail_user_data, 'has_several_layers') and rougail_user_data.has_several_layers has_several_layers = (
hasattr(rougail_user_data, "has_several_layers")
and rougail_user_data.has_several_layers
)
if has_layers and has_several_layers: if has_layers and has_several_layers:
layers_len = rougail_user_data(None, rougailconfig=rougailconfig).count_layers() layers_len = rougail_user_data(
None, rougailconfig=rougailconfig
).count_layers()
else: else:
layers_len = 1 layers_len = 1
for idx in range(layers_len): for idx in range(layers_len):
if ud_idx and has_layers: if ud_idx and has_layers:
metaconfig = MetaConfig([metaconfig], name=user_data_name) metaconfig = MetaConfig([metaconfig], name=user_data_name)
if not idx: if not idx:
has_interactive_user_data = hasattr(rougail_user_data, 'interactive_user_data') and rougail_user_data.interactive_user_data has_interactive_user_data = (
hasattr(rougail_user_data, "interactive_user_data")
and rougail_user_data.interactive_user_data
)
if has_interactive_user_data: if has_interactive_user_data:
if rougail_user_datas: if rougail_user_datas:
raise Exception(_('interactive user data "{0}" is loader before uninteractive user data "{1}"').format(list(interactive_user_datas), user_data_name)) raise Exception(
_(
'interactive user data "{0}" is loader before uninteractive user data "{1}"'
).format(list(interactive_user_datas), user_data_name)
)
interactive_user_datas[user_data_name] = rougail_user_data interactive_user_datas[user_data_name] = rougail_user_data
else: else:
rougail_user_datas[user_data_name] = rougail_user_data rougail_user_datas[user_data_name] = rougail_user_data
@ -279,30 +337,41 @@ def load_user_data(rougailconfig, cmdline_parser):
if idx: if idx:
metaconfig = metaconfig.config(user_data_name) metaconfig = metaconfig.config(user_data_name)
metaconfig.owner.set(metaconfig.path()) metaconfig.owner.set(metaconfig.path())
if user_data_name == 'commandline': if user_data_name == "commandline":
extras = {"parents": [cmdline_parser], extras = {
"parents": [cmdline_parser],
"add_help": False, "add_help": False,
} }
else: else:
extras = {} extras = {}
for ud_idx, user_data in enumerate(rougail_user_data( for ud_idx, user_data in enumerate(
rougail_user_data(
subconfig, subconfig,
rougailconfig=rougailconfig, rougailconfig=rougailconfig,
**extras, **extras,
).run()): ).run()
):
if has_layers and ud_idx: if has_layers and ud_idx:
metaconfig = metaconfig.config(user_data_name) metaconfig = metaconfig.config(user_data_name)
metaconfig.owner.set(metaconfig.path()) metaconfig.owner.set(metaconfig.path())
if has_layers: if has_layers:
layer_datas.append(user_data["source"]) layer_datas.append(user_data["source"])
new_err_warn = UserData(metaconfig).user_data([user_data], invalid_user_data_error=invalid_user_data_error, unknown_user_data_error=unknown_user_data_error) new_err_warn = UserData(metaconfig).user_data(
[user_data],
invalid_user_data_error=invalid_user_data_error,
unknown_user_data_error=unknown_user_data_error,
)
for level, datas in new_err_warn.items(): for level, datas in new_err_warn.items():
if datas: if datas:
err_warn[level].extend(datas) err_warn[level].extend(datas)
else: else:
user_datas.append(user_data) user_datas.append(user_data)
if user_datas and not has_layers: if user_datas and not has_layers:
new_err_warn = UserData(metaconfig).user_data(user_datas, invalid_user_data_error=invalid_user_data_error, unknown_user_data_error=unknown_user_data_error) new_err_warn = UserData(metaconfig).user_data(
user_datas,
invalid_user_data_error=invalid_user_data_error,
unknown_user_data_error=unknown_user_data_error,
)
for level, datas in new_err_warn.items(): for level, datas in new_err_warn.items():
if datas: if datas:
err_warn[level].extend(datas) err_warn[level].extend(datas)
@ -313,23 +382,33 @@ def load_user_data(rougailconfig, cmdline_parser):
if idx: if idx:
metaconfig = metaconfig.config(user_data_name) metaconfig = metaconfig.config(user_data_name)
metaconfig.owner.set(metaconfig.path()) metaconfig.owner.set(metaconfig.path())
for ud_idx, user_data in enumerate(rougail_user_data( for ud_idx, user_data in enumerate(
rougail_user_data(
subconfig, subconfig,
rougailconfig=rougailconfig, rougailconfig=rougailconfig,
).run()): ).run()
):
if has_layers and ud_idx: if has_layers and ud_idx:
metaconfig = metaconfig.config(user_data_name) metaconfig = metaconfig.config(user_data_name)
metaconfig.owner.set(metaconfig.path()) metaconfig.owner.set(metaconfig.path())
if has_layers: if has_layers:
layer_datas.append(user_data["source"]) layer_datas.append(user_data["source"])
new_err_warn = UserData(metaconfig).user_data([user_data], invalid_user_data_error=invalid_user_data_error, unknown_user_data_error=unknown_user_data_error) new_err_warn = UserData(metaconfig).user_data(
[user_data],
invalid_user_data_error=invalid_user_data_error,
unknown_user_data_error=unknown_user_data_error,
)
for level, datas in new_err_warn.items(): for level, datas in new_err_warn.items():
if datas: if datas:
err_warn[level].extend(datas) err_warn[level].extend(datas)
else: else:
user_datas.append(user_data) user_datas.append(user_data)
if user_datas and not has_layers: if user_datas and not has_layers:
new_err_warn = UserData(metaconfig).user_data(user_datas, invalid_user_data_error=invalid_user_data_error, unknown_user_data_error=unknown_user_data_error) new_err_warn = UserData(metaconfig).user_data(
user_datas,
invalid_user_data_error=invalid_user_data_error,
unknown_user_data_error=unknown_user_data_error,
)
for level, datas in new_err_warn.items(): for level, datas in new_err_warn.items():
if datas: if datas:
err_warn[level].extend(datas) err_warn[level].extend(datas)
@ -371,5 +450,6 @@ def main(arguments=None, do_not_print=False):
except Exception as err: except Exception as err:
if print_traceback: if print_traceback:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
exit(_("ERROR: {0}").format(err)) exit(_("ERROR: {0}").format(err))

23
src/rougail/cli/rougailconfig.py
View file

@ -15,17 +15,19 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Mtools. If not, see <http://www.gnu.org/licenses/>. along with Mtools. If not, see <http://www.gnu.org/licenses/>.
""" """
from rougail.user_data import UserData from rougail.user_data import UserData
def load(rougailconfig: "RougailConfig", def load(
yaml_files: list[str]=None, rougailconfig: "RougailConfig",
env_prefix: str=None, yaml_files: list[str] = None,
commandline: bool=False, env_prefix: str = None,
commandline: bool = False,
_arguments=None, _arguments=None,
_add_help=True, _add_help=True,
_generate=True _generate=True,
): ):
if _generate: if _generate:
rougailconfig.generate_config() rougailconfig.generate_config()
cmd_config = rougailconfig.config cmd_config = rougailconfig.config
@ -46,18 +48,21 @@ def load(rougailconfig: "RougailConfig",
def from_yaml(cmd_config, yaml_file): def from_yaml(cmd_config, yaml_file):
from rougail.user_data_yaml import RougailUserDataYaml from rougail.user_data_yaml import RougailUserDataYaml
fake_rougail_config = { fake_rougail_config = {
"step.user_data": ["yaml"], "step.user_data": ["yaml"],
"yaml.filename": [yaml_file], "yaml.filename": [yaml_file],
"yaml.file_with_secrets": "all", "yaml.file_with_secrets": "all",
} }
return RougailUserDataYaml(cmd_config, return RougailUserDataYaml(
cmd_config,
rougailconfig=fake_rougail_config, rougailconfig=fake_rougail_config,
).run() ).run()
def from_env(cmd_config, env_prefix): def from_env(cmd_config, env_prefix):
from rougail.user_data_environment import RougailUserDataEnvironment from rougail.user_data_environment import RougailUserDataEnvironment
fake_rougail_config = { fake_rougail_config = {
"main_namespace": None, "main_namespace": None,
"step.user_data": ["environment"], "step.user_data": ["environment"],
@ -72,10 +77,12 @@ def from_env(cmd_config, env_prefix):
def from_cmdline(cmd_config, arguments, add_help): def from_cmdline(cmd_config, arguments, add_help):
from rougail.user_data_commandline import RougailUserDataCommandline from rougail.user_data_commandline import RougailUserDataCommandline
fake_rougail_config = { fake_rougail_config = {
"step.user_data": ["commandline"], "step.user_data": ["commandline"],
} }
return RougailUserDataCommandline(cmd_config, return RougailUserDataCommandline(
cmd_config,
rougailconfig=fake_rougail_config, rougailconfig=fake_rougail_config,
short_name_max_len=2, short_name_max_len=2,
arguments=arguments, arguments=arguments,