usecli 0.1.65__tar.gz → 0.1.67__tar.gz

{usecli-0.1.65 → usecli-0.1.67}/PKG-INFO

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

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

@@ -165,25 +165,29 @@ def _ensure_cli_initialized() -> None:
             )
 
         def invoke(self, ctx):
-            from click.exceptions import BadParameter, ClickException, Exit, UsageError
+            from click.exceptions import Exit
+
+            _TyperBadParameter = globals()["_TyperBadParameter"]
+            _TyperUsageError = globals()["_TyperUsageError"]
+            _TyperClickException = globals()["_TyperClickException"]
 
             try:
                 return super().invoke(ctx)
             except Exit:
                 sys.exit(0)
-            except BadParameter as e:
+            except _TyperBadParameter as e:
                 from usecli.cli.core.exceptions import UsecliBadParameter
 
                 styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
                 styled_error.show()
                 sys.exit(styled_error.exit_code)
-            except UsageError as e:
+            except _TyperUsageError as e:
                 from usecli.cli.core.exceptions import UsecliUsageError
 
                 styled_error = UsecliUsageError(e.message, ctx=e.ctx)
                 styled_error.show()
                 sys.exit(styled_error.exit_code)
-            except ClickException as e:
+            except _TyperClickException as e:
                 if hasattr(e, "show"):
                     e.show()
                 sys.exit(e.exit_code if hasattr(e, "exit_code") else 1)
@@ -419,6 +423,12 @@ def main() -> None:
     _ensure_cli_initialized()
     _resolve_help()
 
+    # Use typer's exception classes if available (they're subclasses of click's)
+    # typer raises its own exceptions which may not match click's exactly
+    _TyperBadParameter = globals().get("_TyperBadParameter", BadParameter)
+    _TyperUsageError = globals().get("_TyperUsageError", UsageError)
+    _TyperClickException = globals().get("_TyperClickException", ClickException)
+
     from usecli.shared.config.manager import get_config
 
     config = get_config()
@@ -439,22 +449,28 @@ def main() -> None:
         _get_app()()
     except Exit:
         sys.exit(0)
-    except BadParameter as e:
+    except _TyperBadParameter as e:
         from usecli.cli.core.exceptions import UsecliBadParameter
 
         styled_error = UsecliBadParameter(e.message, ctx=e.ctx, param=e.param)
         styled_error.show()
         sys.exit(styled_error.exit_code)
-    except UsageError as e:
+    except _TyperUsageError as e:
         from usecli.cli.core.exceptions import UsecliUsageError
 
         styled_error = UsecliUsageError(e.message, ctx=e.ctx)
         styled_error.show()
         sys.exit(styled_error.exit_code)
-    except ClickException as e:
+    except _TyperClickException as e:
         if hasattr(e, "show"):
             e.show()
         sys.exit(e.exit_code if hasattr(e, "exit_code") else 1)
+    except Exception as e:
+        from usecli.cli.core.exceptions import UsecliUsageError
+
+        styled_error = UsecliUsageError(str(e))
+        styled_error.show()
+        sys.exit(1)
 
 
 if __name__ == "__main__":

{usecli-0.1.65 → usecli-0.1.67}/src/usecli/cli/commands/defaults/make/make_theme_command.py

@@ -13,12 +13,7 @@ from rich.console import Console
 from usecli.cli.config.colors import COLOR
 from usecli.cli.core.base_command import BaseCommand
 from usecli.shared.config.globals import TEMPLATES_DIR
-from usecli.shared.config.manager import (
-    ConfigManager,
-    find_project_root,
-    get_config,
-    reset_config,
-)
+from usecli.shared.config.manager import find_project_root, get_config, reset_config
 
 console = Console()
 
@@ -49,25 +44,7 @@ class MakeThemeCommand(BaseCommand):
             config = get_config()
 
         project_paths = config.get_project_paths()
-        themes_entries = self._normalize_theme_entries(config.get("themes_dir", []))
-        if not themes_entries:
-            console.print(
-                f"[{COLOR.ERROR}]Error: No theme directory configured.[/{COLOR.ERROR}]"
-            )
-            return
-
-        default_entries = self._normalize_theme_entries(
-            ConfigManager.DEFAULT_CONFIG.get("themes_dir", [])
-        )
-        preferred_entries = [
-            entry for entry in themes_entries if entry not in default_entries
-        ]
-        if not preferred_entries:
-            preferred_entries = themes_entries
-
-        themes_dir = self._resolve_theme_dir(
-            preferred_entries[0], config.get_project_root()
-        )
+        themes_dir = project_paths["themes_dir"]
         themes_dir.mkdir(parents=True, exist_ok=True)
 
         base_name = Path(clean_name).name
@@ -103,26 +80,3 @@ class MakeThemeCommand(BaseCommand):
         console.print(
             f"[{COLOR.SUCCESS}]Successfully created theme at {target_file}[/{COLOR.SUCCESS}]"
         )
-
-    @staticmethod
-    def _normalize_theme_entries(value: object) -> list[str]:
-        if isinstance(value, str):
-            normalized = value.strip()
-            return [normalized] if normalized else []
-        if isinstance(value, list):
-            result: list[str] = []
-            for entry in value:
-                if not isinstance(entry, str):
-                    continue
-                normalized = entry.strip()
-                if normalized:
-                    result.append(normalized)
-            return result
-        return []
-
-    @staticmethod
-    def _resolve_theme_dir(entry: str, project_root: Path) -> Path:
-        theme_path = Path(entry)
-        if not theme_path.is_absolute():
-            theme_path = project_root / theme_path
-        return theme_path.resolve()

{usecli-0.1.65 → usecli-0.1.67}/src/usecli/shared/config/manager.py

@@ -856,9 +856,13 @@ class ConfigManager:
     def get_project_paths(self) -> dict[str, Path]:
         project_config = self._find_project_config()
         if project_config is None:
+            themes_dirs = self.get_project_themes_dirs()
             return {
                 "commands_dir": self.get_project_commands_dir(),
                 "templates_dir": self.get_project_templates_dir(),
+                "themes_dir": themes_dirs[0]
+                if themes_dirs
+                else self.get_project_root() / "cli" / "themes",
             }
         config_dir = project_config.parent
         config_data = self._load_usecli_toml(project_config)
@@ -870,9 +874,24 @@ class ConfigManager:
             commands_path = config_dir / commands_path
         if not templates_path.is_absolute():
             templates_path = config_dir / templates_path
+
+        themes_entries = _normalize_themes_dir(config_data.get("themes_dir", []))
+        if not themes_entries:
+            themes_entries = _normalize_themes_dir(
+                self.DEFAULT_CONFIG.get("themes_dir", [])
+            )
+        themes_path = (
+            _get_path()(themes_entries[0])
+            if themes_entries
+            else _get_path()("cli/themes")
+        )
+        if not themes_path.is_absolute():
+            themes_path = config_dir / themes_path
+
         return {
             "commands_dir": commands_path.resolve(),
             "templates_dir": templates_path.resolve(),
+            "themes_dir": themes_path.resolve(),
         }
 
     def _find_project_config(self) -> Path | None: