pcd-cli 0.2.0__tar.gz → 0.2.1__tar.gz

{pcd_cli-0.2.0 → pcd_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pcd-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: Fast project navigator for Bash, Zsh and Fish
 License-Expression: MIT
 License-File: LICENSE
@@ -103,10 +103,7 @@ SEE ALSO
         FEATURES.txt
 
     Planned changes:
-        ROADMAP.md
-
-    Changelog:
-        CHANGELOG.md
+        ROADMAP.txt
 
     License:
         MIT

{pcd_cli-0.2.0 → pcd_cli-0.2.1}/README.txt

@@ -79,10 +79,7 @@ SEE ALSO
         FEATURES.txt
 
     Planned changes:
-        ROADMAP.md
-
-    Changelog:
-        CHANGELOG.md
+        ROADMAP.txt
 
     License:
         MIT

{pcd_cli-0.2.0 → pcd_cli-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pcd-cli"
-version = "0.2.0"
+version = "0.2.1"
 description = "Fast project navigator for Bash, Zsh and Fish"
 readme = { file = "README.txt", content-type = "text/plain" }
 license = "MIT"

{pcd_cli-0.2.0 → pcd_cli-0.2.1}/src/pcd_cli/cli/projects.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import TYPE_CHECKING
+from typing import assert_never, ClassVar, Literal, NamedTuple, TYPE_CHECKING
 
 import click
 
@@ -10,8 +10,74 @@ from pcd_cli.models import ExitCode, Project, ProjectSource
 from pcd_cli.navigation import navigate_to_project, project_completions, select_project
 
 if TYPE_CHECKING:
+    from collections.abc import Sequence
+
     from pcd_cli.catalog import ProjectCatalog
 
+type ProjectSourceLabel = Literal["manual", "scanned"]
+type ProjectStatusLabel = Literal["available", "missing"]
+
+
+class ProjectListRow(NamedTuple):
+    name: str
+    path: str
+    source: ProjectSourceLabel
+    status: ProjectStatusLabel
+
+    @classmethod
+    def from_project(cls, project: Project) -> ProjectListRow:
+        return cls(
+            name=project.name,
+            path=format_path(project.display_path),
+            source=cls._source_label(project.source),
+            status=cls._status_label(project.path),
+        )
+
+    @staticmethod
+    def _source_label(source: ProjectSource) -> ProjectSourceLabel:
+        match source:
+            case ProjectSource.DISCOVERED:
+                return "scanned"
+            case ProjectSource.MANUAL:
+                return "manual"
+            case _:
+                assert_never(source)
+
+    @staticmethod
+    def _status_label(path: Path) -> ProjectStatusLabel:
+        if path.is_dir():
+            return "available"
+        else:
+            return "missing"
+
+
+class ProjectListTable:
+    HEADERS: ClassVar[tuple[str, str, str, str]] = ("NAME", "PATH", "SOURCE", "STATUS")
+
+    _rows: tuple[ProjectListRow, ...]
+
+    def __init__(self, projects: Sequence[Project]) -> None:
+        self._rows = tuple(ProjectListRow.from_project(project) for project in projects)
+
+    def render(self) -> str:
+        if self._rows:
+            return self._render_table()
+        else:
+            return "No projects found."
+
+    def _render_table(self) -> str:
+        table = (self.HEADERS, *self._rows)
+        columns = zip(*table, strict=True)
+        widths = tuple(max(len(value) for value in column) for column in columns)
+
+        return "\n".join(self._render_row(row, widths) for row in table)
+
+    @staticmethod
+    def _render_row(row: tuple[str, ...], widths: tuple[int, ...]) -> str:
+        return "  ".join(
+            value.ljust(width) for value, width in zip(row, widths, strict=True)
+        ).rstrip()
+
 
 @click.command(hidden=True)
 @click.argument("query")
@@ -101,7 +167,7 @@ def remove(catalog: ProjectCatalog, query: str) -> None:
         click.echo(f"Project not found: {query}", err=True)
         raise click.exceptions.Exit(ExitCode.NOT_FOUND)
 
-    selected = matches[0] if len(matches) == 1 else select_project(catalog, matches, query)
+    selected = select_project(catalog, matches, query)
     if selected is None:
         return
 
@@ -124,17 +190,8 @@ def remove(catalog: ProjectCatalog, query: str) -> None:
 @click.pass_obj
 def list_projects(catalog: ProjectCatalog) -> None:
     """List all known projects."""
-    projects = catalog.projects()
-    if not projects:
-        click.echo("No projects found.")
-        return
-
-    name_width = max(len(project.name) for project in projects)
-    for item in projects:
-        status = "ok" if item.path.is_dir() else "missing"
-        click.echo(
-            f"{item.name:<{name_width}}  {format_path(item.display_path)}  {item.source.value:<10}  {status}"
-        )
+    table = ProjectListTable(catalog.projects())
+    click.echo(table.render())
 
 
 @click.command()

{pcd_cli-0.2.0 → pcd_cli-0.2.1}/src/pcd_cli/cli/shell.py

@@ -84,17 +84,22 @@ def uninstall_shell(shell: str | None) -> None:
     required=False,
     type=click.Choice([item.value for item in Shell], case_sensitive=False),
 )
-def print_shell_integration(shell: str | None) -> None:
+@click.pass_context
+def print_shell_integration(ctx: click.Context, shell: str | None) -> None:
     """Print shell integration for manual dotfile management."""
     selected = _selected_shell(shell)
-    click.echo(render_shell_integration(selected), nl=False)
+    click.echo(render_shell_integration(selected, _registered_command_names(ctx)), nl=False)
 
 
 @click.command("shell-init", hidden=True)
 @click.argument("shell", type=click.Choice([item.value for item in Shell], case_sensitive=False))
-def shell_init(shell: str) -> None:
+@click.pass_context
+def shell_init(ctx: click.Context, shell: str) -> None:
     """Backward-compatible alias for `pcd shell print`."""
-    click.echo(render_shell_integration(Shell(shell.casefold())), nl=False)
+    click.echo(
+        render_shell_integration(Shell(shell.casefold()), _registered_command_names(ctx)),
+        nl=False,
+    )
 
 
 def _shell_integration(shell: str | None) -> ShellIntegration:
@@ -109,3 +114,11 @@ def _selected_shell(shell: str | None) -> Shell:
         return detect_shell()
     except ShellIntegrationError as exc:
         raise click.UsageError(str(exc)) from exc
+
+
+def _registered_command_names(ctx: click.Context) -> tuple[str, ...]:
+    root = ctx.find_root()
+    if not isinstance(root.command, click.Group):
+        return ()
+
+    return tuple(root.command.list_commands(root))

{pcd_cli-0.2.0 → pcd_cli-0.2.1}/src/pcd_cli/navigation.py

@@ -31,7 +31,7 @@ def navigate_to_project(
         click.echo(f"Project not found{suffix}", err=True)
         raise click.exceptions.Exit(ExitCode.NOT_FOUND)
 
-    selected = matches[0] if len(matches) == 1 else select_project(catalog, matches, query or "")
+    selected = select_project(catalog, matches, query or "")
     if selected is not None:
         _open_project(catalog, selected)
 
@@ -41,10 +41,13 @@ def select_project(
     projects: Sequence[Project],
     query: str = "",
 ) -> Project | None:
-    # Import lazily so shell completion never initializes terminal UI machinery.
-    from pcd_cli.picker import ProjectPicker
+    if len(projects) == 1:
+        return projects[0]
+    else:
+        # Import lazily so shell completion never initializes terminal UI machinery.
+        from pcd_cli.picker import ProjectPicker
 
-    return ProjectPicker(projects, catalog.history.load(), query).run()
+        return ProjectPicker(projects, catalog.history.load(), query).run()
 
 
 def project_completions(value: str) -> list[CompletionItem]:

{pcd_cli-0.2.0 → pcd_cli-0.2.1}/src/pcd_cli/picker.py

@@ -139,4 +139,5 @@ class ProjectPicker:
 
         if len(self.matches) > PAGE_SIZE:
             lines.append(("dim", f"\n{self.selected_index + 1}/{len(self.matches)}\n"))
+
         return lines

{pcd_cli-0.2.0 → pcd_cli-0.2.1}/src/pcd_cli/shell_integration.py

@@ -6,7 +6,7 @@ from dataclasses import dataclass
 from enum import StrEnum
 from pathlib import Path
 from textwrap import dedent
-from typing import Self
+from typing import Literal, Self
 
 from pcd_cli.filesystem import atomic_write, file_lock
 
@@ -160,9 +160,18 @@ def render_managed_block(shell: Shell) -> str:
     return f"{_MANAGED_BLOCK_START}\n{command}\n{_MANAGED_BLOCK_END}\n"
 
 
-def render_shell_integration(shell: Shell) -> str:
+def render_shell_integration(shell: Shell, direct_commands: tuple[str, ...] = ()) -> str:
     """Generate shell integration for directory changes and Click completion."""
-    return _fish() if shell is Shell.FISH else _posix(shell)
+    commands = tuple(sorted(set(direct_commands)))
+    match shell:
+        case Shell.FISH:
+            return _fish(commands)
+        case Shell.BASH:
+            return _posix("bash_source", commands)
+        case Shell.ZSH:
+            return _posix("zsh_source", commands)
+        case _:
+            raise ValueError(f"Unsupported shell: {shell}")
 
 
 def _integration_state(content: str, shell: Shell) -> ShellIntegrationState:
@@ -200,8 +209,8 @@ def _managed_block_bounds(content: str) -> tuple[int, int] | None:
     return start, end
 
 
-def _posix(shell: Shell) -> str:
-    completion = "bash_source" if shell is Shell.BASH else "zsh_source"
+def _posix(completion: Literal["bash_source", "zsh_source"], commands: tuple[str, ...]) -> str:
+    direct_patterns = "|".join(("-*", *commands))
     return dedent(
         f"""\
         pcd() {{
@@ -210,6 +219,18 @@ def _posix(shell: Shell) -> str:
                 return $?
             fi
 
+            if [ "$#" -eq 0 ]; then
+                command pcd
+                return $?
+            fi
+            case "$1" in
+                --project|--project=*) : ;;
+                {direct_patterns})
+                    command pcd "$@"
+                    return $?
+                    ;;
+            esac
+
             local output code
             if output="$({SHELL_MODE_ENV}=1 command pcd "$@")"; then
                 code=0
@@ -234,7 +255,8 @@ def _posix(shell: Shell) -> str:
     )
 
 
-def _fish() -> str:
+def _fish(commands: tuple[str, ...]) -> str:
+    direct_patterns = " ".join(("'-*'", *commands))
     return dedent(
         f"""\
         function pcd
@@ -243,6 +265,18 @@ def _fish() -> str:
                 return $status
             end
 
+            if test (count $argv) -eq 0
+                command pcd
+                return $status
+            end
+            switch $argv[1]
+                case '--project' '--project=*'
+                    true
+                case {direct_patterns}
+                    command pcd $argv
+                    return $status
+            end
+
             set -l output (env {SHELL_MODE_ENV}=1 command pcd $argv)
             set -l code $status
             if test $code -eq {SHELL_CD_EXIT_CODE}