new tiramisu_cmdline_parser version

tests/test_choice.py

@@ -0,0 +1,207 @@
+from io import StringIO
+from contextlib import redirect_stdout, redirect_stderr
+import pytest
+
+
+from tiramisu_cmdline_parser import TiramisuCmdlineParser
+from tiramisu import ChoiceOption, OptionDescription, Config
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
+
+
+
+def get_config(json):
+    positional = ChoiceOption('positional',
+                              'choice the sub argument',
+                              ('str', 'list', 'int', 'none'),
+                              properties=('positional', 'mandatory'))
+    positional_int = ChoiceOption('positional_int',
+                              'choice the sub argument',
+                              (1, 2, 3),
+                              properties=('positional', 'mandatory'))
+    str_ = ChoiceOption('str',
+                        'choice the sub argument',
+                        ('str1', 'str2', 'str3'))
+    int_ = ChoiceOption('int',
+                        'choice the sub argument',
+                        (1, 2, 3))
+    int_multi = ChoiceOption('int_multi',
+                             'choice the sub argument',
+                             (1, 2, 3),
+                             multi=True)
+    od = OptionDescription('od',
+                           'od',
+                           [positional, positional_int, str_, int_, int_multi])
+    config = Config(od)
+    config.property.read_write()
+    if json == 'tiramisu':
+        return config
+    jconfig = JsonConfig(config.option.dict())
+    return jconfig
+
+
+@pytest.fixture(params=params)
+def json(request):
+    return request.param
+
+
+def test_choice_positional(json):
+    output1 = '''usage: prog.py "str" "1" [-h] [--str {str1,str2,str3}] [--int {1,2,3}]
+                         [--int_multi [{1,2,3} [{1,2,3} ...]]]
+                         {str,list,int,none} {1,2,3}
+prog.py: error: argument positional: invalid choice: 'error' (choose from 'str', 'list', 'int', 'none')
+'''
+    output2 = '''usage: prog.py "str" "1" [-h] [--str {str1,str2,str3}] [--int {1,2,3}]
+                         [--int_multi [{1,2,3} [{1,2,3} ...]]]
+                         {str,list,int,none} {1,2,3}
+prog.py: error: argument positional_int: invalid choice: '4' (choose from '1', '2', '3')
+'''
+    config = get_config(json)
+    parser = TiramisuCmdlineParser(config, 'prog.py')
+    parser.parse_args(['str', '1'])
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': None,
+                                   'int': None,
+                                   'int_multi': []}
+    f = StringIO()
+    with redirect_stderr(f):
+        try:
+            parser.parse_args(['error', '1'])
+        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(['str', '4'])
+        except SystemExit as err:
+            assert str(err) == "2"
+        else:
+            raise Exception('must raises')
+    assert f.getvalue() == output2
+
+
+def test_choice_str(json):
+    output = """usage: prog.py "str" "1" --str "str3" [-h] [--str {str1,str2,str3}]
+                                      [--int {1,2,3}]
+                                      [--int_multi [{1,2,3} [{1,2,3} ...]]]
+                                      {str,list,int,none} {1,2,3}
+prog.py: error: argument --str: invalid choice: 'error' (choose from 'str1', 'str2', 'str3')
+"""
+    config = get_config(json)
+    parser = TiramisuCmdlineParser(config, 'prog.py')
+    parser.parse_args(['str', '1', '--str', 'str1'])
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': 'str1',
+                                   'int': None,
+                                   'int_multi': []}
+    parser.parse_args(['str', '1', '--str', 'str2'])
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': 'str2',
+                                   'int': None,
+                                   'int_multi': []}
+    parser.parse_args(['str', '1', '--str', 'str3'])
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': 'str3',
+                                   'int': None,
+                                   'int_multi': []}
+    f = StringIO()
+    with redirect_stderr(f):
+        try:
+            parser.parse_args(['str', '1', '--str', 'error'])
+        except SystemExit as err:
+            assert str(err) == "2"
+        else:
+            raise Exception('must raises')
+    assert f.getvalue() == output
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': 'str3',
+                                   'int': None,
+                                   'int_multi': []}
+
+
+def test_choice_int(json):
+    output = """usage: prog.py "str" "1" --int "1" [-h] [--str {str1,str2,str3}]
+                                   [--int {1,2,3}]
+                                   [--int_multi [{1,2,3} [{1,2,3} ...]]]
+                                   {str,list,int,none} {1,2,3}
+prog.py: error: argument --int: invalid choice: '4' (choose from '1', '2', '3')
+"""
+    config = get_config(json)
+    parser = TiramisuCmdlineParser(config, 'prog.py')
+    parser.parse_args(['str', '1', '--int', '1'])
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': None,
+                                   'int': 1,
+                                   'int_multi': []}
+    f = StringIO()
+    with redirect_stderr(f):
+        try:
+            parser.parse_args(['str', '1', '--int', '4'])
+        except SystemExit as err:
+            assert str(err) == "2"
+        else:
+            raise Exception('must raises')
+    assert f.getvalue() == output
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': None,
+                                   'int': 1,
+                                   'int_multi': []}
+
+
+def test_choice_int_multi(json):
+    output = """usage: prog.py "str" "1" --int_multi "1" "2" [-h] [--str {str1,str2,str3}]
+                                             [--int {1,2,3}]
+                                             [--int_multi [{1,2,3} [{1,2,3} ...]]]
+                                             {str,list,int,none} {1,2,3}
+prog.py: error: argument --int_multi: invalid choice: '4' (choose from '1', '2', '3')
+"""
+    config = get_config(json)
+    parser = TiramisuCmdlineParser(config, 'prog.py')
+    parser.parse_args(['str', '1', '--int_multi', '1', '2'])
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': None,
+                                   'int': None,
+                                   'int_multi': [1, 2]}
+    f = StringIO()
+    with redirect_stderr(f):
+        try:
+            parser.parse_args(['str', '1', '--int_multi', '4'])
+        except SystemExit as err:
+            assert str(err) == "2"
+        else:
+            raise Exception('must raises')
+    assert f.getvalue() == output
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': None,
+                                   'int': None,
+                                   'int_multi': [1, 2]}
+    f = StringIO()
+    with redirect_stderr(f):
+        try:
+            parser.parse_args(['str', '1', '--int_multi', '1', '4'])
+        except SystemExit as err:
+            assert str(err) == "2"
+        else:
+            raise Exception('must raises')
+    assert f.getvalue() == output
+    assert config.value.dict() == {'positional': 'str',
+                                   'positional_int': 1,
+                                   'str': None,
+                                   'int': None,
+                                   'int_multi': [1, 2]}

tests/test_help.py

@@ -7,7 +7,11 @@ from argparse import RawDescriptionHelpFormatter
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Config
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
 
@@ -31,7 +35,7 @@ def get_config(json):
     return jconfig
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 

tests/test_leadership.py

@@ -6,7 +6,11 @@ import pytest
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Leadership, Config, submulti
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
 def get_config(json, with_mandatory=False):
@@ -31,7 +35,7 @@ def get_config(json, with_mandatory=False):
     return jconfig
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-api'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 

tests/test_optiondescription.py

@@ -6,7 +6,11 @@ import pytest
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Config
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
 def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False, empty_optiondescription=False):
@@ -59,7 +63,7 @@ def get_config(json, has_tree=False, default_verbosity=False, add_long=False, ad
     return jconfig
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 

tests/test_readme.py

@@ -6,7 +6,11 @@ import pytest
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Config
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
 def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False):
@@ -67,7 +71,7 @@ def get_config(json, has_tree=False, default_verbosity=False, add_long=False, ad
     return jconfig
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 
@@ -461,7 +465,7 @@ prog.py: error: unrecognized arguments: --int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--int'])
+            parser.parse_args(['none', '--int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -477,7 +481,7 @@ prog.py: error: unrecognized arguments: --int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--int'])
+            parser.parse_args(['none', '--int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -493,7 +497,7 @@ prog.py: error: unrecognized arguments: --root.int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--root.int'])
+            parser.parse_args(['none', '--root.int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -509,7 +513,7 @@ prog.py: error: unrecognized arguments: --root.int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--root.int'])
+            parser.parse_args(['none', '--root.int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -525,7 +529,7 @@ prog.py: error: unrecognized arguments: --int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--int'])
+            parser.parse_args(['none', '--int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:
@@ -541,7 +545,7 @@ prog.py: error: unrecognized arguments: --int
     f = StringIO()
     with redirect_stderr(f):
         try:
-            parser.parse_args(['none', '--int'])
+            parser.parse_args(['none', '--int', '1'])
         except SystemExit as err:
             assert str(err) == "2"
         else:

tests/test_shortarg.py

@@ -6,10 +6,14 @@ from contextlib import redirect_stderr
 from tiramisu_cmdline_parser import TiramisuCmdlineParser
 from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
                      SymLinkOption, OptionDescription, Config
-from tiramisu_api import Config as JsonConfig
+try:
+    from tiramisu_api import Config as JsonConfig
+    params = ['tiramisu', 'tiramisu-json']
+except:
+    params = ['tiramisu']
 
 
-@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
+@pytest.fixture(params=params)
 def json(request):
     return request.param
 

tiramisu_cmdline_parser/__init__.py

@@ -1,4 +1,9 @@
-from .api import TiramisuCmdlineParser
+try:
+    from .api import TiramisuCmdlineParser
+except ImportError as err:
+    import warnings
+    warnings.warn("cannot not import TiramisuCmdlineParser {err}", ImportWarning)
+    TiramisuCmdlineParser = None
 
-__version__ = "0.3"
+__version__ = "0.5"
 __all__ = ('TiramisuCmdlineParser',)

tiramisu_cmdline_parser/api.py

@@ -26,7 +26,7 @@ except ImportError:
     RequirementError = PropertiesOptionError
     LeadershipError = ValueError
 try:
-    from tiramisu__api import Config as ConfigJson
+    from tiramisu_api import Config as ConfigJson
     if Config is None:
         Config = ConfigJson
 except ImportError:
@@ -39,7 +39,7 @@ def get_choice_list(obj, properties, display):
             return str(choice)
         return choice
     choices = [convert(choice) for choice in obj.value.list()]
-    if choices[0] == '':
+    if choices and choices[0] == '':
         del choices[0]
     if display:
         choices = '{{{}}}'.format(','.join(choices))
@@ -135,7 +135,10 @@ class TiramisuNamespace(Namespace):
                 value is not None and \
                 not isinstance(value, list):
             value = [value]
-        option.value.set(value)
+        try:
+            option.value.set(value)
+        except PropertiesOptionError:
+            raise AttributeError('unrecognized arguments: {}'.format(self.arguments[key]))
 
     def _setattr_follower(self,
                           option: 'Option',
@@ -275,21 +278,27 @@ class TiramisuCmdlineParser(ArgumentParser):
                  remove_empty_od: bool=False,
                  display_modified_value: bool=True,
                  formatter_class=HelpFormatter,
+                 unrestraint: bool=False,
                  _forhelp: bool=False,
                  **kwargs):
         self.fullpath = fullpath
         self.config = config
         self.root = root
         self.remove_empty_od = remove_empty_od
+        self.unrestraint = unrestraint
         self.display_modified_value = display_modified_value
         if TiramisuHelpFormatter not in formatter_class.__mro__:
             formatter_class = type('TiramisuHelpFormatter', (TiramisuHelpFormatter, formatter_class), {})
         formatter_class.remove_empty_od = self.remove_empty_od
         kwargs['formatter_class'] = formatter_class
-        if self.root is None:
-            subconfig = self.config.option
+        if not _forhelp and self.unrestraint:
+            subconfig = self.config.unrestraint
         else:
-            subconfig = self.config.option(self.root)
+            subconfig = self.config
+        if self.root is None:
+            subconfig = subconfig.option
+        else:
+            subconfig = subconfig.option(self.root)
         self.namespace = TiramisuNamespace(self.config, self.root)
         super().__init__(*args, **kwargs)
         self.register('action', 'help', _TiramisuHelpAction)
@@ -330,7 +339,7 @@ class TiramisuCmdlineParser(ArgumentParser):
     def _parse_known_args(self, args=None, namespace=None):
         try:
             namespace_, args_ = super()._parse_known_args(args, namespace)
-        except (ValueError, LeadershipError) as err:
+        except (ValueError, LeadershipError, AttributeError) as err:
             self.error(err)
         if args != args_ and args_ and args_[0].startswith(self.prefix_chars):
             # option that was disabled are no more disable
@@ -343,6 +352,7 @@ class TiramisuCmdlineParser(ArgumentParser):
                                                formatter_class=self.formatter_class,
                                                epilog=self.epilog,
                                                description=self.description,
+                                               unrestraint=self.unrestraint,
                                                fullpath=self.fullpath)
             namespace_, args_ = new_parser._parse_known_args(args_, new_parser.namespace)
         else:
@@ -444,8 +454,11 @@ class TiramisuCmdlineParser(ArgumentParser):
                 leadership_len = len(value)
             elif option.isfollower():
                 value = []
-                for index in range(leadership_len):
-                    value.append(self.config.option(obj.option.path(), index).value.get())
+                try:
+                    for index in range(leadership_len):
+                        value.append(self.config.option(obj.option.path(), index).value.get())
+                except:
+                    value = None
             else:
                 value = obj.value.get()
             if self.fullpath and prefix:
@@ -532,6 +545,8 @@ class TiramisuCmdlineParser(ArgumentParser):
                 elif option.type() == 'choice' and not option.isfollower():
                     # do not manage choice with argparse there is problem with integer problem
                     kwargs['choices'] = get_choice_list(obj, properties, False)
+                elif option.type() == 'float':
+                    kwargs['type'] = float
                 else:
                     pass
             actions.setdefault(option.name(), []).append(kwargs)