bump version, merge branch 'devel'

Author: casperdcl

argopt/_argopt.py

@@ -17,12 +17,12 @@
 
 
 RE_ARG_ONCE = re.compile(r"(?<!Optional\(|neOrMore\()"
-                         "Argument\('(<\S+?>)', (\S+?), (\S+?)\)")
+                         "Argument\('(\S+?)', (\S+?), (\S+?)\)")
 RE_ARG_STAR = re.compile(r"Optional\(OneOrMore\(Argument\("
-                         "'(<\S+?>)', (\S+?), (\S+?)\)\)\)")
+                         "'(\S+?)', (\S+?), (\S+?)\)\)\)")
 RE_ARG_PLUS = re.compile(r"(?<!Optional\()"
-                         "OneOrMore\(Argument\('(<\S+?>)', (\S+?), (\S+?)\)\)")
-RE_ARG_QEST = re.compile(r"Optional\(Argument\('(<\S+?>)', (\S+?), (\S+?)\)\)")
+                         "OneOrMore\(Argument\('(\S+?)', (\S+?), (\S+?)\)\)")
+RE_ARG_QEST = re.compile(r"Optional\(Argument\('(\S+?)', (\S+?), (\S+?)\)\)")
 
 
 def findall_args(re, pattern):
@@ -159,9 +159,8 @@ def argopt(doc='', argparser=ArgumentParser,
     pu = printable_usage(doc)
     log.log(logLevel, doc[:doc.find(pu)])
     args, opts = docopt_parser(doc,
-                               log=max(logLevel - 10, logging.NOTSET),
+                               logLevel=max(logLevel - 10, logging.NOTSET),
                                **_kwargs)
-
     _kwargs.setdefault("prog", pu.split()[1])
     _kwargs.setdefault("description", doc[:doc.find(pu)])
     # epilogue
@@ -188,10 +187,7 @@ def argopt(doc='', argparser=ArgumentParser,
             k['type'] = a.type
         if a.value is not None:
             k['default'] = a.value
-        parser.add_argument(a.name[1:-1],  # strip out encompassing '<>'
-                            nargs=a.nargs,
-                            help=a.desc,
-                            **k)
+        parser.add_argument(a.name_stripped, nargs=a.nargs, help=a.desc, **k)
     for o in opts:
         log.log(logLevel, "o:%r" % o)
         if o.name in ('-h', '--help'):

argopt/_docopt.py

@@ -170,6 +170,11 @@ def parse(class_, argument_description):
         value = matched[0] if matched else None
         return class_(name, value, description)
 
+    @property
+    def name_stripped(self):
+        return self.name[1:-1] \
+            if self.name[0] == '<' and self.name[-1] == '>' else self.name
+
 
 class Command(Argument):
     def __init__(self, name, value=False):
@@ -444,13 +449,36 @@ def parse_atom(tokens, options):
         return [Command(tokens.move())]
 
 
+def get_indent(doc, optargs=False):
+    """Returns indent level for options/arguments"""
+    if optargs:  # just Options and Arguments sections
+        try:
+            lines = printable_usage(doc, "arguments").split('\n')
+        except DocoptLanguageError:
+            lines = []
+        try:
+            lines += printable_usage(doc, "options").split('\n')
+        except DocoptLanguageError:
+            pass
+    else:
+        lines = doc.split('\n')
+    indents = [len(l) - len(l.lstrip()) for l in lines]
+    return ' ' * (min([i for i in indents if i]) if indents else 0)
+
+
 def parse_defaults(doc):
     # in python < 2.7 you can't pass flags=re.MULTILINE
-    split = re.split('\n *(<\S+?>|-\S+?)', doc)[1:]
+    ind = get_indent(doc, optargs=True)
+    if not ind:
+        return [], []
+    #split = re.split('\n (<\S+?>|-\S+?)', doc)[1:]
+    split = re.split('\n' + ind + '(<\S+?>|[A-Z0-9_]+|-\S+)', doc)[1:]
+    #print ">>>>>", split, "<<<<<<"
+    # strip next sections from descriptions
     split = [s1 + s2.split('\n\n')[0]
              for s1, s2 in zip(split[::2], split[1::2])]
     options = [Option.parse(s) for s in split if s.startswith('-')]
-    arguments = [Argument.parse(s) for s in split if s.startswith('<')]
+    arguments = [Argument.parse(s) for s in split if not s.startswith('-')]
     return options, arguments
 
 

argopt/_version.py

@@ -12,7 +12,7 @@
 __all__ = ["__version__"]
 
 # major, minor, patch, -extra
-version_info = 0, 4, 0
+version_info = 0, 5, 0
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))

argopt/tests/tests_argopt.py

@@ -15,7 +15,7 @@ def test_basic():
     args = docopt(__doc__)
 
 Usage:
-    test.py [-h | options] <x> [<y>...]
+    test.py [-h | options] <x> Y [<z>...]
 
 Arguments:
     <x>                   A file.
@@ -38,7 +38,8 @@ def test_basic():
     args = docopt(__doc__)''' in res)
         assert (i in res for i in '''positional arguments:
   x                    A file.
-  y
+  Y
+  z
 
 optional arguments:
   -h, --help           show this help message and exit
@@ -57,7 +58,8 @@ def test_basic():
         assert (args.x == 'such')
     except AssertionError as e:
         raise AssertionError("x:" + str(args.x) + str(e))
-    assert (args.y == 'test much is'.split())
+    assert (args.Y == 'test')
+    assert (args.z == 'much is'.split())
     try:
         parser.parse_args(args=['-v'])
     except SystemExit as e:

setup.py

@@ -180,7 +180,7 @@ def execute_makefile_commands(commands, alias, verbose=False):
     bugtrack_url='https://github.com/casperdcl/argopt/issues',
     platforms=['any'],
     packages=['argopt'],
-    install_requires=['argparse'],
+    install_requires=['argparse'] if sys.version_info[:2] < (2, 7) else [],
     package_data={'': ['LICENCE']},
     classifiers=[
         # Trove classifiers

tox.ini

@@ -39,7 +39,12 @@ deps = {[extra]deps}
 commands = {[extra]commands}
 
 [testenv:py26]
-deps = {[coverage]deps}
+deps =
+    {[core]deps}
+    coverage
+    coveralls==1.2.0
+    pycparser==2.18
+    idna==2.7
 commands = {[coverage]commands}
 
 [testenv:flake8]