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 2025-05-11 19:15:11 +02:00
parent 57df91ebee
commit da6a816713
2 changed files with 57 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/rougail/cli/__init__.py
View file

@ -15,4 +15,5 @@ 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 .__version__ import __version__ from .__version__ import __version__

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

@ -26,6 +26,7 @@ from rougail import Rougail
from rougail.config import get_rougail_config from rougail.config import get_rougail_config
from rougail.utils import load_modules from rougail.utils import load_modules
from rougail.user_datas import UserDatas from rougail.user_datas import UserDatas
try: try:
from rougail.user_data_yaml import RougailUserDataYaml from rougail.user_data_yaml import RougailUserDataYaml
except ImportError: except ImportError:
@ -44,53 +45,69 @@ def _main(arguments, do_not_print):
) )
rougailconfig.generate_config() rougailconfig.generate_config()
cmd_config = rougailconfig.config cmd_config = rougailconfig.config
origin_prop = cmd_config.property.default('read_write', 'append') origin_prop = cmd_config.property.default("read_write", "append")
cmd_config.property.setdefault(frozenset(origin_prop | {"not_for_commandline"}), 'read_write', 'append') cmd_config.property.setdefault(
frozenset(origin_prop | {"not_for_commandline"}), "read_write", "append"
)
cmd_config.property.read_write() cmd_config.property.read_write()
fake_rougail_config = {'step.user_data': [],} fake_rougail_config = {
"step.user_data": [],
}
fake_user_datas = [] fake_user_datas = []
if RougailUserDataYaml: if RougailUserDataYaml:
config_file = cmd_config.forcepermissive.option("cli.config_file").value.get() config_file = cmd_config.forcepermissive.option("cli.config_file").value.get()
if Path(config_file).is_file(): if Path(config_file).is_file():
fake_rougail_config = {'step.user_data': 'yaml', fake_rougail_config = {
'yaml.filename': [config_file], "step.user_data": "yaml",
'yaml.file_with_secrets': 'all', "yaml.filename": [config_file],
} "yaml.file_with_secrets": "all",
fake_user_datas.extend(RougailUserDataYaml(cmd_config, rougailconfig=fake_rougail_config).run()) }
fake_user_datas.extend(
RougailUserDataYaml(cmd_config, rougailconfig=fake_rougail_config).run()
)
if RougailUserDataEnvironment: if RougailUserDataEnvironment:
fake_rougail_config = {'step.user_data': 'environment', fake_rougail_config = {
'environment.default_environment_name': 'ROUGAILCLI', "step.user_data": "environment",
} "environment.default_environment_name": "ROUGAILCLI",
fake_user_datas.extend(RougailUserDataEnvironment(cmd_config, rougailconfig=fake_rougail_config).run()) }
fake_user_datas.extend(
RougailUserDataEnvironment(
cmd_config, rougailconfig=fake_rougail_config
).run()
)
if fake_user_datas: if fake_user_datas:
user_data = UserDatas(cmd_config).user_datas(fake_user_datas) user_data = UserDatas(cmd_config).user_datas(fake_user_datas)
if user_data["errors"]: if user_data["errors"]:
raise Exception(user_data["errors"][0]) raise Exception(user_data["errors"][0])
# if user_data["warnings"]: # if user_data["warnings"]:
# raise Exception(user_data["warnings"][0]) # raise Exception(user_data["warnings"][0])
parser = TiramisuCmdlineParser( parser = TiramisuCmdlineParser(
cmd_config, cmd_config,
# add_extra_options=False, # add_extra_options=False,
short_name_max_len=2, short_name_max_len=2,
) )
parser.parse_args(arguments) parser.parse_args(arguments)
global print_traceback global print_traceback
print_traceback = rougailconfig["cli.debug"] print_traceback = rougailconfig["cli.debug"]
cmd_config.property.setdefault(origin_prop, 'read_write', 'append') cmd_config.property.setdefault(origin_prop, "read_write", "append")
cmd_config.property.remove("not_for_commandline") cmd_config.property.remove("not_for_commandline")
cmd_config.property.read_only() cmd_config.property.read_only()
if rougailconfig['cli.versions']: if rougailconfig["cli.versions"]:
from tiramisu import __version__ from tiramisu import __version__
print(f'tiramisu: {__version__}')
print(f"tiramisu: {__version__}")
from tiramisu_cmdline_parser import __version__ from tiramisu_cmdline_parser import __version__
print(f'tiramisu-cmdline-parser: {__version__}')
print(f"tiramisu-cmdline-parser: {__version__}")
from rougail import __version__ from rougail import __version__
print(f'rougail: {__version__}')
print(f"rougail: {__version__}")
from . import __version__ from . import __version__
print(f'rougail-cli: {__version__}')
for step in ['structural', 'user_data', 'output']: print(f"rougail-cli: {__version__}")
display_step = step.replace('_', '-') for step in ["structural", "user_data", "output"]:
for step_name in sorted(cmd_config.option(f'step.{step}').value.list()): display_step = step.replace("_", "-")
for step_name in sorted(cmd_config.option(f"step.{step}").value.list()):
path = ( path = (
Path(__file__).parent.parent Path(__file__).parent.parent
/ (step + "_" + step_name) / (step + "_" + step_name)
@ -98,8 +115,12 @@ def _main(arguments, do_not_print):
) )
if path.is_file(): if path.is_file():
try: try:
module = load_modules("rougail." + step + '_' + step_name, str(path)) module = load_modules(
print(f'rougail-{display_step}-{step_name}: {module.__version__}') "rougail." + step + "_" + step_name, str(path)
)
print(
f"rougail-{display_step}-{step_name}: {module.__version__}"
)
except Exception as err: except Exception as err:
pass pass
return return
@ -130,7 +151,10 @@ 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: if (
hasattr(module.RougailUserData, "force_apply_user_data")
and module.RougailUserData.force_apply_user_data is True
):
continue continue
user_datas.extend( user_datas.extend(
module.RougailUserData( module.RougailUserData(
@ -151,7 +175,10 @@ def _main(arguments, do_not_print):
/ "__init__.py" / "__init__.py"
) )
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: if (
hasattr(module.RougailUserData, "force_apply_user_data")
and module.RougailUserData.force_apply_user_data is True
):
ret = module.RougailUserData( ret = module.RougailUserData(
config, config,
rougailconfig=rougailconfig, rougailconfig=rougailconfig,
@ -189,5 +216,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))