usecli 0.1.68__tar.gz → 0.1.70__tar.gz

{usecli-0.1.68 → usecli-0.1.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.68
+Version: 0.1.70
 Summary: A powerful Python CLI framework for building beautiful, developer-friendly command-line tools.
 Author: Edward Boswell
 Author-email: Edward Boswell <thememium@gmail.com>

{usecli-0.1.68 → usecli-0.1.70}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.68"
+version = "0.1.70"
 description = "A powerful Python CLI framework for building beautiful, developer-friendly command-line tools."
 readme = "README.md"
 authors = [{ name = "Edward Boswell", email = "thememium@gmail.com" }]

{usecli-0.1.68 → usecli-0.1.70}/src/usecli/__init__.py

@@ -331,6 +331,32 @@ class _FilteredListCommand:
     def __init__(self, prefix_filter: str) -> None:
         self.prefix_filter = prefix_filter
         self.name = "filtered-list"
+        self.allow_extra_args = True
+        self.allow_interspersed_args = True
+        self.ignore_unknown_options = True
+        self.hidden = False
+        self.deprecated = False
+        self.params = []
+        self.callback = None
+        self.help = None
+        self.epilog = None
+        self.short_help = None
+        self.no_args_is_help = False
+        self.context_settings = {}
+
+    def get_short_help_str(self, limit=45):
+        return ""
+
+    def make_context(self, info_name: str, args: list[str], **kwargs: object):
+        from click import Context
+
+        ctx = Context(self, info_name=info_name, **kwargs)  # type: ignore[arg-type]
+        return ctx
+
+    def invoke(self, ctx):
+        from usecli.cli.core.ui.list import list_commands
+
+        list_commands(_get_app(), prefix_filter=self.prefix_filter)
 
     def __call__(self, *args, **kwargs):
         from usecli.cli.core.ui.list import list_commands

{usecli-0.1.68 → usecli-0.1.70}/src/usecli/cli/core/base_command.py

@@ -69,6 +69,7 @@ class NestedCommandRegistry:
                 help=f"Commands for {group_name}",
                 invoke_without_command=True,
                 no_args_is_help=False,
+                add_completion=False,
             )
             self._groups[group_name] = group_app
             self._group_commands[group_name] = []

{usecli-0.1.68 → usecli-0.1.70}/src/usecli/cli/core/ui/list.py

@@ -57,7 +57,8 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
         prefix_filter: Optional prefix to filter commands by name.
     """
     project_name = get_project_name()
-    print_title(title=project_name)
+    if not prefix_filter:
+        print_title(title=project_name)
 
     click_group = typer.main.get_command(app)
 
@@ -122,7 +123,6 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
             option_flags.append(flags)
 
     help_flags = "--help, -h"
-    all_option_flags = [help_flags] + option_flags
     group_entries: list[CommandEntry] = []
     for group_name, group_help in groups.items():
         aliases = group_alias_registry.get(group_name, list[str]())
@@ -158,31 +158,73 @@ def list_commands(app: typer.Typer, prefix_filter: str | None = None) -> None:
     all_display_names = [cmd["display_name"] for cmd in commands] + [
         entry["display_name"] for entry in group_entries
     ]
-    all_labels = all_display_names + all_option_flags
+    all_labels = all_display_names + [help_flags]
     longest_label_length = max((len(label) for label in all_labels), default=0)
 
-    console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
-    console.print(f"  [{COLOR.PRIMARY}]{command_name} [OPTIONS] [ARGUMENTS]")
-    console.print()
+    if prefix_filter:
+        command_name = get_script_command_name(default="usecli")
+        interactive_flags = "--interactive, -i"
+        filtered_labels = (
+            [cmd["display_name"] for cmd in commands]
+            + [entry["display_name"] for entry in group_entries]
+            + [help_flags, interactive_flags]
+        )
+        longest_label_length = max((len(label) for label in filtered_labels), default=0)
+        console.print()
+        console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
+        # Detect colon-separated commands (e.g., "make:command" matching prefix "make")
+        has_colon_commands = any(
+            ":" in cmd["name"] and cmd["name"].startswith(prefix_filter + ":")
+            for cmd in commands
+        )
+        if has_colon_commands:
+            # Colon-separated: use make:COMMAND [OPTIONS]
+            console.print(
+                f"  [not bold {COLOR.PRIMARY}]{command_name} {prefix_filter}:COMMAND [OPTIONS][/]"
+            )
+        else:
+            # Space-separated nested groups: use make [COMMAND] [OPTIONS]
+            console.print(
+                f"  [not bold {COLOR.PRIMARY}]{command_name} {prefix_filter} [COMMAND] [OPTIONS][/]"
+            )
+        console.print()
+        console.print(f"[bold {COLOR.SECONDARY}]Options:")
+        help_padding = " " * (longest_label_length - len(help_flags) + SPACER_LENGTH)
+        console.print(
+            f"  [{COLOR.OPTION}]{help_flags}[/{COLOR.OPTION}]{help_padding}Show this message and exit."
+        )
+        interactive_padding = " " * (
+            longest_label_length - len(interactive_flags) + SPACER_LENGTH
+        )
+        console.print(
+            f"  [{COLOR.OPTION}]{interactive_flags}[/{COLOR.OPTION}]{interactive_padding}Run in interactive mode."
+        )
+        console.print()
+    else:
+        console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
+        console.print(
+            f"  [not bold {COLOR.PRIMARY}]{command_name} [OPTIONS] [ARGUMENTS][/]"
+        )
+        console.print()
 
-    console.print(f"[bold {COLOR.SECONDARY}]Options:")
+        console.print(f"[bold {COLOR.SECONDARY}]Options:")
 
-    help_padding = " " * (longest_label_length - len(help_flags) + SPACER_LENGTH)
-    console.print(
-        f"  [{COLOR.OPTION}]{help_flags}[/{COLOR.OPTION}]{help_padding}Show this message and exit."
-    )
+        help_padding = " " * (longest_label_length - len(help_flags) + SPACER_LENGTH)
+        console.print(
+            f"  [{COLOR.OPTION}]{help_flags}[/{COLOR.OPTION}]{help_padding}Show this message and exit."
+        )
 
-    if display_params:
-        for param in display_params:
-            flags = ", ".join(param.opts)
-            if "--help" in flags:
-                continue
-            description = _get_option_description(param)
-            padding = " " * (longest_label_length - len(flags) + SPACER_LENGTH)
-            console.print(
-                f"  [{COLOR.OPTION}]{flags}[/{COLOR.OPTION}]{padding}{description}"
-            )
-    console.print()
+        if display_params:
+            for param in display_params:
+                flags = ", ".join(param.opts)
+                if "--help" in flags:
+                    continue
+                description = _get_option_description(param)
+                padding = " " * (longest_label_length - len(flags) + SPACER_LENGTH)
+                console.print(
+                    f"  [{COLOR.OPTION}]{flags}[/{COLOR.OPTION}]{padding}{description}"
+                )
+        console.print()
 
     if not prefix_filter:
         console.print(f"[bold {COLOR.SECONDARY}]Available commands:")
@@ -241,7 +283,7 @@ def list_group_commands(group_app: typer.Typer, group_name: str) -> None:
 
     console.print(f"[bold {COLOR.SECONDARY}]Usage:[/bold {COLOR.SECONDARY}]")
     console.print(
-        f"  [{COLOR.PRIMARY}]{command_name} {group_name} [COMMAND] [OPTIONS][/]"
+        f"  [not bold {COLOR.PRIMARY}]{command_name} {group_name} [COMMAND] [OPTIONS][/]"
     )
     console.print()
     commands_by_name: dict[str, CommandMeta] = {}

{usecli-0.1.68 → usecli-0.1.70}/src/usecli/cli/services/command_service.py

@@ -81,6 +81,10 @@ class CommandService:
         if config_version:
             self.version = config_version
             return
+        app_version = self._get_application_version()
+        if app_version:
+            self.version = app_version
+            return
         try:
             self.version = get_version("usecli")
         except Exception as error:
@@ -88,6 +92,30 @@ class CommandService:
                 raise
             self.version = "0.0.0"
 
+    def _get_application_version(self) -> str | None:
+        """Get the version from the application's own distribution.
+
+        Finds the distribution that registered the current console script
+        (e.g., 'usepr') and returns its version, so user-built CLIs
+        show their own version instead of usecli's.
+        """
+        import os
+
+        from usecli.cli.core.ui.title import get_script_command_name
+        from usecli.shared.config.manager import _find_distribution_for_console_script
+
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else None
+        if command_name:
+            dist = _find_distribution_for_console_script(command_name)
+            if dist is not None:
+                return dist.version
+        primary_command = get_script_command_name(default=None)
+        if primary_command:
+            dist = _find_distribution_for_console_script(primary_command)
+            if dist is not None:
+                return dist.version
+        return None
+
     def _load_from_dir(self, directory: Path) -> None:
         """Load command classes from a directory.
 
@@ -149,6 +177,13 @@ class CommandService:
         if spec and spec.loader:
             module = importlib.util.module_from_spec(spec)
             sys.modules[module_name] = module
+
+            from usecli.shared.config.manager import find_project_root
+
+            project_root = find_project_root(path.parent)
+            if project_root and str(project_root) not in sys.path:
+                sys.path.insert(0, str(project_root))
+
             spec.loader.exec_module(module)
             return module
         return None