Compare commits
7 Commits
release/0.
...
release/0.
Author | SHA1 | Date | |
---|---|---|---|
ed54090710 | |||
46866f1e38 | |||
e6a9a37607 | |||
74215a6f80 | |||
57e85b49eb | |||
504d5d71a4 | |||
e2c4e3381a |
@ -186,6 +186,34 @@ def test_leadership_modif_follower_bool_false(json):
|
|||||||
assert config.value.dict() == output
|
assert config.value.dict() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_leadership_modif_follower_bool_true_fullname(json):
|
||||||
|
output = {'leader.leader': ['192.168.0.1'],
|
||||||
|
'leader.follower': [None],
|
||||||
|
'leader.follower_boolean': [True],
|
||||||
|
'leader.follower_choice': [None],
|
||||||
|
'leader.follower_integer': [None],
|
||||||
|
'leader.follower_submulti': [[]]}
|
||||||
|
|
||||||
|
config = get_config(json)
|
||||||
|
parser = TiramisuCmdlineParser(config, 'prog.py', fullpath=False)
|
||||||
|
parser.parse_args(['--follower_boolean', '0'])
|
||||||
|
assert config.value.dict() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_leadership_modif_follower_bool_false_fullname(json):
|
||||||
|
output = {'leader.leader': ['192.168.0.1'],
|
||||||
|
'leader.follower': [None],
|
||||||
|
'leader.follower_boolean': [False],
|
||||||
|
'leader.follower_choice': [None],
|
||||||
|
'leader.follower_integer': [None],
|
||||||
|
'leader.follower_submulti': [[]]}
|
||||||
|
|
||||||
|
config = get_config(json)
|
||||||
|
parser = TiramisuCmdlineParser(config, 'prog.py', fullpath=False)
|
||||||
|
parser.parse_args(['--no-follower_boolean', '0'])
|
||||||
|
assert config.value.dict() == output
|
||||||
|
|
||||||
|
|
||||||
def test_leadership_modif_follower_choice(json):
|
def test_leadership_modif_follower_choice(json):
|
||||||
output = {'leader.leader': ['192.168.0.1'],
|
output = {'leader.leader': ['192.168.0.1'],
|
||||||
'leader.follower': [None],
|
'leader.follower': [None],
|
||||||
@ -209,7 +237,7 @@ def test_leadership_modif_follower_choice_unknown(json):
|
|||||||
[--leader.follower_boolean INDEX]
|
[--leader.follower_boolean INDEX]
|
||||||
[--leader.no-follower_boolean INDEX]
|
[--leader.no-follower_boolean INDEX]
|
||||||
[--leader.follower_choice INDEX [{opt1,opt2}]]
|
[--leader.follower_choice INDEX [{opt1,opt2}]]
|
||||||
prog.py: error: invalid choice: 'opt_unknown' (choose from 'opt1', 'opt2')
|
prog.py: error: argument --leader.follower_choice: invalid choice: 'opt_unknown' (choose from 'opt1', 'opt2')
|
||||||
"""
|
"""
|
||||||
config = get_config(json)
|
config = get_config(json)
|
||||||
parser = TiramisuCmdlineParser(config, 'prog.py')
|
parser = TiramisuCmdlineParser(config, 'prog.py')
|
||||||
@ -331,6 +359,53 @@ prog.py: error: the following arguments are required: --leader.follower_submulti
|
|||||||
assert config.value.dict() == output
|
assert config.value.dict() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_leadership_modif_mandatory_remove(json):
|
||||||
|
output = {'leader.leader': ['192.168.1.1'],
|
||||||
|
'leader.follower': [None],
|
||||||
|
'leader.follower_mandatory': ['255.255.255.128'],
|
||||||
|
'leader.follower_boolean': [None],
|
||||||
|
'leader.follower_choice': [None],
|
||||||
|
'leader.follower_integer': [None],
|
||||||
|
'leader.follower_submulti': [['255.255.255.128']]}
|
||||||
|
output2 = """usage: prog.py --leader.leader "192.168.1.1" [-h] [--leader.pop-leader INDEX]
|
||||||
|
[--leader.follower INDEX [FOLLOWER]]
|
||||||
|
--leader.follower_submulti INDEX
|
||||||
|
[FOLLOWER_SUBMULTI ...]
|
||||||
|
[--leader.follower_integer INDEX [FOLLOWER_INTEGER]]
|
||||||
|
[--leader.follower_boolean INDEX]
|
||||||
|
[--leader.no-follower_boolean INDEX]
|
||||||
|
[--leader.follower_choice INDEX [{opt1,opt2}]]
|
||||||
|
--leader.follower_mandatory INDEX
|
||||||
|
FOLLOWER_MANDATORY
|
||||||
|
prog.py: error: the following arguments are required: --leader.follower_submulti"""
|
||||||
|
|
||||||
|
config = get_config(json, with_mandatory=True)
|
||||||
|
parser = TiramisuCmdlineParser(config, 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['--leader.leader', '192.168.1.1'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output2 + ', --leader.follower_mandatory\n'
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['--leader.leader', '192.168.1.1',
|
||||||
|
'--leader.follower_mandatory', '0', '255.255.255.128'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output2 + '\n'
|
||||||
|
parser.parse_args(['--leader.leader', '192.168.1.1',
|
||||||
|
'--leader.follower_submulti', '0', '255.255.255.128',
|
||||||
|
'--leader.follower_mandatory', '0', '255.255.255.128'])
|
||||||
|
assert config.value.dict() == output
|
||||||
|
|
||||||
|
|
||||||
def test_leadership_modif_mandatory_unvalidate(json):
|
def test_leadership_modif_mandatory_unvalidate(json):
|
||||||
output = {'leader.leader': ['192.168.1.1'],
|
output = {'leader.leader': ['192.168.1.1'],
|
||||||
'leader.follower': [None],
|
'leader.follower': [None],
|
||||||
|
@ -154,6 +154,27 @@ optional arguments:
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_help_modif_positional_remove(json):
|
||||||
|
output = """usage: prog.py "str" [-h] [-v] [-nv] --str STR
|
||||||
|
|
||||||
|
optional arguments:
|
||||||
|
-h, --help show this help message and exit
|
||||||
|
-v, --verbosity increase output verbosity
|
||||||
|
-nv, --no-verbosity
|
||||||
|
--str STR string option
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json), 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stdout(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['str', '--help'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "0"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_help_modif(json):
|
def test_readme_help_modif(json):
|
||||||
output = """usage: prog.py "str" --str "toto" [-h] [-v] [-nv] --str STR
|
output = """usage: prog.py "str" --str "toto" [-h] [-v] [-nv] --str STR
|
||||||
{str,list,int,none}
|
{str,list,int,none}
|
||||||
@ -179,7 +200,27 @@ optional arguments:
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_help_modif_short1(json):
|
def test_readme_help_modif_remove(json):
|
||||||
|
output = """usage: prog.py "str" --str "toto" [-h] [-v] [-nv]
|
||||||
|
|
||||||
|
optional arguments:
|
||||||
|
-h, --help show this help message and exit
|
||||||
|
-v, --verbosity increase output verbosity
|
||||||
|
-nv, --no-verbosity
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json), 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stdout(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['str', '--str', 'toto', '--help'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "0"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_help_modif_short(json):
|
||||||
output = """usage: prog.py "str" -v [-h] [-v] [-nv] --str STR {str,list,int,none}
|
output = """usage: prog.py "str" -v [-h] [-v] [-nv] --str STR {str,list,int,none}
|
||||||
|
|
||||||
positional arguments:
|
positional arguments:
|
||||||
@ -203,7 +244,28 @@ optional arguments:
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_help_modif_short_no(json):
|
def test_readme_help_modif_short_remove(json):
|
||||||
|
# FIXME -v -nv ?? pas de description
|
||||||
|
output = """usage: prog.py "str" -v [-h] [-nv] --str STR
|
||||||
|
|
||||||
|
optional arguments:
|
||||||
|
-h, --help show this help message and exit
|
||||||
|
-nv, --no-verbosity increase output verbosity
|
||||||
|
--str STR string option
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json), 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stdout(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['str', '-v', '--help'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "0"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_help_modif_short_no1(json):
|
||||||
output = """usage: prog.py "str" -v [-h] [-v] [-nv] --str STR {str,list,int,none}
|
output = """usage: prog.py "str" -v [-h] [-v] [-nv] --str STR {str,list,int,none}
|
||||||
|
|
||||||
positional arguments:
|
positional arguments:
|
||||||
@ -227,6 +289,26 @@ optional arguments:
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_help_modif_short_no_remove(json):
|
||||||
|
output = """usage: prog.py "str" -v [-h] [-v] --str STR
|
||||||
|
|
||||||
|
optional arguments:
|
||||||
|
-h, --help show this help message and exit
|
||||||
|
-v, --verbosity increase output verbosity
|
||||||
|
--str STR string option
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json), 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stdout(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['str', '-nv', '--help'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "0"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_positional_mandatory(json):
|
def test_readme_positional_mandatory(json):
|
||||||
output = """usage: prog.py [-h] [-v] [-nv] {str,list,int,none}
|
output = """usage: prog.py [-h] [-v] [-nv] {str,list,int,none}
|
||||||
prog.py: error: the following arguments are required: cmd
|
prog.py: error: the following arguments are required: cmd
|
||||||
@ -291,6 +373,22 @@ prog.py: error: the following arguments are required: --str
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_mandatory_remove(json):
|
||||||
|
output = """usage: prog.py "str" [-h] [-v] [-nv] --str STR
|
||||||
|
prog.py: error: the following arguments are required: --str
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json), 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['str'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_mandatory_tree(json):
|
def test_readme_mandatory_tree(json):
|
||||||
output = """usage: prog.py "str" [-h] [-v] [-nv] --root.str STR {str,list,int,none}
|
output = """usage: prog.py "str" [-h] [-v] [-nv] --root.str STR {str,list,int,none}
|
||||||
prog.py: error: the following arguments are required: --root.str
|
prog.py: error: the following arguments are required: --root.str
|
||||||
@ -307,6 +405,22 @@ prog.py: error: the following arguments are required: --root.str
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_mandatory_tree_remove(json):
|
||||||
|
output = """usage: prog.py "str" [-h] [-v] [-nv] --root.str STR
|
||||||
|
prog.py: error: the following arguments are required: --root.str
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json, True), 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['str'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_mandatory_tree_flatten(json):
|
def test_readme_mandatory_tree_flatten(json):
|
||||||
output = """usage: prog.py "str" [-h] [-v] [-nv] --str STR {str,list,int,none}
|
output = """usage: prog.py "str" [-h] [-v] [-nv] --str STR {str,list,int,none}
|
||||||
prog.py: error: the following arguments are required: --str
|
prog.py: error: the following arguments are required: --str
|
||||||
@ -323,6 +437,22 @@ prog.py: error: the following arguments are required: --str
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_mandatory_tree_flatten_remove(json):
|
||||||
|
output = """usage: prog.py "str" [-h] [-v] [-nv] --str STR
|
||||||
|
prog.py: error: the following arguments are required: --str
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json, True), 'prog.py', fullpath=False, display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['str'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_cross(json):
|
def test_readme_cross(json):
|
||||||
output = """usage: prog.py "none" [-h] [-v] [-nv] {str,list,int,none}
|
output = """usage: prog.py "none" [-h] [-v] [-nv] {str,list,int,none}
|
||||||
prog.py: error: unrecognized arguments: --int
|
prog.py: error: unrecognized arguments: --int
|
||||||
@ -339,15 +469,47 @@ prog.py: error: unrecognized arguments: --int
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_cross_remove(json):
|
||||||
|
output = """usage: prog.py "none" [-h] [-v] [-nv]
|
||||||
|
prog.py: error: unrecognized arguments: --int
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json), 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['none', '--int'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_cross_tree(json):
|
def test_readme_cross_tree(json):
|
||||||
output = """usage: prog.py "none" [-h] [-v] [-nv] {str,list,int,none}
|
output = """usage: prog.py "none" [-h] [-v] [-nv] {str,list,int,none}
|
||||||
prog.py: error: unrecognized arguments: --int
|
prog.py: error: unrecognized arguments: --root.int
|
||||||
"""
|
"""
|
||||||
parser = TiramisuCmdlineParser(get_config(json, True), 'prog.py')
|
parser = TiramisuCmdlineParser(get_config(json, True), 'prog.py')
|
||||||
f = StringIO()
|
f = StringIO()
|
||||||
with redirect_stderr(f):
|
with redirect_stderr(f):
|
||||||
try:
|
try:
|
||||||
parser.parse_args(['none', '--int'])
|
parser.parse_args(['none', '--root.int'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_cross_tree_remove(json):
|
||||||
|
output = """usage: prog.py "none" [-h] [-v] [-nv]
|
||||||
|
prog.py: error: unrecognized arguments: --root.int
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json, True), 'prog.py', display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['none', '--root.int'])
|
||||||
except SystemExit as err:
|
except SystemExit as err:
|
||||||
assert str(err) == "2"
|
assert str(err) == "2"
|
||||||
else:
|
else:
|
||||||
@ -371,6 +533,22 @@ prog.py: error: unrecognized arguments: --int
|
|||||||
assert f.getvalue() == output
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_cross_tree_flatten_remove(json):
|
||||||
|
output = """usage: prog.py "none" [-h] [-v] [-nv]
|
||||||
|
prog.py: error: unrecognized arguments: --int
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json, True), 'prog.py', fullpath=False, display_modified_value=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['none', '--int'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output
|
||||||
|
|
||||||
|
|
||||||
def test_readme_unknown(json):
|
def test_readme_unknown(json):
|
||||||
output = """usage: prog.py [-h] [-v] [-nv] {str,list,int,none}
|
output = """usage: prog.py [-h] [-v] [-nv] {str,list,int,none}
|
||||||
prog.py: error: argument root.cmd: invalid choice: 'unknown' (choose from 'str', 'list', 'int', 'none')
|
prog.py: error: argument root.cmd: invalid choice: 'unknown' (choose from 'str', 'list', 'int', 'none')
|
||||||
@ -681,3 +859,32 @@ def test_readme_longargument(json):
|
|||||||
parser = TiramisuCmdlineParser(config, 'prog.py')
|
parser = TiramisuCmdlineParser(config, 'prog.py')
|
||||||
parser.parse_args(['list', '--list', 'a', '--v'])
|
parser.parse_args(['list', '--list', 'a', '--v'])
|
||||||
assert config.value.dict() == output
|
assert config.value.dict() == output
|
||||||
|
|
||||||
|
|
||||||
|
def test_readme_unknown_key(json):
|
||||||
|
output1 = """usage: prog.py [-h] [-v] [-nv] {str,list,int,none}
|
||||||
|
prog.py: error: unrecognized arguments: --unknown
|
||||||
|
"""
|
||||||
|
output2 = """usage: prog.py [-h] [-v] [-nv] {str,list,int,none}
|
||||||
|
prog.py: error: unrecognized arguments: --root.unknown
|
||||||
|
"""
|
||||||
|
parser = TiramisuCmdlineParser(get_config(json, True), 'prog.py', fullpath=False)
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['--unknown'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output1
|
||||||
|
|
||||||
|
f = StringIO()
|
||||||
|
with redirect_stderr(f):
|
||||||
|
try:
|
||||||
|
parser.parse_args(['--root.unknown'])
|
||||||
|
except SystemExit as err:
|
||||||
|
assert str(err) == "2"
|
||||||
|
else:
|
||||||
|
raise Exception('must raises')
|
||||||
|
assert f.getvalue() == output2
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
from .api import TiramisuCmdlineParser
|
from .api import TiramisuCmdlineParser
|
||||||
|
|
||||||
__version__ = "0.1"
|
__version__ = "0.3"
|
||||||
__all__ = ('TiramisuCmdlineParser',)
|
__all__ = ('TiramisuCmdlineParser',)
|
||||||
|
@ -20,7 +20,7 @@ from gettext import gettext as _
|
|||||||
try:
|
try:
|
||||||
from tiramisu import Config
|
from tiramisu import Config
|
||||||
from tiramisu.error import PropertiesOptionError, RequirementError, LeadershipError
|
from tiramisu.error import PropertiesOptionError, RequirementError, LeadershipError
|
||||||
except ModuleNotFoundError:
|
except ImportError:
|
||||||
Config = None
|
Config = None
|
||||||
from tiramisu_api.error import PropertiesOptionError
|
from tiramisu_api.error import PropertiesOptionError
|
||||||
RequirementError = PropertiesOptionError
|
RequirementError = PropertiesOptionError
|
||||||
@ -29,10 +29,25 @@ try:
|
|||||||
from tiramisu__api import Config as ConfigJson
|
from tiramisu__api import Config as ConfigJson
|
||||||
if Config is None:
|
if Config is None:
|
||||||
Config = ConfigJson
|
Config = ConfigJson
|
||||||
except ModuleNotFoundError:
|
except ImportError:
|
||||||
ConfigJson = Config
|
ConfigJson = Config
|
||||||
|
|
||||||
|
|
||||||
|
def get_choice_list(obj, properties, display):
|
||||||
|
def convert(choice):
|
||||||
|
if isinstance(choice, int):
|
||||||
|
return str(choice)
|
||||||
|
return choice
|
||||||
|
choices = [convert(choice) for choice in obj.value.list()]
|
||||||
|
if choices[0] == '':
|
||||||
|
del choices[0]
|
||||||
|
if display:
|
||||||
|
choices = '{{{}}}'.format(','.join(choices))
|
||||||
|
if 'mandatory' not in properties:
|
||||||
|
choices = '[{}]'.format(choices)
|
||||||
|
return choices
|
||||||
|
|
||||||
|
|
||||||
class TiramisuNamespace(Namespace):
|
class TiramisuNamespace(Namespace):
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
config: Config,
|
config: Config,
|
||||||
@ -41,6 +56,7 @@ class TiramisuNamespace(Namespace):
|
|||||||
super().__setattr__('_root', root)
|
super().__setattr__('_root', root)
|
||||||
super().__setattr__('list_force_no', {})
|
super().__setattr__('list_force_no', {})
|
||||||
super().__setattr__('list_force_del', {})
|
super().__setattr__('list_force_del', {})
|
||||||
|
super().__setattr__('arguments', {})
|
||||||
self._populate()
|
self._populate()
|
||||||
super().__init__()
|
super().__init__()
|
||||||
|
|
||||||
@ -74,6 +90,22 @@ class TiramisuNamespace(Namespace):
|
|||||||
else:
|
else:
|
||||||
_setattr = self._setattr
|
_setattr = self._setattr
|
||||||
true_value = value
|
true_value = value
|
||||||
|
if option.option.type() == 'choice':
|
||||||
|
# HACK if integer in choice
|
||||||
|
values = option.value.list()
|
||||||
|
if isinstance(value, list):
|
||||||
|
int_value = []
|
||||||
|
for val in value:
|
||||||
|
if isinstance(val, str) and val.isdigit():
|
||||||
|
int_val = int(val)
|
||||||
|
if int_val in values:
|
||||||
|
val = int_val
|
||||||
|
int_value.append(val)
|
||||||
|
value = int_value
|
||||||
|
elif value not in values and isinstance(value, str) and value.isdigit():
|
||||||
|
int_value = int(value)
|
||||||
|
if int_value in values:
|
||||||
|
value = int_value
|
||||||
try:
|
try:
|
||||||
if key in self.list_force_del:
|
if key in self.list_force_del:
|
||||||
option.value.pop(value)
|
option.value.pop(value)
|
||||||
@ -81,7 +113,16 @@ class TiramisuNamespace(Namespace):
|
|||||||
_setattr(option, true_key, key, value)
|
_setattr(option, true_key, key, value)
|
||||||
except ValueError as err:
|
except ValueError as err:
|
||||||
if option.option.type() == 'choice':
|
if option.option.type() == 'choice':
|
||||||
raise ValueError("invalid choice: '{}' (choose from {})".format(true_value, ', '.join([f"'{val}'" for val in option.value.list()])))
|
values = option.value.list()
|
||||||
|
if isinstance(true_value, list):
|
||||||
|
for val in value:
|
||||||
|
if val not in values:
|
||||||
|
display_value = val
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
display_value = true_value
|
||||||
|
choices = get_choice_list(option, option.property.get(), False)
|
||||||
|
raise ValueError("argument {}: invalid choice: '{}' (choose from {})".format(self.arguments[key], display_value, ', '.join([f"'{val}'" for val in choices])))
|
||||||
else:
|
else:
|
||||||
raise err
|
raise err
|
||||||
|
|
||||||
@ -147,13 +188,15 @@ class _BuildKwargs:
|
|||||||
cmdlineparser: 'TiramisuCmdlineParser',
|
cmdlineparser: 'TiramisuCmdlineParser',
|
||||||
properties: List[str],
|
properties: List[str],
|
||||||
force_no: bool,
|
force_no: bool,
|
||||||
force_del: bool) -> None:
|
force_del: bool,
|
||||||
|
display_modified_value: bool,
|
||||||
|
not_display: bool) -> None:
|
||||||
self.kwargs = {}
|
self.kwargs = {}
|
||||||
self.cmdlineparser = cmdlineparser
|
self.cmdlineparser = cmdlineparser
|
||||||
self.properties = properties
|
self.properties = properties
|
||||||
self.force_no = force_no
|
self.force_no = force_no
|
||||||
self.force_del = force_del
|
self.force_del = force_del
|
||||||
if not self.force_no and not self.force_del:
|
if (not self.force_no or (not_display and not display_modified_value)) and not self.force_del:
|
||||||
description = option.doc()
|
description = option.doc()
|
||||||
if not description:
|
if not description:
|
||||||
description = description.replace('%', '%%')
|
description = description.replace('%', '%%')
|
||||||
@ -162,15 +205,20 @@ class _BuildKwargs:
|
|||||||
is_short_name = self.cmdlineparser._is_short_name(name, 'longargument' in self.properties)
|
is_short_name = self.cmdlineparser._is_short_name(name, 'longargument' in self.properties)
|
||||||
if self.force_no:
|
if self.force_no:
|
||||||
ga_name = self.gen_argument_name(name, is_short_name)
|
ga_name = self.gen_argument_name(name, is_short_name)
|
||||||
self.cmdlineparser.namespace.list_force_no[ga_name] = option.path()
|
ga_path = self.gen_argument_name(option.path(), is_short_name)
|
||||||
|
self.cmdlineparser.namespace.list_force_no[ga_path] = option.path()
|
||||||
elif self.force_del:
|
elif self.force_del:
|
||||||
ga_name = self.gen_argument_name(name, is_short_name)
|
ga_name = self.gen_argument_name(name, is_short_name)
|
||||||
self.cmdlineparser.namespace.list_force_del[ga_name] = option.path()
|
ga_path = self.gen_argument_name(option.path(), is_short_name)
|
||||||
|
self.cmdlineparser.namespace.list_force_del[ga_path] = option.path()
|
||||||
else:
|
else:
|
||||||
ga_name = name
|
ga_name = name
|
||||||
self.kwargs['dest'] = self.gen_argument_name(option.path(), False)
|
self.kwargs['dest'] = self.gen_argument_name(option.path(), False)
|
||||||
self.args = [self.cmdlineparser._gen_argument(ga_name, is_short_name)]
|
argument = self.cmdlineparser._gen_argument(ga_name, is_short_name)
|
||||||
|
self.cmdlineparser.namespace.arguments[option.path()] = argument
|
||||||
|
self.args = [argument]
|
||||||
else:
|
else:
|
||||||
|
self.cmdlineparser.namespace.arguments[option.path()] = option.path()
|
||||||
self.args = [option.path()]
|
self.args = [option.path()]
|
||||||
|
|
||||||
def __setitem__(self,
|
def __setitem__(self,
|
||||||
@ -187,7 +235,9 @@ class _BuildKwargs:
|
|||||||
name = self.gen_argument_name(option.name(), is_short_name)
|
name = self.gen_argument_name(option.name(), is_short_name)
|
||||||
else:
|
else:
|
||||||
name = option.name()
|
name = option.name()
|
||||||
self.args.insert(0, self.cmdlineparser._gen_argument(name, is_short_name))
|
argument = self.cmdlineparser._gen_argument(name, is_short_name)
|
||||||
|
self.cmdlineparser.namespace.arguments[option.path()] = argument
|
||||||
|
self.args.insert(0, argument)
|
||||||
|
|
||||||
def gen_argument_name(self, name, is_short_name):
|
def gen_argument_name(self, name, is_short_name):
|
||||||
if self.force_no:
|
if self.force_no:
|
||||||
@ -223,6 +273,7 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
root: str=None,
|
root: str=None,
|
||||||
fullpath: bool=True,
|
fullpath: bool=True,
|
||||||
remove_empty_od: bool=False,
|
remove_empty_od: bool=False,
|
||||||
|
display_modified_value: bool=True,
|
||||||
formatter_class=HelpFormatter,
|
formatter_class=HelpFormatter,
|
||||||
_forhelp: bool=False,
|
_forhelp: bool=False,
|
||||||
**kwargs):
|
**kwargs):
|
||||||
@ -230,6 +281,7 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
self.config = config
|
self.config = config
|
||||||
self.root = root
|
self.root = root
|
||||||
self.remove_empty_od = remove_empty_od
|
self.remove_empty_od = remove_empty_od
|
||||||
|
self.display_modified_value = display_modified_value
|
||||||
if TiramisuHelpFormatter not in formatter_class.__mro__:
|
if TiramisuHelpFormatter not in formatter_class.__mro__:
|
||||||
formatter_class = type('TiramisuHelpFormatter', (TiramisuHelpFormatter, formatter_class), {})
|
formatter_class = type('TiramisuHelpFormatter', (TiramisuHelpFormatter, formatter_class), {})
|
||||||
formatter_class.remove_empty_od = self.remove_empty_od
|
formatter_class.remove_empty_od = self.remove_empty_od
|
||||||
@ -287,6 +339,7 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
self.prog,
|
self.prog,
|
||||||
root=self.root,
|
root=self.root,
|
||||||
remove_empty_od=self.remove_empty_od,
|
remove_empty_od=self.remove_empty_od,
|
||||||
|
display_modified_value=self.display_modified_value,
|
||||||
formatter_class=self.formatter_class,
|
formatter_class=self.formatter_class,
|
||||||
epilog=self.epilog,
|
epilog=self.epilog,
|
||||||
description=self.description,
|
description=self.description,
|
||||||
@ -323,9 +376,9 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
if type != 'boolean':
|
if type != 'boolean':
|
||||||
if isinstance(value, list):
|
if isinstance(value, list):
|
||||||
for val in value:
|
for val in value:
|
||||||
self.prog += f' "{val}"'
|
self.prog += ' "{}"'.format(val)
|
||||||
else:
|
else:
|
||||||
self.prog += f' "{value}"'
|
self.prog += ' "{}"'.format(value)
|
||||||
|
|
||||||
def _config_list(self,
|
def _config_list(self,
|
||||||
config: Config,
|
config: Config,
|
||||||
@ -401,12 +454,15 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
properties = obj.option.properties()
|
properties = obj.option.properties()
|
||||||
else:
|
else:
|
||||||
properties = obj.property.get()
|
properties = obj.property.get()
|
||||||
kwargs = _BuildKwargs(name, option, self, properties, force_no, force_del)
|
not_display = not option.isfollower() and not obj.owner.isdefault() and value is not None
|
||||||
if not option.isfollower() and _forhelp and not obj.owner.isdefault() and value is not None and not force_no:
|
kwargs = _BuildKwargs(name, option, self, properties, force_no, force_del, self.display_modified_value, not_display)
|
||||||
|
if _forhelp and not_display and ((value is not False and not force_no) or (value is False and force_no)):
|
||||||
options_is_not_default[option.name()] = {'properties': properties,
|
options_is_not_default[option.name()] = {'properties': properties,
|
||||||
'type': option.type(),
|
'type': option.type(),
|
||||||
'name': name,
|
'name': name,
|
||||||
'value': value}
|
'value': value}
|
||||||
|
if not self.display_modified_value:
|
||||||
|
continue
|
||||||
if 'positional' in properties:
|
if 'positional' in properties:
|
||||||
if option.type() == 'boolean':
|
if option.type() == 'boolean':
|
||||||
raise ValueError(_('boolean option must not be positional'))
|
raise ValueError(_('boolean option must not be positional'))
|
||||||
@ -456,15 +512,10 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
else:
|
else:
|
||||||
kwargs['nargs'] = 2
|
kwargs['nargs'] = 2
|
||||||
if _forhelp and 'mandatory' not in properties:
|
if _forhelp and 'mandatory' not in properties:
|
||||||
metavar = f'[{metavar}]'
|
metavar = '[{}]'.format(metavar)
|
||||||
if option.type() == 'choice':
|
if option.type() == 'choice':
|
||||||
choice_list = obj.value.list()
|
# do not manage choice with argparse there is problem with integer problem
|
||||||
if choice_list[0] == '':
|
kwargs['metavar'] = ('INDEX', get_choice_list(obj, properties, True))
|
||||||
del choice_list[0]
|
|
||||||
choices = '{{{}}}'.format(','.join(choice_list))
|
|
||||||
if 'mandatory' not in properties:
|
|
||||||
choices = f'[{choices}]'
|
|
||||||
kwargs['metavar'] = ('INDEX', choices)
|
|
||||||
else:
|
else:
|
||||||
kwargs['metavar'] = ('INDEX', metavar)
|
kwargs['metavar'] = ('INDEX', metavar)
|
||||||
if force_del:
|
if force_del:
|
||||||
@ -479,10 +530,10 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
kwargs['metavar'] = 'INDEX'
|
kwargs['metavar'] = 'INDEX'
|
||||||
kwargs['nargs'] = 1
|
kwargs['nargs'] = 1
|
||||||
elif option.type() == 'choice' and not option.isfollower():
|
elif option.type() == 'choice' and not option.isfollower():
|
||||||
kwargs['choices'] = obj.value.list()
|
# do not manage choice with argparse there is problem with integer problem
|
||||||
|
kwargs['choices'] = get_choice_list(obj, properties, False)
|
||||||
else:
|
else:
|
||||||
pass
|
pass
|
||||||
#raise NotImplementedError('not supported yet')
|
|
||||||
actions.setdefault(option.name(), []).append(kwargs)
|
actions.setdefault(option.name(), []).append(kwargs)
|
||||||
for option_is_not_default in options_is_not_default.values():
|
for option_is_not_default in options_is_not_default.values():
|
||||||
self._option_is_not_default(**option_is_not_default)
|
self._option_is_not_default(**option_is_not_default)
|
||||||
@ -548,6 +599,7 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
root=self.root,
|
root=self.root,
|
||||||
fullpath=self.fullpath,
|
fullpath=self.fullpath,
|
||||||
remove_empty_od=self.remove_empty_od,
|
remove_empty_od=self.remove_empty_od,
|
||||||
|
display_modified_value=self.display_modified_value,
|
||||||
formatter_class=self.formatter_class,
|
formatter_class=self.formatter_class,
|
||||||
epilog=self.epilog,
|
epilog=self.epilog,
|
||||||
description=self.description,
|
description=self.description,
|
||||||
@ -560,6 +612,7 @@ class TiramisuCmdlineParser(ArgumentParser):
|
|||||||
root=self.root,
|
root=self.root,
|
||||||
fullpath=self.fullpath,
|
fullpath=self.fullpath,
|
||||||
remove_empty_od=self.remove_empty_od,
|
remove_empty_od=self.remove_empty_od,
|
||||||
|
display_modified_value=self.display_modified_value,
|
||||||
formatter_class=self.formatter_class,
|
formatter_class=self.formatter_class,
|
||||||
epilog=self.epilog,
|
epilog=self.epilog,
|
||||||
description=self.description,
|
description=self.description,
|
||||||
|
Reference in New Issue
Block a user