wexample-cli 1.0.2__tar.gz → 1.2.0__tar.gz

{wexample_cli-1.0.2 → wexample_cli-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wexample-cli
-Version: 1.0.2
+Version: 1.2.0
 Summary: Reusable CLI primitives — command decorators, options, middlewares, and the enriched command runner — extracted from wex-core so any kernel built on wexample-app can opt in without depending on the full wex framework.
 Author-Email: weeger <contact@wexample.com>
 License: MIT
@@ -10,9 +10,9 @@ Classifier: Operating System :: OS Independent
 Project-URL: homepage, https://github.com/wexample/python-cli
 Requires-Python: >=3.10
 Requires-Dist: attrs>=23.1.0
-Requires-Dist: wexample-app>=18.0.0
-Requires-Dist: wexample-helpers>=16.0.0
-Requires-Dist: wexample-prompt>=13.1.0
+Requires-Dist: wexample-app>=18.1.0
+Requires-Dist: wexample-helpers>=16.2.0
+Requires-Dist: wexample-prompt>=13.2.0
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 
 # cli
 
-Version: 1.0.2
+Version: 1.2.0
 
 Reusable CLI primitives — command decorators, options, middlewares, and the enriched command runner — extracted from wex-core so any kernel built on wexample-app can opt in without depending on the full wex framework.
 
@@ -100,9 +100,9 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 ## Dependencies
 
 - attrs: >=23.1.0
-- wexample-app: >=18.0.0
-- wexample-helpers: >=16.0.0
-- wexample-prompt: >=13.1.0
+- wexample-app: >=18.1.0
+- wexample-helpers: >=16.2.0
+- wexample-prompt: >=13.2.0
 
 ## Versioning & Compatibility Policy
 

{wexample_cli-1.0.2 → wexample_cli-1.2.0}/README.md

@@ -1,6 +1,6 @@
 # cli
 
-Version: 1.0.2
+Version: 1.2.0
 
 Reusable CLI primitives — command decorators, options, middlewares, and the enriched command runner — extracted from wex-core so any kernel built on wexample-app can opt in without depending on the full wex framework.
 
@@ -80,9 +80,9 @@ Visit the [Wexample Suite documentation](https://docs.wexample.com) for the comp
 ## Dependencies
 
 - attrs: >=23.1.0
-- wexample-app: >=18.0.0
-- wexample-helpers: >=16.0.0
-- wexample-prompt: >=13.1.0
+- wexample-app: >=18.1.0
+- wexample-helpers: >=16.2.0
+- wexample-prompt: >=13.2.0
 
 ## Versioning & Compatibility Policy
 

{wexample_cli-1.0.2 → wexample_cli-1.2.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "wexample-cli"
-version = "1.0.2"
+version = "1.2.0"
 description = "Reusable CLI primitives — command decorators, options, middlewares, and the enriched command runner — extracted from wex-core so any kernel built on wexample-app can opt in without depending on the full wex framework."
 authors = [
     { name = "weeger", email = "contact@wexample.com" },
@@ -19,9 +19,9 @@ classifiers = [
 ]
 dependencies = [
     "attrs>=23.1.0",
-    "wexample-app>=18.0.0",
-    "wexample-helpers>=16.0.0",
-    "wexample-prompt>=13.1.0",
+    "wexample-app>=18.1.0",
+    "wexample-helpers>=16.2.0",
+    "wexample-prompt>=13.2.0",
 ]
 
 [project.readme]

{wexample_cli-1.0.2 → wexample_cli-1.2.0}/src/wexample_cli/command/extended_command.py

@@ -38,9 +38,9 @@ class ExtendedCommand(Command):
         middlewares_attributes = self.command_wrapper.middlewares_attributes
         middlewares_registry = self.kernel.get_registry("middlewares")
 
-        for name in middlewares_attributes:
+        for name, attributes in middlewares_attributes.items():
             middleware_class = middlewares_registry.get_class(name)
-            middleware = middleware_class(**middlewares_attributes[name])
+            middleware = middleware_class(**attributes)
             self.command_wrapper.set_middleware(middleware)
 
         # Universal --help / -h handling — render the command's options instead
@@ -85,17 +85,18 @@ class ExtendedCommand(Command):
 
         # Process all declared options
         for option in self.command_wrapper.options:
+            name = option.name
             value = None
 
             # If the option is in parsed args, use that value
-            if option.name in parsed_args:
-                value = parsed_args[option.name]
+            if name in parsed_args:
+                value = parsed_args[name]
             # Otherwise, use the default value if available
             elif option.default is not None:
                 value = option.default
             # If the option is required but not provided, raise an error
             elif option.required:
-                raise CommandOptionMissingException(option_name=option.name)
+                raise CommandOptionMissingException(option_name=name)
 
             # Validate the value if validators are defined and value is not None
             if value is not None and option.validators:
@@ -121,7 +122,7 @@ class ExtendedCommand(Command):
 
             # Assign the validated value
             if value is not None:
-                option.value = function_kwargs[option.name] = value
+                option.value = function_kwargs[name] = value
 
         # `--` passthrough: if the user supplied extra args after `--`, the
         # parser put them in parsed_args["__extra_args__"]. Forward them as
@@ -158,7 +159,7 @@ class ExtendedCommand(Command):
             MIDDLEWARE_OPTION_VALUE_OPTIONAL,
         )
 
-        if len(self.command_wrapper.middlewares) > 0:
+        if self.command_wrapper.middlewares:
             output = MultipleResponse(kernel=self.kernel)
 
             for middleware in self.command_wrapper.middlewares:
@@ -286,9 +287,6 @@ class ExtendedCommand(Command):
         from wexample_app.helpers.response import response_normalize
         from wexample_app.response.abstract_response import AbstractResponse
 
-        # Create a list to store all tasks
-        tasks = []
-
         # Create an executor for running CPU-bound functions in a thread pool
         executor = ThreadPoolExecutor(max_workers=min(32, len(execution_contexts)))
 
@@ -320,9 +318,10 @@ class ExtendedCommand(Command):
             return response_normalize(kernel=self.kernel, response=result)
 
         # Create a task for each pass
-        for execution_context in execution_contexts:
-            task = asyncio.create_task(execute_single_pass(execution_context))
-            tasks.append(task)
+        tasks = [
+            asyncio.create_task(execute_single_pass(execution_context))
+            for execution_context in execution_contexts
+        ]
 
         # Wait for all tasks to complete
         responses = await asyncio.gather(*tasks)

{wexample_cli-1.0.2 → wexample_cli-1.2.0}/src/wexample_cli/decorator/screenable.py

@@ -103,10 +103,17 @@ def _build_screen_wrapper(default_interval: float, height: int) -> AnyCallable:
             saved_output = kernel_io.output
             kernel_io.output = response.io.output
             try:
-                next_dispatch(function_kwargs)
+                inner_response = next_dispatch(function_kwargs)
             finally:
                 kernel_io.output = saved_output
 
+            if inner_response is not None:
+                formatted = inner_response.get_formatted(
+                    output_format=request.output_format
+                )
+                if formatted:
+                    response.print(formatted)
+
             response.reload()
 
         kernel_io.screen(callback=_frame, height=height)

wexample_cli-1.2.0/tests/helpers/test_extra_args.py

@@ -0,0 +1,38 @@
+from __future__ import annotations
+
+import types
+
+
+def test_resolve_shell_command_joins_extra_args_with_quoting() -> None:
+    from wexample_cli.helpers.extra_args import resolve_shell_command
+
+    result = resolve_shell_command(
+        context=None, command=None, extra_args=["echo", "hi there"]
+    )
+    assert result == "echo 'hi there'"
+
+
+def test_resolve_shell_command_returns_none_when_nothing_given() -> None:
+    from wexample_cli.helpers.extra_args import resolve_shell_command
+
+    result = resolve_shell_command(context=None, command=None, extra_args=None)
+    assert result is None
+
+
+def test_resolve_shell_command_uses_command_when_no_extra_args() -> None:
+    from wexample_cli.helpers.extra_args import resolve_shell_command
+
+    result = resolve_shell_command(context=None, command="ls -la", extra_args=None)
+    assert result == "ls -la"
+
+
+def test_resolve_shell_command_warns_when_both_given() -> None:
+    from wexample_prompt.common.io_manager import IoManager
+
+    from wexample_cli.helpers.extra_args import resolve_shell_command
+
+    context = types.SimpleNamespace(io=IoManager())
+    result = resolve_shell_command(
+        context=context, command="legacy", extra_args=["run"]
+    )
+    assert result == "run"