usecli 0.1.58__tar.gz → 0.1.59__tar.gz

{usecli-0.1.58 → usecli-0.1.59}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.58
+Version: 0.1.59
 Summary: A powerful Python CLI framework for building beautiful, developer-friendly command-line tools.
 Author: Edward Boswell
 Author-email: Edward Boswell <thememium@gmail.com>
@@ -182,19 +182,10 @@ choice = Menu(["A", "B", "C"]).show()
 ```
 about        Show app info
 help         Show help
-init         Initialize usecli
+init         Initialize usecli (usecli only)
 inspire      Random quote
-make:command Create new command
-```
-
-### Hiding Built-in Commands
-
-Add this to `usecli.config.toml`:
-
-```toml
-[usecli]
-hide_init = true
-hide_inspire = true
+make:command Create new command (usecli only)
+make:theme   Create new theme (usecli only)
 ```
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>

{usecli-0.1.58 → usecli-0.1.59}/README.md

@@ -154,19 +154,10 @@ choice = Menu(["A", "B", "C"]).show()
 ```
 about        Show app info
 help         Show help
-init         Initialize usecli
+init         Initialize usecli (usecli only)
 inspire      Random quote
-make:command Create new command
-```
-
-### Hiding Built-in Commands
-
-Add this to `usecli.config.toml`:
-
-```toml
-[usecli]
-hide_init = true
-hide_inspire = true
+make:command Create new command (usecli only)
+make:theme   Create new theme (usecli only)
 ```
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>

{usecli-0.1.58 → usecli-0.1.59}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.58"
+version = "0.1.59"
 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.58 → usecli-0.1.59}/src/usecli/cli/commands/defaults/make/make_command.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import os
+import sys
 from pathlib import Path
 
 import typer
@@ -21,8 +23,8 @@ class MakeCommand(BaseCommand):
     """Command for generating new CLI command files."""
 
     def visible(self) -> bool:
-        config = get_config()
-        return not config.get("hide_make_command", False)
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else ""
+        return command_name == "usecli"
 
     def signature(self) -> str:
         """Return the command signature."""
@@ -50,7 +52,8 @@ class MakeCommand(BaseCommand):
         if config.get_project_root().resolve() != current_root:
             reset_config()
             config = get_config()
-        commands_dir = config.get_project_commands_dir()
+        project_paths = config.get_project_paths()
+        commands_dir = project_paths["commands_dir"]
         commands_dir.mkdir(parents=True, exist_ok=True)
         target_file = commands_dir / file_name
 
@@ -59,7 +62,8 @@ class MakeCommand(BaseCommand):
                 f"[{COLOR.ERROR}]Error: Command file {target_file} already exists.[/{COLOR.ERROR}]"
             )
             return
-        project_template_path = config.get_project_templates_dir() / "command.py.j2"
+        templates_dir = project_paths["templates_dir"]
+        project_template_path = templates_dir / "command.py.j2"
         if project_template_path.exists():
             template_path = project_template_path
         else:

{usecli-0.1.58 → usecli-0.1.59}/src/usecli/cli/commands/defaults/make/make_theme_command.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+import os
+import sys
 from pathlib import Path
 
 import typer
@@ -23,8 +25,8 @@ console = Console()
 
 class MakeThemeCommand(BaseCommand):
     def visible(self) -> bool:
-        config = get_config()
-        return not config.get("hide_make_theme", False)
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else ""
+        return command_name == "usecli"
 
     def signature(self) -> str:
         return "make:theme"
@@ -46,6 +48,7 @@ class MakeThemeCommand(BaseCommand):
             reset_config()
             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(
@@ -86,7 +89,8 @@ class MakeThemeCommand(BaseCommand):
                     break
                 counter += 1
 
-        project_template_path = config.get_project_templates_dir() / "theme.toml.j2"
+        templates_dir = project_paths["templates_dir"]
+        project_template_path = templates_dir / "theme.toml.j2"
         if project_template_path.exists():
             template_path = project_template_path
         else:

{usecli-0.1.58 → usecli-0.1.59}/src/usecli/cli/commands/init_command.py

@@ -29,15 +29,15 @@ from usecli.cli.core.exceptions import UsecliBadParameter
 from usecli.cli.core.validators import validate_command_name
 from usecli.cli.utils.interactive.terminal_menu import terminal_menu
 from usecli.shared.config.globals import TEMPLATES_DIR, THEMES_DIR, USECLI_CONFIG_TOML
-from usecli.shared.config.manager import ConfigManager, get_config
+from usecli.shared.config.manager import ConfigManager
 
 console = Console()
 
 
 class InitCommand(BaseCommand):
     def visible(self) -> bool:
-        config = get_config()
-        return not config.get("hide_init", False)
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else ""
+        return command_name == "usecli"
 
     def signature(self) -> str:
         return "init"
@@ -244,6 +244,30 @@ class InitCommand(BaseCommand):
             return "themes"
         return str(parent / "themes")
 
+    def _infer_commands_dir(self, project_root: Path) -> str:
+        src_dir = project_root / "src"
+        if src_dir.exists() and src_dir.is_dir():
+            packages = [
+                d
+                for d in src_dir.iterdir()
+                if d.is_dir() and not d.name.startswith((".", "_"))
+            ]
+            if len(packages) == 1:
+                package_name = packages[0].name
+                return f"src/{package_name}/cli/commands"
+        pyproject_path = project_root / "pyproject.toml"
+        if pyproject_path.exists():
+            try:
+                data = tomllib.loads(pyproject_path.read_text())
+                project_name = data.get("project", {}).get("name")
+                if project_name:
+                    package_name = project_name.replace("-", "_").replace(" ", "_")
+                    if (project_root / package_name).is_dir():
+                        return f"{package_name}/cli/commands"
+            except (tomllib.TOMLDecodeError, OSError):
+                pass
+        return "cli/commands"
+
     def _get_existing_usecli_script_name(self, pyproject_path: Path) -> str | None:
         if not pyproject_path.exists():
             return None
@@ -532,9 +556,7 @@ include = ["{root_package}*"]
         description: str = typer.Option(
             "A custom CLI tool", help="Description for your CLI"
         ),
-        commands_dir: str = typer.Option(
-            "cli/commands", help="Directory for custom commands"
-        ),
+        commands_dir: str = typer.Option(None, help="Directory for custom commands"),
         command_name: Annotated[
             str,
             typer.Option(
@@ -554,6 +576,9 @@ include = ["{root_package}*"]
             project_root / "pyproject.toml"
         )
 
+        if commands_dir is None:
+            commands_dir = self._infer_commands_dir(project_root)
+
         console.print()
         existing_command_name = self._get_existing_usecli_script_name(pyproject_path)
         if existing_command_name and command_name == "usecli":

{usecli-0.1.58 → usecli-0.1.59}/src/usecli/cli/templates/usecli.config.toml.j2

@@ -8,7 +8,4 @@ commands_dir = "{{ commands_dir | default('cli/commands') }}"
 templates_dir = "{{ templates_dir | default('cli/templates') }}"
 themes_dir = "{{ themes_dir | default('cli/themes') }}"
 theme = "{{ theme | default('default') }}"
-hide_init = {{ hide_init | default(false) | lower }}
 hide_inspire = {{ hide_inspire | default(false) | lower }}
-hide_make_command = {{ hide_make_command | default(false) | lower }}
-hide_make_theme = {{ hide_make_theme | default(false) | lower }}

{usecli-0.1.58 → usecli-0.1.59}/src/usecli/shared/config/manager.py

@@ -83,9 +83,7 @@ class ConfigManager:
         "theme": "default",
         "environment": "prod",
         "command_name": "usecli",
-        "hide_init": False,
         "hide_inspire": False,
-        "hide_make_command": False,
     }
 
     def __init__(
@@ -627,26 +625,69 @@ class ConfigManager:
         commands_path = Path(commands_dir)
         if commands_path.is_absolute():
             return commands_path
-        return (self.project_root / commands_path).resolve()
+        # Resolve relative to the config file's directory, not project_root.
+        # This ensures nested configs (e.g., src/mycli/cli/usecli.config.toml)
+        # resolve paths correctly relative to their location.
+        config_dir = self.usecli_config_path.parent
+        return (config_dir / commands_path).resolve()
 
     def get_project_templates_dir(self) -> Path:
         templates_dir = self.get("templates_dir", "cli/templates")
         templates_path = Path(templates_dir)
         if templates_path.is_absolute():
             return templates_path
-        return (self.project_root / templates_path).resolve()
+        config_dir = self.usecli_config_path.parent
+        return (config_dir / templates_path).resolve()
 
     def get_project_themes_dirs(self) -> list[Path]:
         themes_dir = self.get("themes_dir", [])
         themes_entries = _normalize_themes_dir(themes_dir)
         result: list[Path] = []
+        config_dir = self.usecli_config_path.parent
         for entry in themes_entries:
             theme_path = Path(entry)
             if not theme_path.is_absolute():
-                theme_path = self.project_root / theme_path
+                theme_path = config_dir / theme_path
             result.append(theme_path.resolve())
         return result
 
+    def get_project_paths(self) -> dict[str, Path]:
+        project_config = self._find_project_config()
+        if project_config is None:
+            return {
+                "commands_dir": self.get_project_commands_dir(),
+                "templates_dir": self.get_project_templates_dir(),
+            }
+        config_dir = project_config.parent
+        config_data = self._load_usecli_toml(project_config)
+        commands_dir = config_data.get("commands_dir", "cli/commands")
+        templates_dir = config_data.get("templates_dir", "cli/templates")
+        commands_path = Path(commands_dir)
+        templates_path = Path(templates_dir)
+        if not commands_path.is_absolute():
+            commands_path = config_dir / commands_path
+        if not templates_path.is_absolute():
+            templates_path = config_dir / templates_path
+        return {
+            "commands_dir": commands_path.resolve(),
+            "templates_dir": templates_path.resolve(),
+        }
+
+    def _find_project_config(self) -> Path | None:
+        start_dir = self.start_dir
+        project_root = find_project_root(start_dir)
+        if project_root is None:
+            return None
+        candidates = [
+            p
+            for p in project_root.rglob(USECLI_CONFIG_TOML)
+            if not any(part in self._SKIP_DIRS for part in p.parts)
+        ]
+        if not candidates:
+            return None
+        candidates.sort(key=lambda p: (len(p.parts), str(p)))
+        return candidates[0]
+
     def is_dev(self) -> bool:
         """Check if running in development environment."""
         return self.get("environment", "prod") == "dev"