cli2 4.0.11__tar.gz → 4.0.13__tar.gz

{cli2-4.0.11/cli2.egg-info → cli2-4.0.13}/PKG-INFO

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

{cli2-4.0.11 → cli2-4.0.13}/cli2/__init__.py

@@ -9,7 +9,7 @@ from .cli import (
     Group,
     EntryPoint,
 )
-from .asyncio import async_resolve
+from .asyncio import async_resolve, async_run
 from .colors import colors as c
 
 from .configuration import Configuration, cfg

{cli2-4.0.11 → cli2-4.0.13}/cli2/asyncio.py

@@ -1,3 +1,4 @@
+import asyncio
 import inspect
 from . import display
 
@@ -25,3 +26,17 @@ async def async_resolve(result, output=False):
                 results.append(await async_resolve(_))
         return None if output else results
     return result
+
+
+def async_run(coroutine):
+    """
+    Run an async coroutineutine, in running loop or new loop.
+
+    :param coroutine: The return value of an async function call.
+    """
+    try:
+        loop = asyncio.get_running_loop()
+    except RuntimeError:
+        return asyncio.run(coroutine)
+    else:
+        return loop.create_task(coroutine)

{cli2-4.0.11 → cli2-4.0.13}/cli2/cli.py

@@ -1161,6 +1161,9 @@ class Argument:
         command object.
 
         If the factory function takes an `arg` argument, it will pass self.
+
+        It will forward any argument to the factory function if detected in
+        it's signature.
         """
         kwargs = dict()
         sig = inspect.signature(self.factory)
@@ -1168,4 +1171,7 @@ class Argument:
             kwargs['cmd'] = self.cmd
         if 'arg' in sig.parameters:
             kwargs['arg'] = self
+        for key, arg in self.cmd.items():
+            if key in sig.parameters:
+                kwargs[key] = arg.value
         return self.factory(**kwargs)

{cli2-4.0.11 → cli2-4.0.13/cli2.egg-info}/PKG-INFO

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

{cli2-4.0.11 → cli2-4.0.13}/cli2.egg-info/SOURCES.txt

@@ -39,6 +39,7 @@ cli2/examples/obj2.py
 cli2/examples/test.py
 tests/test_ansible.py
 tests/test_ansible_variables.py
+tests/test_asyncio.py
 tests/test_cli.py
 tests/test_client.py
 tests/test_command.py

{cli2-4.0.11 → cli2-4.0.13}/setup.py

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

cli2-4.0.13/tests/test_asyncio.py

@@ -0,0 +1,18 @@
+import asyncio
+import cli2
+import pytest
+
+
+def test_async_run_noloop():
+    async def task():
+        await asyncio.sleep(.01)
+
+    cli2.async_run(task())
+
+
+@pytest.mark.asyncio
+async def test_async_run_loop():
+    async def task():
+        await asyncio.sleep(.01)
+
+    cli2.async_run(task())

{cli2-4.0.11 → cli2-4.0.13}/tests/test_command.py

@@ -707,3 +707,15 @@ def test_keyboard_interrupt_async():
     cmd()
     assert cmd.exit_code == 1
     assert cmd.post_result == 'foo'
+
+
+def test_factory_value_args():
+    def myfactory(foo):
+        return foo
+
+    @cli2.arg('bar', factory=myfactory)
+    def mycmd(foo, bar):
+        return foo
+
+    cmd = cli2.Command(mycmd)
+    assert cmd('a') == 'a'