usecli 0.1.52__tar.gz → 0.1.54__tar.gz

{usecli-0.1.52 → usecli-0.1.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.52
+Version: 0.1.54
 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.52 → usecli-0.1.54}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.52"
+version = "0.1.54"
 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.52 → usecli-0.1.54}/src/usecli/__init__.py

@@ -7,7 +7,7 @@ from importlib import import_module
 
 import click
 import typer
-from click.exceptions import BadParameter, ClickException, UsageError
+from click.exceptions import BadParameter, ClickException, Exit, UsageError
 from typer.core import TyperGroup
 
 from usecli.cli.config.colors import COLOR
@@ -167,6 +167,8 @@ class PrefixMatchingGroup(TyperGroup):
         """
         try:
             return super().invoke(ctx)
+        except Exit:
+            sys.exit(0)
         except BadParameter as e:
             styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
             styled_error.show()
@@ -272,6 +274,8 @@ def main() -> None:
     """Run the CLI application with custom error handling."""
     try:
         app()
+    except Exit:
+        sys.exit(0)
     except BadParameter as e:
         styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
         styled_error.show()

{usecli-0.1.52 → usecli-0.1.54}/src/usecli/cli/core/base_command.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
-from typing import TYPE_CHECKING, Any, ClassVar
+from typing import TYPE_CHECKING, Any, ClassVar, Optional, Sequence
 
 import typer
 from click.exceptions import Exit
@@ -192,6 +192,42 @@ class CustomHelpCommand(TyperCommand):
             for param in getattr(self, "params", [])
         )
 
+    def main(
+        self,
+        args: Optional[Sequence[str]] = None,
+        prog_name: Optional[str] = None,
+        complete_var: Optional[str] = None,
+        standalone_mode: bool = True,
+        windows_expand_args: bool = True,
+        **extra: Any,
+    ) -> Any:
+        """Override main to disable standalone mode.
+
+        Click's default standalone_mode=True catches ClickException
+        internally and calls sys.exit(), preventing our custom error
+        handlers from running. Setting standalone_mode=False lets
+        exceptions propagate to our styled error handlers.
+
+        Args:
+            args: Command-line arguments.
+            prog_name: Program name for help display.
+            complete_var: Shell completion variable name.
+            standalone_mode: Must be False for custom error handling.
+            windows_expand_args: Windows argument expansion flag.
+            **extra: Additional context arguments.
+
+        Returns:
+            The command return value.
+        """
+        return super().main(
+            args=args,
+            prog_name=prog_name,
+            complete_var=complete_var,
+            standalone_mode=False,
+            windows_expand_args=windows_expand_args,
+            **extra,
+        )
+
     def invoke(self, ctx: ClickContext) -> Any:
         interactive = ctx.params.pop("interactive", False)
         if interactive:
@@ -268,6 +304,24 @@ class CustomHelpCommand(TyperCommand):
 
             console.print()
 
+    def get_help(self, ctx: ClickContext) -> str:
+        """Display Rich-formatted help and exit.
+
+        Overrides Click's get_help to display custom Rich output and
+        exit cleanly. This is the proper level to handle the exit,
+        not in format_help.
+
+        Args:
+            ctx: The Click context.
+
+        Returns:
+            Never returns — always raises Exit.
+
+        Raises:
+            Exit: After displaying help.
+        """
+        formatter = ctx.make_formatter()
+        self.format_help(ctx, formatter)
         raise Exit()