WIP: use new customized parser instead of argparse

.travis.yml

@@ -1,8 +1,8 @@
 language: python
 python:
-  - 2.6
   - 2.7
   - 3.5
+  - 3.6
 # command to install dependencies
 before_install:
   - pip install -r src/test-requirements.txt
@@ -11,6 +11,8 @@ install:
   - cd src
   - python setup.py install
 # command to run tests
-script: py.test cmdtree --cov=cmdtree
+script:
+  - make test
+  - make flake8
 after_success:
   - coveralls

doc/ParserFlow.md

@@ -0,0 +1,15 @@
+
+## Error Type
+
++ No such command
++ Argument Required
++ Invalid Argument Type
+
+```
+cmd_path = get_cmd_path()
+parser = get_parser(cmd_path)
+find command (argv, cmd_path)->
+    validate argument-length
+    find command(child_cmd_path, argv[command_2:])
+
+```

src/.flake8

@@ -0,0 +1,2 @@
+[flake8]
+max-line-length = 120

src/Makefile

@@ -8,7 +8,10 @@ clean:
 	rm -fr ./dist ./build ./cmdtree.egg-info ./.cache
 
 test:
-	py.test --cov=cmdtree --cov-report=term-missing cmdtree
-
+	py.test tests --cov=cmdtree --cov-report=term-missing cmdtree
+flake8:
+	flake8 cmdtree
+	flake8 tests
+	flake8 examples
 develop:
 	python setup.py develop

src/cmdtree/__init__.py

@@ -1,4 +1,3 @@
-from cmdtree.parser import AParser
 from cmdtree.registry import env
 from cmdtree.shortcuts import (
     argument,
@@ -20,6 +19,20 @@
 )
 
 # globals and entry point
-env.parser = AParser()
 entry = env.entry
 
+__all__ = (
+    "argument",
+    "option",
+    "command",
+    "group",
+    "STRING",
+    "INT",
+    "FLOAT",
+    "BOOL",
+    "UUID",
+    "Choices",
+    "IntRange",
+    "File",
+    "entry",
+)

src/cmdtree/_compat.py

@@ -7,10 +7,11 @@
 def get_filesystem_encoding():
     return sys.getfilesystemencoding() or sys.getdefaultencoding()
 
+
 if WIN:
     def _get_argv_encoding():
         import locale
         return locale.getpreferredencoding()
 else:
     def _get_argv_encoding():
-        return getattr(sys.stdin, 'encoding', None) or get_filesystem_encoding()
+        return getattr(sys.stdin, 'encoding', None) or get_filesystem_encoding()

src/cmdtree/constants.py

@@ -0,0 +1 @@
+ROOT_NODE_NAME = "root"

src/cmdtree/decorators.py

@@ -0,0 +1,23 @@
+from functools import wraps
+
+from cmdtree import echo
+from cmdtree.exceptions import ParserError
+from cmdtree.format import format_node_help
+
+
+def format_error(func):
+
+    @wraps(func)
+    def wrapped(*args, **kwargs):
+        try:
+            return func(*args, **kwargs)
+        except ParserError as e:
+            assert hasattr(args[0], "tree")
+            node_dict = args[0].tree.get_node_by_path(
+                e.node.cmd_path
+            )
+            node_help = format_node_help(node_dict)
+            echo.error("Error: %s" % str(e.format_error(node_help)))
+            exit(1)
+
+    return wrapped

src/cmdtree/echo.py

@@ -0,0 +1,6 @@
+import sys
+
+
+def error(error_msg):
+    sys.stderr.write(error_msg)
+    sys.stderr.write("\n")

src/cmdtree/exceptions.py

@@ -1,2 +1,70 @@
-class ArgumentParseError(ValueError):
-    pass
+
+class ParserError(ValueError):
+    DEFAULT_TPL = (
+        "{error}\n\n"
+        "{cmd_ref}"
+        "{help}"
+        "{sub_cmd_help}"
+    )
+
+    def __init__(self, *args, **kwargs):
+        super(ParserError, self).__init__(*args)
+        self.node = kwargs.pop("node", None)
+
+    def format_error(self, sub_cmd_help=None):
+        cmd_ref = "Help message for '{name}':\n\n"
+        node_help = ""
+        _cmd_ref = ""
+        if sub_cmd_help is not None:
+            sub_cmd_help = sub_cmd_help + "\n"
+        else:
+            sub_cmd_help = ""
+        if self.node is not None:
+            node_help = self.node.format_help()
+            if node_help:
+                node_help += "\n\n"
+            _cmd_ref = cmd_ref.format(
+                name=self.node.name
+            )
+        return self.DEFAULT_TPL.format(
+            error=str(self),
+            cmd_ref=_cmd_ref,
+            sub_cmd_help=sub_cmd_help,
+            help=node_help,
+        )
+
+
+class DevelopmentError(ValueError):
+    pass
+
+
+class ArgumentRepeatedRegister(DevelopmentError):
+    pass
+
+
+class ArgumentTypeError(DevelopmentError):
+    pass
+
+
+class CmdRepeatedRegister(DevelopmentError):
+    pass
+
+
+class NodeDoesExist(DevelopmentError):
+    pass
+
+
+class NoSuchCommand(ParserError):
+    pass
+
+
+class InvalidCommand(ParserError):
+    pass
+
+
+class ArgumentError(ParserError):
+    pass
+
+
+class OptionError(ParserError):
+    pass

src/cmdtree/format.py

@@ -0,0 +1,88 @@
+from cmdtree.templates import E_NO_CMD_GIVEN_TPL
+
+try:
+    from textwrap import indent
+except ImportError:
+    import textwrap
+
+    def indent(text, indent_with):
+        wrapper = textwrap.TextWrapper(
+            initial_indent=indent_with,
+            subsequent_indent=indent_with
+        )
+        return wrapper.fill(text)
+
+
+INDENT_1 = " " * 4
+
+
+def _format_arg_help(argument):
+    """
+    :type argument: cmdtree.parser.Argument
+    """
+    tpl = "{name}: {help}"
+    _help = argument.help
+    if argument.help is None:
+        _help = "argument"
+    return tpl.format(
+        name=argument.name,
+        help=_help,
+    )
+
+
+def _format_cmd_help(cmd_node):
+    tpl = "{name}: {help}"
+    _help = cmd_node.help
+    if cmd_node.help is None:
+        _help = cmd_node.name
+    return tpl.format(
+        name=cmd_node.name,
+        help=_help,
+    )
+
+
+def _format_cmd_choice(parent_name, cmd_node_list):
+    help_msg = "\n".join(
+        _format_cmd_help(ele)
+        for ele in cmd_node_list
+    )
+    return E_NO_CMD_GIVEN_TPL.format(
+        name=parent_name,
+        cmds=indent(help_msg, INDENT_1)
+    )
+
+
+def format_node_help(tree_node):
+    """
+    :type tree_node: dict
+    """
+    node = tree_node
+    _help = ""
+    if not node['cmd'].callable():
+        if node['cmd'].help is not None:
+            _help += node['cmd'].help
+        cmds = tuple(
+            value['cmd']
+            for value in node['children'].values()
+        )
+        if len(cmds) >= 0:
+            _help += _format_cmd_choice(node['name'], cmds)
+    return _help if len(_help) > 0 else None
+
+
+def format_arg_help(title, arguments):
+    """
+    :type arguments: iterable[cmdtree.parser.Argument]
+    :type title: str
+    """
+    if len(arguments) == 0:
+        return
+    details = tuple(
+        _format_arg_help(arg)
+        for arg in arguments
+    )
+    details = indent("\n".join(details), INDENT_1)
+    return (
+        "{title}\n"
+        "{details}"
+    ).format(title=title, details=details)