cli2 3.3.34__tar.gz → 3.3.36__tar.gz

{cli2-3.3.34/cli2.egg-info → cli2-3.3.36}/PKG-INFO

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

{cli2-3.3.34 → cli2-3.3.36}/cli2/client.py

@@ -715,7 +715,9 @@ class ModelMetaclass(type):
             client_class.models.append(cls)
             client_cli = getattr(client_class, 'cli', None)
             if client_cli:
-                cls.cli = client_cli[cls.__name__.lower()] = ModelGroup(cls)
+                group = ModelGroup(cls)
+                if len(group) > 1:
+                    cls.cli = client_cli[cls.__name__.lower()] = group
 
         cls._fields = dict()
 

{cli2-3.3.34 → cli2-3.3.36}/cli2/group.py

@@ -188,11 +188,13 @@ class Group(EntryPoint, dict):
 
             @cli2.cmd(condition=lambda cls: cls.url_list)
         """
-        leaf = leaf if leaf else cls
+        final = leaf if leaf else cls
         for base in cls.__bases__:
-            self.load_cls(base, leaf=leaf)
+            self.load_cls(base, leaf=final)
 
         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,
@@ -203,7 +205,7 @@ class Group(EntryPoint, dict):
                 continue
             condition = cfg.get('condition', None)
             if condition:
-                if not condition(leaf):
+                if not condition(final):
                     continue
             self.cmd(method)
 

{cli2-3.3.34 → cli2-3.3.36}/cli2/test_client.py

@@ -51,6 +51,18 @@ async def test_client_cli(client_class, httpx_mock):
     httpx_mock.add_response(url='http://lol/', json=[dict(a=1)])
     await client_class.cli['testmodel']['find'].async_call()
 
+    class TestModel2(client_class.Model):
+        pass
+
+    assert 'testmodel2' not in client_class.cli
+
+    class TestModel3(client_class.Model):
+        @cli2.cmd
+        def find():
+            pass
+
+    assert list(client_class.cli['testmodel3'].keys()) == ['help', 'find']
+
 
 @pytest.mark.asyncio
 async def test_client_cli_override(client_class, httpx_mock):
@@ -77,6 +89,11 @@ async def test_client_cli_override(client_class, httpx_mock):
     assert await Client.cli['testmodel2']['find'].async_call() == 'foo'
     assert 'get' not in Client.cli['testmodel2']
 
+    class TestModel3(Client.Model):
+        url_list = '{client.test}/foo'
+        create = None
+    assert 'create' not in Client.cli['testmodel3']
+
 
 def test_client_model(client_class):
     assert issubclass(client_class.Model, cli2.Model)

{cli2-3.3.34 → cli2-3.3.36}/cli2/test_group.py

@@ -230,7 +230,11 @@ def test_load_cls():
             pass
     group = Group()
     group.load_cls(Foo)
-    assert 'bar' not in group
-    assert 'test' in group
-    assert 'test2' in group
-    assert 'exclude' not in group
+    assert list(group.keys()) == ['help', 'test', 'test2']
+
+    class Child(Foo):
+        test2 = None
+
+    group = Group()
+    group.load_cls(Child)
+    assert list(group.keys()) == ['help', 'test']

{cli2-3.3.34 → cli2-3.3.36/cli2.egg-info}/PKG-INFO

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

{cli2-3.3.34 → cli2-3.3.36}/setup.py

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