cli2 2.7.0__tar.gz → 2.7.2__tar.gz

{cli2-2.7.0/cli2.egg-info → cli2-2.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cli2
-Version: 2.7.0
+Version: 2.7.2
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-2.7.0 → cli2-2.7.2}/cli2/command.py

@@ -18,10 +18,11 @@ class Command(EntryPoint, dict):
         return super().__new__(cls, *args, **kwargs)
 
     def __init__(self, target, name=None, color=None, doc=None, posix=False,
-                 outfile=None, log=True):
+                 help_hack=True, outfile=None, log=True):
         self.target = target
         self.posix = posix
         self.parent = None
+        self.help_hack = help_hack
 
         overrides = getattr(target, 'cli2', {})
         for key, value in overrides.items():
@@ -153,27 +154,28 @@ class Command(EntryPoint, dict):
 
     def __call__(self, *argv):
         """Execute command with args from sysargs."""
+        if self.help_hack and '--help' in argv:
+            self.exit_code = 1
+            return self.help()
+
         self.exit_code = 0
         error = self.parse(*argv)
         if error:
             self.exit_code = 1
             return self.help(error=error)
 
-        required = [
-            arg
-            for arg in self.values()
-            if arg.default == inspect._empty
-            and arg.param.name not in self.bound.kwargs
-            and arg.param.kind not in (
-                arg.param.VAR_KEYWORD,
-                arg.param.VAR_POSITIONAL,
+        missing = [
+            name
+            for name, arg in self.items()
+            if name not in self.bound.arguments
+            and name not in self.bound.kwargs
+            and arg.param.default == arg.param.empty
+            and arg.param.kind in (
+                arg.param.POSITIONAL_ONLY,
+                arg.param.POSITIONAL_OR_KEYWORD,
             )
         ]
-        if len(self.bound.args) < len(required):
-            missing = [
-                arg.param.name
-                for arg in required[len(self.bound.args):]
-            ]
+        if missing:
             error = (
                 f'missing {len(missing)} required argument'
                 f'{"s" if len(missing) > 1 else ""}'
@@ -187,6 +189,8 @@ class Command(EntryPoint, dict):
             if inspect.iscoroutine(result):
                 result = asyncio.run(result)
         except TypeError as exc:
+            # keeping this as fallback for now, in case the above missing
+            # detection doesn't work
             self.exit_code = 1
             if hasattr(self.target, '__name__'):
                 rep = getattr(self.target, '__name__')

{cli2-2.7.0 → cli2-2.7.2}/cli2/test_command.py

@@ -499,10 +499,25 @@ def test_arg_reorder():
 
 
 def test_arg():
-    class TestCommand(Command):
-        def call(self, *args, **kwargs):
-            return (args, kwargs)
-
-    cmd = TestCommand(lambda foo: True)
+    cmd = Command(lambda foo: foo)
     cmd.arg('bar', position=0)
     assert list(cmd.keys()) == ['bar', 'foo']
+    assert cmd('bar', 'foo') == 'foo'
+    assert cmd['bar'].value == 'bar'
+
+
+def test_helphack():
+    class TestCommand(Command):
+        def help(self):
+            self.help_shown = True
+
+    def foo(*one): return one
+    cmd = TestCommand(foo)
+    cmd('a', 'b', '--help')
+    assert cmd.exit_code == 1
+    assert getattr(cmd, 'help_shown', False)
+
+    cmd = TestCommand(foo, help_hack=False)
+    cmd('a', 'b', '--help')
+    assert cmd.exit_code == 0
+    assert not getattr(cmd, 'help_shown', False)

{cli2-2.7.0 → cli2-2.7.2/cli2.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cli2
-Version: 2.7.0
+Version: 2.7.2
 Summary: image:: https://yourlabs.io/oss/cli2/badges/master/pipeline.svg
 Home-page: https://yourlabs.io/oss/cli2
 Author: James Pic

{cli2-2.7.0 → cli2-2.7.2}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='2.7.0',
+    version='2.7.2',
     setup_requires='setupmeta',
     install_requires=['docstring_parser'],
     extras_require=dict(