feat: sub-command with a root context function

.gitignore

@@ -46,3 +46,4 @@ Icon*
 .settings
 .idea/
 .local/
+*.log

arger/decorator.py

@@ -57,7 +57,7 @@ def run(self, *args) -> Any:
         # populate sub-parsers
         _add_parsers(self, self._command)
 
-        kwargs = vars(self.parse_args(args))  # type: Dict[str, Any]
+        kwargs = vars(self.parse_args(args or None))  # type: Dict[str, Any]
 
         return self._command.run(**kwargs)
 

arger/structs.py

@@ -75,8 +75,21 @@ def is_valid(self) -> bool:
         return bool(self._fn or len(self._sub))
 
     def run(self, command: Optional[str] = None, **kwargs):
-        fn = self._sub[command] if command else self
-        return fn(**kwargs)
+        args = set()
+        for k in self.args:
+            if 'dest' in k[1]:
+                args.add(k[1]['dest'])
+            else:
+                args.add(k[0][0])
+        root_kwargs = {k: v for k, v in kwargs.items() if k in args}
+        cmd_kwargs = {k: v for k, v in kwargs.items() if k not in args}
+
+        results = OrderedDict()
+        if root_kwargs and self.name:
+            results[self.name] = self(**root_kwargs)
+        if command:
+            results[command] = self._sub[command](**cmd_kwargs)
+        return results
 
     def __call__(self, *args, **kwargs):
         if self._fn:

arger/typing_utils.py

@@ -1,3 +1,4 @@
+# pylint: disable = W0212
 import sys
 
 
@@ -6,7 +7,7 @@
 
 def _origin(tp):
     """Return x.__origin__ or type(x) based on the Python version."""
-    if hasattr(tp, '_gorg'):
+    if hasattr(tp, "_gorg"):
         return tp._gorg
     if getattr(tp, "__origin__", None) is not None:
         return tp.__origin__

pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 
 name = "arger"
-version = "0.1.3"
+version = "0.1.5"
 description = "Create argparser automatically from functions"
 
 license = "MIT"

pytest.ini

@@ -8,7 +8,7 @@ testpaths = tests
 addopts =
     --strict
     --pdbcls=tests:Debugger
-    --doctest-modules
+;    --doctest-modules
     -r sxX
     --no-cov-on-fail
     -s

tasks.py

@@ -1,14 +1,53 @@
 from arger import Arger
-import sh
+from delegator import run
 
 arger = Arger(description="Common set of tasks to run")
 
 
+class Color:
+    HEADER = '\033[95m'
+    OKBLUE = '\033[94m'
+    OKGREEN = '\033[92m'
+    WARNING = '\033[93m'
+    FAIL = '\033[91m'
+    BOLD = '\033[1m'
+    UNDERLINE = '\033[4m'
+
+    # reset
+    END = '\033[0m'
+
+
+def prun(*cmd, **kwargs):
+    cmd = " ".join(cmd)
+    print(f'{Color.OKGREEN} $ {cmd}{Color.END}')
+    c = run(cmd, **kwargs)
+    print(c.out)
+    print(c.err)
+    return c
+
+
 @arger.add_cmd
 def release(type: str):
     """Bump version, tag and push them.
 
     # todo: create an Enum
     :param type: one of patch, minor, major, prepatch, preminor, premajor, prerelease. as supported by poetry version
     """
-    version = sh()
+    prun('poetry', 'version', type)
+    c = prun('poetry', 'version')
+    _, version = c.out.split()
+    prun('git status')
+    msg = 'chore: bump version'
+
+    answer = input(f'{msg}\nAdd to commit: [Y/n]?')
+    if answer.lower() in {'no', 'n'}:
+        return
+    prun('git add .')
+    prun(f'git commit -m {msg}')
+    prun(f'git tag v{version}')
+    prun('git push')
+    prun('git push --tags')
+
+
+if __name__ == '__main__':
+    arger.run()

tests/examples/3_nested_commands.md

@@ -58,21 +58,30 @@ optional arguments:
 1. ran create
 ```shell script
 $ python 3_nested_commands.py create direcory
+log (<class 'bool'>): False
+log_file (<class 'NoneType'>): None
 name (<class 'str'>): direcory
+verbose (<class 'bool'>): False
 ```
 
 
 1. ran remove
 ```shell script
 $ python 3_nested_commands.py remove direcory
+log (<class 'bool'>): False
+log_file (<class 'NoneType'>): None
 name (<class 'str'>): direcory
+verbose (<class 'bool'>): False
 ```
 
 
 1. ran list
 ```shell script
 $ python 3_nested_commands.py list
 container (<class 'list'>): []
+log (<class 'bool'>): False
+log_file (<class 'NoneType'>): None
+verbose (<class 'bool'>): False
 ```
 
 1. ran combined