usecli 0.1.55__tar.gz → 0.1.57__tar.gz

{usecli-0.1.55 → usecli-0.1.57}/PKG-INFO

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

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

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import shutil
 import sys
 from importlib import import_module
 from typing import Any, Optional, Sequence
@@ -282,8 +283,10 @@ def run_app(
         raise typer.Exit()
 
     if version:
+        config = get_config()
+        command_path = shutil.which(sys.argv[0]) or sys.argv[0]
         console.print(
-            f"[bold blue]CLI Version:[/bold blue] [green]{service.version}[/green]"
+            f"[bold {theme.SECONDARY}]{config.get('title')} {service.version}[/bold {theme.SECONDARY}] [{theme.INFO}]({command_path})[/{theme.INFO}]"
         )
         raise typer.Exit()
 

{usecli-0.1.55 → usecli-0.1.57}/src/usecli/cli/services/command_service.py

@@ -41,10 +41,14 @@ class CommandService:
     def load_commands(self) -> None:
         """Load all commands from the commands directory and project directories."""
         self._load_version()
-        package_commands_dir = (PACKAGE_ROOT / "cli/commands").resolve()
-        self._load_from_dir(package_commands_dir)
+        config = get_config()
+
+        if config.is_usecli_direct_dependency():
+            package_commands_dir = (PACKAGE_ROOT / "cli/commands").resolve()
+            self._load_from_dir(package_commands_dir)
 
-        project_commands_dir = get_config().get_project_commands_dir().resolve()
+        project_commands_dir = config.get_project_commands_dir().resolve()
+        package_commands_dir = (PACKAGE_ROOT / "cli/commands").resolve()
         if project_commands_dir == package_commands_dir:
             return
         try:

{usecli-0.1.55 → usecli-0.1.57}/src/usecli/shared/config/manager.py

@@ -7,6 +7,7 @@ from __future__ import annotations
 
 import importlib.metadata
 import importlib.util
+import json
 import os
 import sys
 from pathlib import Path
@@ -138,6 +139,13 @@ class ConfigManager:
                         ):
                             detected_root = config_parent
         self.project_root: Path = (detected_root or start_dir).resolve()
+        # Only override project_root for the framework itself (usecli).
+        # Downstream packages (usechange, userun, etc.) legitimately live
+        # inside .venv when installed as dependencies — don't break them.
+        command_name = self._get_command_name()
+        is_framework = command_name == "usecli" if command_name else True
+        if is_framework and self._is_in_venv(self.project_root):
+            self.project_root = start_dir.resolve()
         self._config: dict[str, Any] = {}
         self._overrides: dict[str, Any] = {}
         self._load_config()
@@ -211,8 +219,9 @@ class ConfigManager:
             current = parent
 
         search_root = find_project_root(start_dir) or start_dir.resolve()
+        is_framework = command_name == "usecli" if command_name else True
         recursive_match = cls._find_usecli_config_in_tree(
-            search_root, start_dir, skip_venv=True
+            search_root, start_dir, skip_venv=is_framework
         )
         if recursive_match:
             return recursive_match
@@ -279,9 +288,26 @@ class ConfigManager:
 
     @staticmethod
     def _find_usecli_config_in_package() -> Path | None:
-        spec = importlib.util.find_spec(_get_package_name())
+        package_name = _get_package_name()
+        spec = importlib.util.find_spec(package_name)
         if spec is None or not spec.submodule_search_locations:
             return None
+
+        command_name = ConfigManager._get_command_name()
+        aliases = ConfigManager._get_console_script_aliases(command_name)
+
+        try:
+            dist = importlib.metadata.distribution(package_name)
+            source_root = ConfigManager._resolve_editable_source_root(dist)
+            if source_root:
+                source_config = ConfigManager._search_source_for_config(
+                    source_root, command_name, aliases
+                )
+                if source_config:
+                    return source_config
+        except Exception:
+            pass
+
         for location in spec.submodule_search_locations:
             package_root = Path(location)
             if not package_root.exists() or not package_root.is_dir():
@@ -289,8 +315,6 @@ class ConfigManager:
             candidates = [
                 path for path in package_root.rglob(USECLI_CONFIG_TOML) if path.exists()
             ]
-            command_name = ConfigManager._get_command_name()
-            aliases = ConfigManager._get_console_script_aliases(command_name)
             if command_name:
                 candidates = [
                     path
@@ -311,6 +335,22 @@ class ConfigManager:
         spec = importlib.util.find_spec(package_name)
         if spec is None or not spec.submodule_search_locations:
             return None
+
+        command_name = cls._get_command_name()
+        aliases = cls._get_console_script_aliases(command_name)
+
+        try:
+            dist = importlib.metadata.distribution(package_name)
+            source_root = cls._resolve_editable_source_root(dist)
+            if source_root:
+                source_config = cls._search_source_for_config(
+                    source_root, command_name, aliases
+                )
+                if source_config:
+                    return source_config
+        except Exception:
+            pass
+
         for location in spec.submodule_search_locations:
             package_root = Path(location)
             if not package_root.exists() or not package_root.is_dir():
@@ -318,8 +358,6 @@ class ConfigManager:
             candidates = [
                 path for path in package_root.rglob(USECLI_CONFIG_TOML) if path.exists()
             ]
-            command_name = cls._get_command_name()
-            aliases = cls._get_console_script_aliases(command_name)
             if command_name:
                 candidates = [
                     path
@@ -362,7 +400,15 @@ class ConfigManager:
                     normalized = dist_name.replace("-", "_")
                     if normalized not in candidates:
                         candidates.append(normalized)
+                aliases = cls._get_console_script_aliases(command_name)
                 for package_name in candidates:
+                    source_root = cls._resolve_editable_source_root(dist)
+                    if source_root:
+                        source_config = cls._search_source_for_config(
+                            source_root, command_name, aliases
+                        )
+                        if source_config:
+                            return source_config
                     match = cls._find_usecli_config_in_named_package(package_name)
                     if match:
                         return match
@@ -471,6 +517,71 @@ class ConfigManager:
             aliases = {command_name}
         return normalized in aliases
 
+    @staticmethod
+    def _is_in_venv(path: Path) -> bool:
+        resolved = path.resolve()
+        return any(part in ConfigManager._SKIP_DIRS for part in resolved.parts)
+
+    @staticmethod
+    def _resolve_editable_source_root(
+        dist: importlib.metadata.Distribution,
+    ) -> Path | None:
+        """Resolve the source directory for an editable-installed package.
+
+        Reads ``direct_url.json`` from the distribution's metadata to find the
+        local source tree.  Returns the source root or ``None`` when the
+        distribution is not an editable install or the source no longer exists.
+        """
+        try:
+            text = dist.read_text("direct_url.json")
+        except Exception:
+            return None
+        if not text:
+            return None
+        try:
+            data = json.loads(text)
+        except (json.JSONDecodeError, TypeError):
+            return None
+        if not isinstance(data, dict):
+            return None
+        if data.get("dir_info", {}).get("editable") is not True:
+            return None
+        url = data.get("url", "")
+        if not url:
+            return None
+        # ``url`` is a ``file://`` URI.
+        if url.startswith("file://"):
+            url = url[len("file://") :]
+        source = Path(url)
+        if source.exists() and source.is_dir():
+            return source.resolve()
+        return None
+
+    @staticmethod
+    def _search_source_for_config(
+        source_root: Path,
+        command_name: str | None,
+        aliases: set[str] | None,
+    ) -> Path | None:
+        """Search a source tree for a ``usecli.config.toml`` that matches."""
+        if not source_root.exists() or not source_root.is_dir():
+            return None
+        candidates = [
+            p
+            for p in source_root.rglob(USECLI_CONFIG_TOML)
+            if not any(part in ConfigManager._SKIP_DIRS for part in p.parts)
+        ]
+        if command_name:
+            candidates = [
+                p
+                for p in candidates
+                if ConfigManager._config_matches_command(p, command_name, aliases)
+            ]
+        if not candidates:
+            return None
+        candidates.sort(key=lambda p: (len(p.parts), str(p)))
+        return candidates[0]
+
     def get(self, key: str, default: Any = None) -> Any:
         """Get a configuration value using dot notation.
 
@@ -544,6 +655,43 @@ class ConfigManager:
         """Check if running in production environment."""
         return self.get("environment", "prod") == "prod"
 
+    def is_usecli_direct_dependency(self) -> bool:
+        """Check if usecli is a direct dependency of the current project.
+
+        Returns True when:
+        - The current command IS usecli (framework mode)
+        - usecli appears in pyproject.toml [project.dependencies]
+        - usecli appears in pyproject.toml [dependency-groups]
+        """
+        command_name = self._get_command_name()
+        if command_name == "usecli":
+            return True
+
+        if not self.pyproject_path.exists():
+            return False
+
+        try:
+            with open(self.pyproject_path, "rb") as f:
+                data = tomllib.load(f)
+        except (tomllib.TOMLDecodeError, OSError):
+            return False
+
+        for dep in data.get("project", {}).get("dependencies", []):
+            if isinstance(dep, str) and dep.strip().lower().startswith("usecli"):
+                return True
+
+        for group_deps in data.get("dependency-groups", {}).values():
+            if not isinstance(group_deps, list):
+                continue
+            for dep in group_deps:
+                dep_str = dep if isinstance(dep, str) else dep.get("dependency", "")
+                if isinstance(dep_str, str) and dep_str.strip().lower().startswith(
+                    "usecli"
+                ):
+                    return True
+
+        return False
+
     def reload(self) -> None:
         """Reload configuration from disk."""
         self.usecli_config_path = self._find_usecli_config(self.start_dir) or (