usecli 0.1.36__tar.gz → 0.1.38__tar.gz

{usecli-0.1.36 → usecli-0.1.38}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.36"
+version = "0.1.38"
 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.36 → usecli-0.1.38}/src/usecli/cli/commands/init_command.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import os
 import re
 import shutil
 import subprocess
@@ -504,7 +505,11 @@ include = ["{root_package}*"]
         cwd = Path.cwd()
         config_manager = ConfigManager(start_dir=cwd)
         project_root = config_manager.get_project_root()
-        pyproject_path = project_root / "pyproject.toml"
+        pyproject_path = (
+            config_manager.pyproject_path
+            if config_manager.pyproject_path.exists()
+            else project_root / "pyproject.toml"
+        )
 
         console.print()
         existing_command_name = self._get_existing_usecli_script_name(pyproject_path)
@@ -651,24 +656,6 @@ include = ["{root_package}*"]
                 f"[{COLOR.WARNING}]Default theme already exists:[/{COLOR.WARNING}] {theme_template_path}"
             )
 
-        # Load the template
-        template_path = (
-            Path(__file__).parent.parent / "templates" / "usecli.config.toml.j2"
-        )
-        template_content = template_path.read_text()
-        template = Template(template_content)
-
-        # Render the config
-        config_content = template.render(
-            title=title,
-            description=description,
-            commands_dir=commands_dir,
-            templates_dir=templates_dir,
-            themes_dir=themes_dir,
-            title_font=title_font,
-            theme=theme,
-        )
-
         scripts_status: str | None = None
         usecli_config_status: str | None = None
 
@@ -744,6 +731,29 @@ include = ["{root_package}*"]
             if replace_existing:
                 config_path = existing_config
 
+        config_dir = config_path.parent
+        config_commands_dir = os.path.relpath(commands_path, start=config_dir)
+        config_templates_dir = os.path.relpath(templates_path, start=config_dir)
+        config_themes_dir = os.path.relpath(themes_path, start=config_dir)
+
+        # Load the template
+        template_path = (
+            Path(__file__).parent.parent / "templates" / "usecli.config.toml.j2"
+        )
+        template_content = template_path.read_text()
+        template = Template(template_content)
+
+        # Render the config
+        config_content = template.render(
+            title=title,
+            description=description,
+            commands_dir=config_commands_dir,
+            templates_dir=config_templates_dir,
+            themes_dir=config_themes_dir,
+            title_font=title_font,
+            theme=theme,
+        )
+
         usecli_config_status = self._write_usecli_config(
             config_path, config_content, force
         )

{usecli-0.1.36 → usecli-0.1.38}/src/usecli/cli/config/colors.py

@@ -11,7 +11,9 @@ Usage:
 
 from __future__ import annotations
 
+import importlib.metadata
 import importlib.util
+import os
 import sys
 from pathlib import Path
 from typing import Any, Callable, Final, final
@@ -26,7 +28,15 @@ PYPROJECT_TOML = "pyproject.toml"
 USECLI_CONFIG_TOML = "usecli.config.toml"
 DEFAULT_THEME_NAME = "default"
 THEMES_DIR = Path(__file__).resolve().parent.parent / "themes"
-_PACKAGE_PREFER_DIRS = {".venv", "venv", "site-packages"}
+_SKIP_DIRS = {
+    ".venv",
+    "venv",
+    "site-packages",
+    "dist-packages",
+    "__pypackages__",
+    "pipx",
+    "venvs",
+}
 DEFAULT_THEME_COLORS: dict[str, str] = {
     "primary": "#60D7FF",
     "secondary": "#5EFF87",
@@ -61,7 +71,7 @@ def _find_usecli_config_path(
         candidates = [
             path
             for path in candidates
-            if not any(part in {".venv", "venv"} for part in path.parts)
+            if not any(part in _SKIP_DIRS for part in path.parts)
         ]
     if not candidates:
         return None
@@ -106,8 +116,64 @@ def _find_usecli_config_in_package() -> Path | None:
     return None
 
 
+def _find_usecli_config_in_named_package(package_name: str) -> Path | None:
+    if not package_name:
+        return None
+    spec = importlib.util.find_spec(package_name)
+    if spec is None or not spec.submodule_search_locations:
+        return None
+    for location in spec.submodule_search_locations:
+        package_root = Path(location)
+        if not package_root.exists() or not package_root.is_dir():
+            continue
+        candidates = [
+            path for path in package_root.rglob(USECLI_CONFIG_TOML) if path.exists()
+        ]
+        if candidates:
+            candidates.sort(key=lambda path: (len(path.parts), str(path)))
+            return candidates[0]
+    return None
+
+
+def _find_usecli_config_for_console_script() -> Path | None:
+    command_name = os.path.basename(sys.argv[0]) if sys.argv else ""
+    if not command_name:
+        return None
+    try:
+        distributions = importlib.metadata.distributions()
+    except Exception:
+        return None
+    for dist in distributions:
+        try:
+            entry_points = dist.entry_points
+        except Exception:
+            continue
+        for entry_point in entry_points:
+            if entry_point.group != "console_scripts":
+                continue
+            if entry_point.name != command_name:
+                continue
+            metadata = dist.metadata
+            dist_name = ""
+            if "Name" in metadata:
+                dist_name = metadata["Name"]
+            elif "name" in metadata:
+                dist_name = metadata["name"]
+            candidates: list[str] = []
+            if dist_name:
+                candidates.append(dist_name)
+                normalized = dist_name.replace("-", "_")
+                if normalized not in candidates:
+                    candidates.append(normalized)
+            for package_name in candidates:
+                match = _find_usecli_config_in_named_package(package_name)
+                if match:
+                    return match
+    return None
+
+
 def _is_preferred_package_path(path: Path) -> bool:
-    return any(part in _PACKAGE_PREFER_DIRS for part in path.parts)
+    return any(part in _SKIP_DIRS for part in path.parts)
 
 
 def _is_within_usecli_package(start_dir: Path) -> bool:
@@ -132,10 +198,6 @@ def _find_project_root(start_dir: Path | None = None) -> Path | None:
     current = start_dir.resolve()
     git_root: Path | None = None
 
-    package_match = _find_usecli_config_in_package()
-    if package_match and _is_preferred_package_path(package_match):
-        return package_match.parent
-
     while True:
         pyproject_path = current / PYPROJECT_TOML
         if pyproject_path.exists():
@@ -156,12 +218,14 @@ def _find_project_root(start_dir: Path | None = None) -> Path | None:
         current = parent
 
     search_root = git_root or start_dir.resolve()
-    config_match = _find_usecli_config_path(
-        search_root, start_dir, skip_venv=_is_within_usecli_package(start_dir)
-    )
+    config_match = _find_usecli_config_path(search_root, start_dir, skip_venv=True)
     if config_match:
         return config_match.parent
 
+    console_match = _find_usecli_config_for_console_script()
+    if console_match:
+        return console_match.parent
+
     package_match = _find_usecli_config_in_package()
     if package_match:
         return package_match.parent
@@ -173,18 +237,17 @@ def _load_usecli_config(project_root: Path | None) -> dict[str, Any]:
     if project_root is None:
         return {}
 
-    package_match = _find_usecli_config_in_package()
-    if package_match and _is_preferred_package_path(package_match):
-        return _load_usecli_config_file(package_match)
-
     config_path = project_root / USECLI_CONFIG_TOML
     if not config_path.exists():
         config_path = _find_usecli_config_path(
             project_root,
             project_root,
-            skip_venv=_is_within_usecli_package(project_root),
+            skip_venv=True,
         )
     if not config_path or not config_path.exists():
+        console_match = _find_usecli_config_for_console_script()
+        if console_match:
+            return _load_usecli_config_file(console_match)
         package_match = _find_usecli_config_in_package()
         if package_match:
             config_path = package_match

{usecli-0.1.36 → usecli-0.1.38}/src/usecli/shared/config/manager.py

@@ -5,7 +5,9 @@ Handles loading and accessing configuration from project-level files.
 
 from __future__ import annotations
 
+import importlib.metadata
 import importlib.util
+import os
 import sys
 from pathlib import Path
 from typing import Any
@@ -59,8 +61,15 @@ def _dedupe_items(items: list[str]) -> list[str]:
 class ConfigManager:
     """Manages useCli configuration from project-level files."""
 
-    _SKIP_DIRS = {".venv", "venv"}
-    _PACKAGE_PREFER_DIRS = {".venv", "venv", "site-packages"}
+    _SKIP_DIRS = {
+        ".venv",
+        "venv",
+        "site-packages",
+        "dist-packages",
+        "__pypackages__",
+        "pipx",
+        "venvs",
+    }
 
     DEFAULT_CONFIG: dict[str, Any] = {
         "title": "usecli",
@@ -109,8 +118,25 @@ class ConfigManager:
         self.usecli_config_path: Path = usecli_config_path
         self.start_dir: Path = start_dir
         detected_root = find_project_root(start_dir)
-        if detected_root is None and self.usecli_config_path.exists():
-            detected_root = self.usecli_config_path.parent
+        if self.usecli_config_path.exists():
+            config_parent = self.usecli_config_path.parent
+            if detected_root is None:
+                detected_root = config_parent
+            else:
+                root_config = detected_root / USECLI_CONFIG_TOML
+                if self.usecli_config_path.resolve() != root_config.resolve():
+                    detected_root = config_parent
+                else:
+                    try:
+                        self.usecli_config_path.relative_to(detected_root)
+                    except ValueError:
+                        detected_root = config_parent
+                    else:
+                        if any(
+                            part in self._SKIP_DIRS
+                            for part in self.usecli_config_path.parts
+                        ):
+                            detected_root = config_parent
         self.project_root: Path = (detected_root or start_dir).resolve()
         self._config: dict[str, Any] = {}
         self._overrides: dict[str, Any] = {}
@@ -170,10 +196,6 @@ class ConfigManager:
     def _find_usecli_config(cls, start_dir: Path) -> Path | None:
         current = start_dir.resolve()
 
-        package_match = cls._find_usecli_config_in_package()
-        if package_match and cls._is_preferred_package_path(package_match):
-            return package_match
-
         while True:
             config_path = current / USECLI_CONFIG_TOML
             if config_path.exists():
@@ -184,17 +206,24 @@ class ConfigManager:
                 break
             current = parent
 
-        in_usecli_package = cls._is_within_usecli_package(start_dir)
-        if in_usecli_package and package_match:
-            return package_match
-
         search_root = find_project_root(start_dir) or start_dir.resolve()
         recursive_match = cls._find_usecli_config_in_tree(
-            search_root, start_dir, skip_venv=in_usecli_package
+            search_root, start_dir, skip_venv=True
         )
         if recursive_match:
             return recursive_match
 
+        console_match = cls._find_usecli_config_for_console_script()
+        if console_match:
+            return console_match
+
+        if not cls._is_within_usecli_package(start_dir):
+            return None
+
+        package_match = cls._find_usecli_config_in_package()
+        if package_match:
+            return package_match
+
         return cls._find_usecli_config_on_sys_path()
 
     @staticmethod
@@ -253,9 +282,65 @@ class ConfigManager:
                 return candidates[0]
         return None
 
+    @classmethod
+    def _find_usecli_config_in_named_package(cls, package_name: str) -> Path | None:
+        if not package_name:
+            return None
+        spec = importlib.util.find_spec(package_name)
+        if spec is None or not spec.submodule_search_locations:
+            return None
+        for location in spec.submodule_search_locations:
+            package_root = Path(location)
+            if not package_root.exists() or not package_root.is_dir():
+                continue
+            candidates = [
+                path for path in package_root.rglob(USECLI_CONFIG_TOML) if path.exists()
+            ]
+            if candidates:
+                candidates.sort(key=lambda path: (len(path.parts), str(path)))
+                return candidates[0]
+        return None
+
+    @classmethod
+    def _find_usecli_config_for_console_script(cls) -> Path | None:
+        command_name = os.path.basename(sys.argv[0]) if sys.argv else ""
+        if not command_name:
+            return None
+        try:
+            distributions = importlib.metadata.distributions()
+        except Exception:
+            return None
+        for dist in distributions:
+            try:
+                entry_points = dist.entry_points
+            except Exception:
+                continue
+            for entry_point in entry_points:
+                if entry_point.group != "console_scripts":
+                    continue
+                if entry_point.name != command_name:
+                    continue
+                metadata = dist.metadata
+                dist_name = ""
+                if "Name" in metadata:
+                    dist_name = metadata["Name"]
+                elif "name" in metadata:
+                    dist_name = metadata["name"]
+                candidates = []
+                if dist_name:
+                    candidates.append(dist_name)
+                    normalized = dist_name.replace("-", "_")
+                    if normalized not in candidates:
+                        candidates.append(normalized)
+                for package_name in candidates:
+                    match = cls._find_usecli_config_in_named_package(package_name)
+                    if match:
+                        return match
+        return None
+
     @staticmethod
     def _is_preferred_package_path(path: Path) -> bool:
-        return any(part in ConfigManager._PACKAGE_PREFER_DIRS for part in path.parts)
+        return any(part in ConfigManager._SKIP_DIRS for part in path.parts)
 
     @staticmethod
     def _is_within_usecli_package(start_dir: Path) -> bool:
@@ -433,10 +518,6 @@ def find_project_root(start_dir: Path | None = None) -> Path | None:
 
     current = start_dir.resolve()
 
-    package_match = ConfigManager._find_usecli_config_in_package()
-    if package_match and ConfigManager._is_preferred_package_path(package_match):
-        return package_match.parent
-
     git_root: Path | None = None
     while True:
         pyproject_path = current / PYPROJECT_TOML
@@ -461,11 +542,16 @@ def find_project_root(start_dir: Path | None = None) -> Path | None:
     config_match = ConfigManager._find_usecli_config_in_tree(
         search_root,
         start_dir,
-        skip_venv=ConfigManager._is_within_usecli_package(start_dir),
+        skip_venv=True,
     )
     if config_match:
         return config_match.parent
 
+    if ConfigManager._is_within_usecli_package(start_dir):
+        package_match = ConfigManager._find_usecli_config_in_package()
+        if package_match:
+            return package_match.parent
+
     return git_root
 
 

{usecli-0.1.36/src/usecli/cli → usecli-0.1.38/src/usecli}/usecli.config.toml

@@ -3,9 +3,9 @@ title = "usecli"
 title_file = ""
 title_font = "ansi_shadow"
 description = "A custom CLI tool"
-commands_dir = "src/usecli/cli/commands/custom"
-templates_dir = "src/usecli/cli/templates"
-themes_dir = "src/usecli/cli/themes"
+commands_dir = "cli/commands/custom"
+templates_dir = "cli/templates"
+themes_dir = "cli/themes"
 theme = "default"
 hide_init = false
 hide_inspire = false