cli2 3.3.41__tar.gz → 3.3.44__tar.gz

{cli2-3.3.41/cli2.egg-info → cli2-3.3.44}/PKG-INFO

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

{cli2-3.3.41 → cli2-3.3.44}/cli2/command.py

@@ -1,6 +1,5 @@
 import asyncio
 import inspect
-import sys
 
 from docstring_parser import parse
 
@@ -278,7 +277,14 @@ class Command(EntryPoint, dict):
             return self.help()
 
         if self.async_mode():
-            return asyncio.run(self.async_call(*argv))
+            try:
+                return asyncio.run(self.async_call(*argv))
+            except KeyboardInterrupt:
+                print('exiting cleanly...')
+                self.exit_code = 1
+                return
+            finally:
+                self.post_result = asyncio.run(async_resolve(self.post_call()))
 
         error = self.parse(*argv)
         if error:
@@ -296,12 +302,12 @@ class Command(EntryPoint, dict):
                 for _ in result:
                     display.print(_)
                 result = None
+            return result
         except KeyboardInterrupt:
-            print('exiting')
-            sys.exit(1)
+            print('exiting cleanly...')
+            self.exit_code = 1
         finally:
             self.post_result = self.post_call()
-        return result
 
     async def async_call(self, *argv):
         """ Call with async stuff in single event loop """
@@ -324,15 +330,8 @@ class Command(EntryPoint, dict):
             for _, arg in enumerate(factories):
                 arg.value = results[_]
 
-        try:
-            result = self.call(*self.bound.args, **self.bound.kwargs)
-            result = await async_resolve(result, output=True)
-        except KeyboardInterrupt:
-            print('exiting')
-            sys.exit(1)
-        finally:
-            self.post_result = await async_resolve(self.post_call())
-        return result
+        result = self.call(*self.bound.args, **self.bound.kwargs)
+        return await async_resolve(result, output=True)
 
     def ordered(self, factories=False):
         """

{cli2-3.3.41 → cli2-3.3.44}/cli2/group.py

@@ -195,19 +195,29 @@ class Group(EntryPoint, dict):
         for name, method in cls.__dict__.items():
             if leaf and getattr(final, name, '_') is None:
                 continue
-            wrapped_method = getattr(method, '__func__', None)
-            cfg = getattr(
-                wrapped_method,
-                'cli2',
-                getattr(method, 'cli2', None),
-            )
-            if cfg is None:
-                continue
-            condition = cfg.get('condition', None)
-            if condition:
-                if not condition(final):
-                    continue
-            self.cmd(method)
+            self.load_method(final, method)
+
+    def load_obj(self, obj):
+        """
+        Load all methods which have been decorated with @cmd
+        """
+        for name in dir(obj):
+            self.load_method(obj, getattr(obj, name))
+
+    def load_method(self, obj, method):
+        wrapped_method = getattr(method, '__func__', None)
+        cfg = getattr(
+            wrapped_method,
+            'cli2',
+            getattr(method, 'cli2', None),
+        )
+        if cfg is None:
+            return
+        condition = cfg.get('condition', None)
+        if condition:
+            if not condition(obj):
+                return
+        self.cmd(method)
 
     def __call__(self, *argv):
         self.exit_code = 0

{cli2-3.3.41 → cli2-3.3.44}/cli2/logging.py

@@ -22,6 +22,10 @@ class YAMLFormatter:
 
 def configure():
     LOG_LEVEL = os.getenv('LOG_LEVEL', 'WARNING').upper()
+
+    if os.getenv('DEBUG'):
+        LOG_LEVEL = 'DEBUG'
+
     timestamper = structlog.processors.TimeStamper(fmt='%Y-%m-%d %H:%M:%S')
     pre_chain = [
         # add log level and timestamp to event_dict

{cli2-3.3.41 → cli2-3.3.44}/cli2/test_command.py

@@ -1,3 +1,4 @@
+import asyncio
 import inspect
 import pytest
 import os
@@ -684,3 +685,29 @@ def test_cli2():
 
     cmd = Command(test)
     assert cmd('x') == ('x', cmd)
+
+
+def test_keyboard_interrupt():
+    def func():
+        raise KeyboardInterrupt()
+
+    cmd = Command(func)
+    cmd()
+    assert cmd.exit_code == 1
+
+
+def test_keyboard_interrupt_async():
+    class YourCommand(Command):
+        async def post_call(self):
+            return 'foo'
+
+    async def foo():
+        raise KeyboardInterrupt()
+
+    async def func():
+        await asyncio.gather(foo())
+
+    cmd = YourCommand(func)
+    cmd()
+    assert cmd.exit_code == 1
+    assert cmd.post_result == 'foo'

{cli2-3.3.41 → cli2-3.3.44}/cli2/test_group.py

@@ -232,9 +232,17 @@ def test_load_cls():
     group.load_cls(Foo)
     assert list(group.keys()) == ['help', 'test', 'test2']
 
+    group = Group()
+    group.load_obj(Foo())
+    assert list(group.keys()) == ['help', 'test', 'test2']
+
     class Child(Foo):
         test2 = None
 
     group = Group()
     group.load_cls(Child)
     assert list(group.keys()) == ['help', 'test']
+
+    group = Group()
+    group.load_obj(Child())
+    assert list(group.keys()) == ['help', 'test']

{cli2-3.3.41 → cli2-3.3.44/cli2.egg-info}/PKG-INFO

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

{cli2-3.3.41 → cli2-3.3.44}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='cli2',
-    version='3.3.41',
+    version='3.3.44',
     setup_requires='setupmeta',
     install_requires=[
         'docstring_parser',