cli2 4.1.0rc17__tar.gz → 4.1.3__tar.gz

cli2-4.1.3/MANIFEST.in

@@ -0,0 +1,2 @@
+include requirements.txt classifiers.txt README.* entry_points.ini LICENSE
+recursive-include cli2 *.yml *.sh *.rst *.html *.css *.js *.py *.po *.mo *.conf *.j2 *.txt

{cli2-4.1.0rc17/cli2.egg-info → cli2-4.1.3}/PKG-INFO

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

{cli2-4.1.0rc17 → cli2-4.1.3}/cli2/cli.py

@@ -1129,7 +1129,7 @@ class Argument:
         # priority to varkwargs for word= and **{}
         last = self.cmd[[*self.cmd.keys()][-1]]
         if last is not self and last.param.kind == self.param.VAR_KEYWORD:
-            if re.match('^-?-?[^=]+=', arg):
+            if re.match('^-?-?[\\w]+=', arg):
                 return
             elif arg.startswith('**{') and arg.endswith('}'):
                 return

{cli2-4.1.0rc17 → cli2-4.1.3}/cli2/client.py

@@ -1086,7 +1086,15 @@ class Handler:
             # httpx session is rendered unusable after a TransportError
             if isinstance(response, httpx.TransportError):
                 await asyncio.sleep(seconds)
-                log.warn('reconnect', error=repr(response))
+                kwargs = dict(error=repr(response))
+                try:
+                    response.request
+                except (RuntimeError, AttributeError):
+                    pass
+                else:
+                    kwargs['method'] = response.request.method
+                    kwargs['url'] = str(response.request.url)
+                log.warn('reconnect', **kwargs)
                 await client.client_reset()
             return
 

{cli2-4.1.0rc17 → cli2-4.1.3/cli2.egg-info}/PKG-INFO

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

cli2-4.1.3/setup.py

@@ -0,0 +1,90 @@
+from setuptools import setup
+
+# We're not having that for the moment
+# from setuptools.command.install import install
+# from setuptools.command.develop import develop
+# from pathlib import Path
+# import os
+# import shutil
+# import sys
+#
+#
+# class CollectionInstaller:
+#     @property
+#     def collection_target(self):
+#         target = Path(os.getenv('HOME'))
+#         target /= '.ansible/collections/ansible_collections/yourlabs/cli2'
+#         return target
+#
+#
+# class Develop(CollectionInstaller, develop):
+#     def run(self):
+#         super().run()
+#
+#         source = Path(self.egg_path) / 'cli2/ansible/collection'
+#         if self.collection_target.exists():
+#             if self.collection_target.is_symlink():
+#                 if self.collection_target.resolve() == source:
+#                     return
+#             elif self.collection_target.is_dir():
+#                 shutil.rmtree(self.collection_target)
+#
+#         self.collection_target.parent.mkdir(exist_ok=True, parents=True)
+#         self.collection_target.symlink_to(source)
+#
+#
+# class Install(CollectionInstaller, install):
+#     def run(self):
+#         super().run()
+#
+#         self.collection_target.parent.mkdir(exist_ok=True, parents=True)
+#         source = Path(self.install_lib) / 'cli2/ansible/collection'
+#         shutil.copytree(source, self.collection_target, dirs_exist_ok=True)
+
+
+setup(
+    name='cli2',
+    version='4.1.3',
+    setup_requires='setupmeta',
+    packages=['cli2'],
+    install_requires=[
+        'docstring_parser',
+        'pyyaml',
+        'pygments',
+        'structlog',
+    ],
+    extras_require=dict(
+        client=[
+            'httpx',
+            'truststore',
+        ],
+        test=[
+            'freezegun',
+            'pytest',
+            'pytest-cov',
+            'pytest-mock',
+            'pytest-asyncio',
+            'pytest-httpx',
+        ],
+    ),
+    author='James Pic',
+    author_email='jamespic@gmail.com',
+    url='https://yourlabs.io/oss/cli2',
+    include_package_data=True,
+    license='MIT',
+    keywords='cli',
+    python_requires='>=3.6',
+    entry_points={
+        'console_scripts': [
+            'cli2 = cli2.cli2:main.entry_point',
+            'cli2-example = cli2.examples.obj:cli.entry_point',
+            'cli2-example2 = cli2.examples.obj2:cli.entry_point',
+            'cli2-example-nesting = cli2.examples.nesting:cli.entry_point',
+            'cli2-example-client = cli2.examples.client:cli.entry_point',
+        ],
+    },
+    # cmdclass={
+    #     'install': Install,
+    #     'develop': Develop,
+    # },
+)

{cli2-4.1.0rc17 → cli2-4.1.3}/tests/test_cli.py

@@ -9,6 +9,8 @@ def test_call():
     result = main('cli2.examples.test.example_function', 'x', 'y=z')
     assert "args=('x',)" in result
     assert "kwargs={'y': 'z'}" in result
+    result = main('cli2.examples.test.example_function', 'http://?x=bar')
+    assert "args=('http://?x=bar',)" in result
 
 
 def test_doc_by_default(mocker):

{cli2-4.1.0rc17 → cli2-4.1.3}/tests/test_client.py

@@ -299,10 +299,14 @@ async def test_handler(client_class):
         await handler(client, response, 1, [], log)
 
     assert not client.client_reset.await_count
-    result = await handler(client, httpx.TransportError('foo'), 0, [], log)
+    exc = httpx.TransportError('foo')
+    exc.request = response.request
+    result = await handler(client, exc, 0, [], log)
     log.warn.assert_called_once_with(
         'reconnect',
         error="TransportError('foo')",
+        method='POST',
+        url='/',
     )
     assert not result
     assert client.client_reset.await_count == 1

{cli2-4.1.0rc17 → cli2-4.1.3}/tests/test_command.py

@@ -108,12 +108,12 @@ def test_positional_only_looksahead():
         return (one, two)
     cmd = cli2.Command(foo)
 
-    cmd.parse('y.-7=e', 'three=z', 'x', 'y')
+    cmd.parse('z=w', 'three=z', 'x', 'y')
     assert cmd['one'].value == 'x'
     assert cmd['two'].value == ['y']
     assert cmd['three'].value == 'z'
     # make sure it takes weird keywords too
-    assert cmd['kwargs'].value['y.-7'] == 'e'
+    assert cmd['kwargs'].value['z'] == 'w'
 
 
 def test_keyword_only():

{cli2-4.1.0rc17 → cli2-4.1.3}/tests/test_restful.py

@@ -40,7 +40,7 @@ async def test_create(httpx_mock):
             capacity='5',
         )
     )
-    assert module.result['json']['id'] == 1
+    assert module.result['data']['id'] == 1
 
 
 @pytest.mark.asyncio
@@ -68,7 +68,7 @@ async def test_update(httpx_mock):
         )
     )
     assert not module.result['changed']
-    assert module.result['json']['id'] == 1
+    assert module.result['data']['id'] == 1
 
     # testing for update
     httpx_mock.add_response(
@@ -91,5 +91,5 @@ async def test_update(httpx_mock):
             price='6',
         )
     )
-    assert module.result['json']['id'] == 1
+    assert module.result['data']['id'] == 1
     assert module.result['changed']

cli2-4.1.0rc17/MANIFEST.in

@@ -1,2 +0,0 @@
-include requirements.txt classifiers.txt README.* entry_points.ini LICENSE
-recursive-include *.yml *.sh *.rst *.html *.css *.js *.py *.po *.mo *.conf *.j2 *.txt

cli2-4.1.0rc17/setup.py

@@ -1,44 +0,0 @@
-from setuptools import setup
-
-
-setup(
-    name='cli2',
-    version='4.1.0rc17',
-    setup_requires='setupmeta',
-    install_requires=[
-        'docstring_parser',
-        'pyyaml',
-        'pygments',
-        'structlog',
-    ],
-    extras_require=dict(
-        client=[
-            'httpx',
-            'truststore',
-        ],
-        test=[
-            'freezegun',
-            'pytest',
-            'pytest-cov',
-            'pytest-mock',
-            'pytest-asyncio',
-            'pytest-httpx',
-        ],
-    ),
-    author='James Pic',
-    author_email='jamespic@gmail.com',
-    url='https://yourlabs.io/oss/cli2',
-    include_package_data=True,
-    license='MIT',
-    keywords='cli',
-    python_requires='>=3.6',
-    entry_points={
-        'console_scripts': [
-            'cli2 = cli2.cli2:main.entry_point',
-            'cli2-example = cli2.examples.obj:cli.entry_point',
-            'cli2-example2 = cli2.examples.obj2:cli.entry_point',
-            'cli2-example-nesting = cli2.examples.nesting:cli.entry_point',
-            'cli2-example-client = cli2.examples.client:cli.entry_point',
-        ],
-    },
-)