devstuff 1.14.0__tar.gz → 1.14.2__tar.gz

{devstuff-1.14.0 → devstuff-1.14.2}/CHANGELOG.md

@@ -1,3 +1,15 @@
+## v1.14.2 (2026-07-12)
+
+### Fix
+
+- make interactive prompts abortable with Ctrl+C/Ctrl+D
+
+## v1.14.1 (2026-07-12)
+
+### Fix
+
+- discover skills by SKILL.md marker, not just a skills/ folder
+
 ## v1.14.0 (2026-07-12)
 
 ### Feat

{devstuff-1.14.0 → devstuff-1.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: devstuff
-Version: 1.14.0
+Version: 1.14.2
 Summary: Development environment setup CLI for Linux
 Project-URL: Repository, https://github.com/thesawdawg/dev-setup-py
 Author-email: Sawyer <sawyerksu@gmail.com>

{devstuff-1.14.0 → devstuff-1.14.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "devstuff"
-version = "1.14.0"
+version = "1.14.2"
 description = "Development environment setup CLI for Linux"
 readme = "README.md"
 requires-python = ">=3.11"

{devstuff-1.14.0 → devstuff-1.14.2}/src/dev_setup/commands/help_cmd.py

@@ -19,7 +19,7 @@ def print_help() -> None:
         ("docs",    "<package>",                              "Open documentation in browser"),
         ("run",     "<function> [args...]",                   "Run a function/script"),
         ("functions", "<list|enable|disable|path>",           "Manage functions/scripts"),
-        ("skills",  "add",                                    "Append skills from a GitHub repo to claude/codex/pi"),
+        ("skills",  "add",                                    "Append GitHub skills to claude/codex/pi"),
         ("version", "",                                        "Show version"),
     ]
     for cmd, args, desc in rows:

{devstuff-1.14.0 → devstuff-1.14.2}/src/dev_setup/commands/install_cmd.py

@@ -102,12 +102,11 @@ def _install_interactive() -> None:
                 disabled=disabled,
             ))
 
-    selected = questionary.checkbox(
+    selected = ui.checkbox(
         "Select packages to install:",
         choices=choices,
         instruction="(Space toggle · Enter confirm · installed items are skipped)",
-        style=ui._STYLE,
-    ).ask()
+    )
 
     if not selected:
         ui.info("No packages selected.")

{devstuff-1.14.0 → devstuff-1.14.2}/src/dev_setup/commands/skills_cmd.py

@@ -112,10 +112,7 @@ def _clone_repo(repo: str, dest: Path) -> str | None:
         return ssh_url
 
     if auth_method == "Personal access token":
-        token = questionary.password("GitHub personal access token:").ask()
-        if not token:
-            ui.warn("No token provided — aborted.")
-            return None
+        token = ui.password("GitHub personal access token:")
         owner_repo = _owner_repo(repo)
         token_url = f"https://x-access-token:{token}@github.com/{owner_repo}.git"
         with ui.spinner("Cloning with token..."):
@@ -168,8 +165,34 @@ def _to_ssh_url(repo: str) -> str:
     return f"git@github.com:{_owner_repo(repo)}.git"
 
 
+def _find_skill_dirs(root: Path) -> list[Path]:
+    """Recursively find directories marked as skills by a SKILL.md file.
+
+    Does not descend into a directory once it's identified as a skill, since
+    a skill's own subdirectories (scripts/, references/) aren't skills.
+    """
+    found: list[Path] = []
+
+    def _walk(d: Path) -> None:
+        if d.name == ".git":
+            return
+        if (d / "SKILL.md").is_file():
+            found.append(d)
+            return
+        for child in d.iterdir():
+            if child.is_dir():
+                _walk(child)
+
+    _walk(root)
+    return sorted(found)
+
+
 def _discover_skills(repo_dir: Path, repo: str) -> list[Path]:
     """Return the list of skill directories found in a cloned repo."""
+    by_marker = _find_skill_dirs(repo_dir)
+    if by_marker:
+        return by_marker
+
     skills_root = repo_dir / "skills"
     if skills_root.is_dir():
         return sorted(
@@ -177,7 +200,8 @@ def _discover_skills(repo_dir: Path, repo: str) -> list[Path]:
             if p.is_dir() and not p.name.startswith(".")
         )
 
-    # No skills/ subdir — if the repo root looks like a single skill, use it.
+    # No SKILL.md markers or skills/ subdir — if the repo root looks like a
+    # single skill, use it.
     has_content = any(
         p.name not in (".git",) for p in repo_dir.iterdir()
     )

{devstuff-1.14.0 → devstuff-1.14.2}/src/dev_setup/commands/update_cmd.py

@@ -124,12 +124,11 @@ def _update_interactive() -> None:
         ]
         choices.append(questionary.Choice(title=title, value=t.key, checked=status.available is True))
 
-    selected = questionary.checkbox(
+    selected = ui.checkbox(
         "Select packages to update:",
         choices=choices,
         instruction="(Space toggle · Enter confirm · pre-checked items have a known update)",
-        style=ui._STYLE,
-    ).ask()
+    )
 
     if not selected:
         ui.info("No packages selected.")

{devstuff-1.14.0 → devstuff-1.14.2}/src/dev_setup/ui.py

@@ -75,14 +75,24 @@ def spinner(label: str) -> Generator[None, None, None]:
         yield
 
 
+def _ask(question) -> object:
+    """Run a questionary prompt via unsafe_ask() so Ctrl+C/Ctrl+D raise
+    KeyboardInterrupt/EOFError instead of being swallowed into a None return
+    (questionary's default .ask() catches KeyboardInterrupt and retries
+    silently, which makes required prompts impossible to cancel). Click's
+    top-level command dispatch already catches both and exits cleanly with
+    "Aborted!", so letting them propagate is enough."""
+    return question.unsafe_ask()
+
+
 def confirm(prompt: str, default: bool = False) -> bool:
-    result = questionary.confirm(prompt, default=default, style=_STYLE).ask()
+    result = _ask(questionary.confirm(prompt, default=default, style=_STYLE))
     return bool(result)
 
 
 def text_input(prompt: str, default: str = "", required: bool = False) -> str:
     while True:
-        result = questionary.text(prompt, default=default, style=_STYLE).ask()
+        result = _ask(questionary.text(prompt, default=default, style=_STYLE))
         val = (result or "").strip()
         if val or not required:
             return val
@@ -90,15 +100,20 @@ def text_input(prompt: str, default: str = "", required: bool = False) -> str:
 
 
 def select(prompt: str, choices: list[str]) -> str:
-    result = questionary.select(prompt, choices=choices, style=_STYLE).ask()
+    result = _ask(questionary.select(prompt, choices=choices, style=_STYLE))
     return result or ""
 
 
-def checkbox(prompt: str, choices: list) -> list:
-    result = questionary.checkbox(prompt, choices=choices, style=_STYLE).ask()
+def checkbox(prompt: str, choices: list, **kwargs) -> list:
+    result = _ask(questionary.checkbox(prompt, choices=choices, style=_STYLE, **kwargs))
     return result or []
 
 
+def password(prompt: str) -> str:
+    result = _ask(questionary.password(prompt, style=_STYLE))
+    return result or ""
+
+
 def code_block(code: str, language: str = "bash") -> None:
     """Print a syntax-highlighted code panel."""
     from rich.syntax import Syntax

{devstuff-1.14.0 → devstuff-1.14.2}/uv.lock

@@ -167,7 +167,7 @@ wheels = [
 
 [[package]]
 name = "devstuff"
-version = "1.14.0"
+version = "1.14.2"
 source = { editable = "." }
 dependencies = [
     { name = "click" },