usecli 0.1.75__tar.gz → 0.1.76__tar.gz

{usecli-0.1.75 → usecli-0.1.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: usecli
-Version: 0.1.75
+Version: 0.1.76
 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.76/pyproject.toml

@@ -0,0 +1,92 @@
+[project]
+name = "usecli"
+version = "0.1.76"
+description = "A powerful Python CLI framework for building beautiful, developer-friendly command-line tools."
+readme = "README.md"
+requires-python = ">=3.10"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Operating System :: OS Independent",
+    "Intended Audience :: Developers",
+]
+dependencies = [
+    "case-converter>=1.2.0",
+    "click>=8.3.1",
+    "fzf-bin>=0.67.0",
+    "jinja2>=3.1.6",
+    "pyfiglet>=1.0.4",
+    "rich>=14.3.1",
+    "simple-term-menu>=1.6.6",
+    "tomli>=2.4.0",
+    "typer>=0.21.1",
+]
+license = "MIT"
+license-files = ["LICEN[CS]E*"]
+
+[[project.authors]]
+name = "Edward Boswell"
+email = "thememium@gmail.com"
+
+[project.urls]
+Homepage = "https://github.com/thememium/usecli"
+Documentation = "https://github.com/thememium/usecli"
+Repository = "https://github.com/thememium/usecli.git"
+Issues = "https://github.com/thememium/usecli/issues"
+Changelog = "https://github.com/thememium/usecli/blob/master/CHANGELOG.md"
+
+[project.scripts]
+usecli = "usecli:main"
+
+[build-system]
+requires = ["uv_build>=0.10.2,<0.11.0"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "deptry>=0.24.0",
+    "isort>=7.0.0",
+    "poethepoet>=0.41.0",
+    "pytest>=9.0.2",
+    "pytest-cov>=7.1.0",
+    "ruff>=0.15.1",
+    "ty>=0.0.17",
+]
+
+[tool.deptry]
+known_first_party = ["usecli"]
+
+[tool.deptry.package_module_name_map]
+case-converter = "caseconverter"
+
+[tool.deptry.per_rule_ignores]
+DEP002 = ["fzf-bin"]
+
+[tool.poe.tasks]
+dev = "uv run usecli"
+clean-full = "sh -c 'uv run isort . && uv run ruff check . --fix && uv run ruff format . && uv run deptry . && uv run ty check'"
+clean = "sh -c 'uv run isort . && uv run ruff format .'"
+test = "uv run pytest tests/ -v"
+test-cov = "uv run pytest tests/ -v --cov=usecli --cov-report=term-missing"
+sort = "uv run isort ."
+lint = "uv run ruff check ."
+format = "uv run ruff format ."
+deptry = "uv run deptry ."
+typecheck = "uv run ty check"
+build = "uv build --no-sources"
+release = "bash scripts/release.sh"
+
+[tool.ty.src]
+include = [
+    "src",
+    "tests",
+]
+exclude = [
+    "**/__pycache__",
+    "**/.venv",
+]
+
+[tool.ty.rules]
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["cli*"]

usecli-0.1.75/pyproject.toml → usecli-0.1.76/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "usecli"
-version = "0.1.75"
+version = "0.1.76"
 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" }]
@@ -44,6 +44,7 @@ dev = [
   "isort>=7.0.0",
   "poethepoet>=0.41.0",
   "pytest>=9.0.2",
+  "pytest-cov>=7.1.0",
   "ruff>=0.15.1",
   "ty>=0.0.17",
 ]
@@ -62,10 +63,11 @@ dev = "uv run usecli"
 clean-full = "sh -c 'uv run isort . && uv run ruff check . --fix && uv run ruff format . && uv run deptry . && uv run ty check'"
 clean = "sh -c 'uv run isort . && uv run ruff format .'"
 test = "uv run pytest tests/ -v"
+test-cov = "uv run pytest tests/ -v --cov=usecli --cov-report=term-missing"
 sort = "uv run isort ."
 lint = "uv run ruff check ."
 format = "uv run ruff format ."
-deptry = "uv deptry ."
+deptry = "uv run deptry ."
 typecheck = "uv run ty check"
 build = "uv build --no-sources"
 release = "bash scripts/release.sh"

{usecli-0.1.75 → usecli-0.1.76}/src/usecli/cli/commands/init_command.py

@@ -87,6 +87,36 @@ class InitCommand(BaseCommand):
         pyproject_path.write_text(content)
         return True
 
+    def _add_setuptools_package_data(
+        self, pyproject_path: Path, commands_dir: str
+    ) -> bool:
+        if not pyproject_path.exists():
+            return False
+
+        content = pyproject_path.read_text()
+        if "[tool.setuptools.package-data]" in content:
+            return False
+
+        parts = Path(commands_dir).parts
+        if not parts:
+            return False
+
+        # setuptools only ships .py files by default. init scaffolds
+        # usecli.config.toml, a make-command template (.j2), and a default
+        # theme (.toml) inside this package - without this declaration a
+        # non-editable install of the scaffolded project silently drops all
+        # three, and command discovery/theming then fail with no error.
+        root_package = parts[0]
+        package_data_block = (
+            "[tool.setuptools.package-data]\n"
+            f'{root_package} = ["**/*.toml", "**/*.j2"]\n\n'
+        )
+
+        content = content.rstrip() + f"\n\n{package_data_block}"
+
+        pyproject_path.write_text(content)
+        return True
+
     def _write_usecli_config(
         self,
         config_path: Path,
@@ -546,6 +576,9 @@ build-backend = "setuptools.build_meta"
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["{root_package}*"]
+
+[tool.setuptools.package-data]
+{root_package} = ["**/*.toml", "**/*.j2"]
 '''
 
         pyproject_path.write_text(pyproject_content)
@@ -638,6 +671,7 @@ include = ["{root_package}*"]
             )
             self._ensure_build_system(pyproject_path)
             self._add_setuptools_package_discovery(pyproject_path, commands_dir)
+            self._add_setuptools_package_data(pyproject_path, commands_dir)
             if scripts_status in {"added", "updated", "unchanged"}:
                 self._sync_environment(project_root, command_name)
         else:
@@ -950,6 +984,10 @@ include = ["{root_package}*"]
                 console.print(
                     f"[{COLOR.SUCCESS}]Added setuptools package discovery to pyproject.toml[/{COLOR.SUCCESS}]"
                 )
+            if self._add_setuptools_package_data(pyproject_path, commands_dir):
+                console.print(
+                    f"[{COLOR.SUCCESS}]Added setuptools package data to pyproject.toml[/{COLOR.SUCCESS}]"
+                )
 
             if scripts_status in {"added", "updated", "unchanged"}:
                 self._sync_environment(project_root, command_name)

{usecli-0.1.75 → usecli-0.1.76}/src/usecli/cli/core/exceptions/usage.py

@@ -6,7 +6,7 @@ import sys
 from typing import IO
 
 from click.core import Context as ClickContext
-from click.exceptions import BadParameter, UsageError
+from click.exceptions import BadParameter, Exit, UsageError
 from rich.console import Console
 
 from usecli.cli.config.colors import COLOR
@@ -16,14 +16,30 @@ console = Console(stderr=True)
 
 
 def _get_help_text_with_command_name(ctx: ClickContext) -> str:
+    # ctx.get_help() delegates to ctx.command.get_help(ctx). Commands built
+    # from BaseCommand use CustomHelpCommand, whose get_help() prints the
+    # help directly and raises Exit(0) instead of returning a string (see
+    # base_command.py) so that a bare `--help` exits cleanly. That contract
+    # break means this call can raise instead of returning text whenever
+    # ctx.command is a CustomHelpCommand (i.e. any real subcommand). Left
+    # uncaught, the Exit(0) propagates out of show() and is interpreted by
+    # click/typer as "the command exited 0", clobbering the exit code this
+    # usage error was about to set. The help has already been printed as a
+    # side effect by that point, so it's safe to treat this as "no
+    # additional help text to append" and let the caller continue.
     command_name = get_script_command_name(default=getattr(ctx, "info_name", None))
     if not command_name:
-        return ctx.get_help()
+        try:
+            return ctx.get_help()
+        except Exit:
+            return ""
 
     original_info_name = getattr(ctx, "info_name", None)
     try:
         ctx.info_name = command_name
         return ctx.get_help()
+    except Exit:
+        return ""
     finally:
         ctx.info_name = original_info_name
 

{usecli-0.1.75 → usecli-0.1.76}/src/usecli/cli/services/command_service.py

@@ -77,14 +77,19 @@ class CommandService:
             self._load_from_dir(project_commands_dir)
 
     def _load_version(self) -> None:
-        config_version = get_config().get_project_version()
-        if config_version:
-            self.version = config_version
-            return
+        # Try the installed distribution first, same order as
+        # about_command.py's _get_application_version(). A pyproject.toml
+        # walked up from cwd has no ownership check - it can belong to an
+        # unrelated project the user happens to be standing in - so it's
+        # only a fallback, not the first check.
         app_version = self._get_application_version()
         if app_version:
             self.version = app_version
             return
+        config_version = get_config().get_project_version()
+        if config_version:
+            self.version = config_version
+            return
         try:
             self.version = get_version("usecli")
         except Exception as error:

{usecli-0.1.75 → usecli-0.1.76}/src/usecli/shared/config/manager.py

@@ -588,15 +588,23 @@ class ConfigManager:
             dist_name = metadata["Name"]
         elif "name" in metadata:
             dist_name = metadata["name"]
-        candidates = []
+        candidates: list[str] = []
         if dist_name:
             candidates.append(dist_name)
             normalized = dist_name.replace("-", "_")
             if normalized not in candidates:
                 candidates.append(normalized)
+        # Also try the actual importable package names from top_level.txt.
+        # For non-editable installs the distribution name (e.g.
+        # "my-cli") often differs from the importable package
+        # name (e.g. "mycli"), so relying on the distribution name alone fails
+        # to locate the package via importlib.util.find_spec.
+        for top_level in cls._read_top_level_packages(dist):
+            if top_level not in candidates:
+                candidates.append(top_level)
         aliases = cls._get_console_script_aliases(command_name)
+        source_root = cls._resolve_editable_source_root(dist)
         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
@@ -608,6 +616,16 @@ class ConfigManager:
                 return match
         return None
 
+    @staticmethod
+    def _read_top_level_packages(dist: Any) -> list[str]:
+        try:
+            text = dist.read_text("top_level.txt")
+        except Exception:
+            return []
+        if not text:
+            return []
+        return [line.strip() for line in text.splitlines() if line.strip()]
+
     @staticmethod
     def _is_preferred_package_path(path: Path) -> bool:
         return any(part in ConfigManager._SKIP_DIRS for part in path.parts)