Compare commits

..

No commits in common. "0102eede498a29294c00c41d705ea96828bad3d7" and "aa5c2f773c2115d1b46f051198776b924ba6e525" have entirely different histories.

5 changed files with 9 additions and 62 deletions

View file

@ -37,7 +37,7 @@ except ImportError:
from .i18n import _
def _main(arguments, do_not_print):
def _main():
rougailconfig = get_rougail_config(
backward_compatibility=False, add_extra_options=False
)
@ -69,10 +69,10 @@ def _main(arguments, do_not_print):
raise Exception(user_data["warnings"][0])
parser = TiramisuCmdlineParser(
cmd_config,
# add_extra_options=False,
add_extra_options=False,
short_name_max_len=2,
)
parser.parse_args(arguments)
parser.parse_args()
global print_traceback
print_traceback = rougailconfig["cli.debug"]
cmd_config.property.setdefault(origin_prop, 'read_write', 'append')
@ -163,24 +163,21 @@ def _main(arguments, do_not_print):
_('cannot find cli file for "output_name" module "{0}"').format(output_name)
)
module = load_modules("rougail.output_" + output_name, str(path))
output = module.RougailOutput(
ret = module.RougailOutput(
config=config,
rougailconfig=rougailconfig,
user_data_errors=err_warn["errors"],
user_data_warnings=err_warn["warnings"],
)
if do_not_print:
return output.run()
ret = output.print()
).print()
if ret is False:
exit(1)
def main(arguments=None, do_not_print=False):
def main():
global print_traceback
print_traceback = True
try:
return _main(arguments, do_not_print)
_main()
except Exception as err:
if print_traceback:
import traceback

View file

@ -37,10 +37,12 @@ cli:
debug:
description: {_('display debug informations')}
negative_description: {_('do not display debug informations')}
default: false
versions:
description: {_('display rougail version and all componants')}
negative_description: {_('do not display rougail version and all componants')}
default: false
"""
return {

View file

@ -1,5 +0,0 @@
╭─────── Caption ────────╮
│ Variable Default value │
╰────────────────────────╯
Variables:
┗━━ 📓 my_variable: my_value

View file

@ -1,4 +0,0 @@
---
version: 1.1
my_variable: my_value

View file

@ -1,43 +0,0 @@
from pathlib import Path
from os import chdir
from rougail.cli.__main__ import main
test_dir = Path(__file__).parent
def test_cli():
chdir(test_dir / 'cli')
ret = main(['--main_dictionaries', 'structures'], do_not_print=True)
filename = Path('result.txt')
if not filename.is_file():
with filename.open('w') as fh:
fh.write(ret[1])
with filename.open() as fh:
data = fh.read()
assert ret == (True, data)
def test_cli_boolean():
chdir(test_dir / 'cli')
ret = main(['--main_dictionaries', 'structures', '--console.mandatory'], do_not_print=True)
filename = Path('result.txt')
if not filename.is_file():
with filename.open('w') as fh:
fh.write(ret[1])
with filename.open() as fh:
data = fh.read()
assert ret == (True, data)
def test_cli_boolean_2():
chdir(test_dir / 'cli')
ret = main(['--main_dictionaries', 'structures', '--console.no-mandatory'], do_not_print=True)
filename = Path('result.txt')
if not filename.is_file():
with filename.open('w') as fh:
fh.write(ret[1])
with filename.open() as fh:
data = fh.read()
assert ret == (True, data)