refactor: rename _is_excluded_skill_path to _is_excluded_resource_path

This function and EXCLUDED_DIRS are used by generic resource discovery
functions that handle both skills and ralphs, but still had "skill" in
their names from before the generification. Rename to accurately reflect
their generic purpose.

Co-authored-by: Ralphify <noreply@ralphify.co>

Author: 2 people

agr/skill.py

@@ -22,7 +22,7 @@
 # no leading/trailing/consecutive hyphens.
 _VALID_SKILL_NAME_RE = re.compile(r"^[a-z0-9]+(-[a-z0-9]+)*$")
 
-# Directories to exclude from skill discovery
+# Directories to exclude from resource discovery (skills, ralphs, etc.)
 EXCLUDED_DIRS = {
     ".git",
     "node_modules",
@@ -50,31 +50,31 @@ def _shallowest(paths: list[_P]) -> _P:
     return min(paths, key=lambda p: len(p.parts))
 
 
-def _is_excluded_skill_path(parts: tuple[str, ...]) -> bool:
-    """Check if a relative SKILL.md path should be excluded from discovery.
+def _is_excluded_resource_path(parts: tuple[str, ...]) -> bool:
+    """Check if a relative marker-file path should be excluded from discovery.
 
     Centralizes the two exclusion rules shared by both filesystem and
-    git-listing discovery:
+    git-listing discovery for all resource types (skills, ralphs, etc.):
 
-    1. Root-level SKILL.md (single component, e.g. just ``SKILL.md``)
-       is a repo marker, not a skill directory.
+    1. Root-level marker (single component, e.g. just ``SKILL.md``)
+       is a repo marker, not a resource directory.
     2. Any **ancestor** directory matching ``EXCLUDED_DIRS`` (.git,
        node_modules, __pycache__, etc.) disqualifies the entry.
-       The skill directory itself (``parts[-2]``) is NOT checked —
-       a skill legitimately named ``build`` or ``dist`` should be
+       The resource directory itself (``parts[-2]``) is NOT checked —
+       a resource legitimately named ``build`` or ``dist`` should be
        discoverable.
 
     Args:
         parts: Components of the path *relative to the repo root*
             (e.g. ``("skills", "my-skill", "SKILL.md")``).
 
     Returns:
-        True if the path should be excluded from skill discovery.
+        True if the path should be excluded from resource discovery.
     """
     if len(parts) == 1:
         return True
-    # parts[-1] is the marker file, parts[-2] is the skill directory.
-    # Only check ancestor directories above the skill directory.
+    # parts[-1] is the marker file, parts[-2] is the resource directory.
+    # Only check ancestor directories above the resource directory.
     ancestors = parts[:-2]
     return any(part in EXCLUDED_DIRS for part in ancestors)
 
@@ -99,7 +99,7 @@ def _find_resource_dirs(repo_dir: Path, marker: str) -> list[Path]:
     dirs: list[Path] = []
     for marker_path in repo_dir.rglob(marker):
         rel = marker_path.relative_to(repo_dir)
-        if _is_excluded_skill_path(rel.parts):
+        if _is_excluded_resource_path(rel.parts):
             continue
         dirs.append(marker_path.parent)
     return dirs
@@ -122,7 +122,7 @@ def _find_resource_dirs_in_listing(
         rel_path = PurePosixPath(rel)
         if rel_path.name != marker:
             continue
-        if _is_excluded_skill_path(rel_path.parts):
+        if _is_excluded_resource_path(rel_path.parts):
             continue
         results.append(rel_path.parent)
     return results

tests/test_skill.py

@@ -4,7 +4,7 @@
 
 from agr.skill import (
     SKILL_MARKER,
-    _is_excluded_skill_path,
+    _is_excluded_resource_path,
     create_skill_scaffold,
     discover_skills_in_repo_listing,
     find_skill_in_repo,
@@ -428,41 +428,41 @@ def test_excludes_root_and_excluded_dirs(self):
         assert result["commit"].as_posix() == "skills/commit"
 
 
-class TestIsExcludedSkillPath:
-    """Tests for _is_excluded_skill_path — the shared exclusion predicate."""
+class TestIsExcludedResourcePath:
+    """Tests for _is_excluded_resource_path — the shared exclusion predicate."""
 
     def test_root_level_skill_md_excluded(self):
         """A single-component path (root SKILL.md) is excluded."""
-        assert _is_excluded_skill_path(("SKILL.md",)) is True
+        assert _is_excluded_resource_path(("SKILL.md",)) is True
 
     def test_nested_skill_md_not_excluded(self):
         """A normal skill path like skills/my-skill/SKILL.md is included."""
-        assert _is_excluded_skill_path(("skills", "my-skill", "SKILL.md")) is False
+        assert _is_excluded_resource_path(("skills", "my-skill", "SKILL.md")) is False
 
     def test_git_dir_excluded(self):
         """Paths under .git are excluded."""
-        assert _is_excluded_skill_path((".git", "hooks", "SKILL.md")) is True
+        assert _is_excluded_resource_path((".git", "hooks", "SKILL.md")) is True
 
     def test_node_modules_excluded(self):
         """Paths under node_modules are excluded."""
-        assert _is_excluded_skill_path(("node_modules", "pkg", "SKILL.md")) is True
+        assert _is_excluded_resource_path(("node_modules", "pkg", "SKILL.md")) is True
 
     def test_pycache_excluded(self):
         """Paths under __pycache__ are excluded."""
-        assert _is_excluded_skill_path(("__pycache__", "my-skill", "SKILL.md")) is True
+        assert _is_excluded_resource_path(("__pycache__", "my-skill", "SKILL.md")) is True
 
     def test_venv_excluded(self):
         """Paths under .venv are excluded."""
-        assert _is_excluded_skill_path((".venv", "lib", "SKILL.md")) is True
+        assert _is_excluded_resource_path((".venv", "lib", "SKILL.md")) is True
 
     def test_build_dir_excluded(self):
         """Paths under build/ are excluded."""
-        assert _is_excluded_skill_path(("build", "output", "SKILL.md")) is True
+        assert _is_excluded_resource_path(("build", "output", "SKILL.md")) is True
 
     def test_excluded_dir_deep_in_path(self):
         """An excluded dir anywhere in the path triggers exclusion."""
         assert (
-            _is_excluded_skill_path(("a", "b", "node_modules", "c", "SKILL.md")) is True
+            _is_excluded_resource_path(("a", "b", "node_modules", "c", "SKILL.md")) is True
         )
 
     def test_skill_named_as_excluded_dir_not_excluded(self):
@@ -473,16 +473,16 @@ def test_skill_named_as_excluded_dir_not_excluded(self):
         legitimate skill named "build", not a build artifact.
         """
         # "build" is the skill directory (parts[-2]), "skills" is an ancestor
-        assert _is_excluded_skill_path(("skills", "build", "SKILL.md")) is False
+        assert _is_excluded_resource_path(("skills", "build", "SKILL.md")) is False
         # Same for other excluded names used as skill directories
-        assert _is_excluded_skill_path(("skills", "dist", "SKILL.md")) is False
-        assert _is_excluded_skill_path(("skills", "vendor", "SKILL.md")) is False
+        assert _is_excluded_resource_path(("skills", "dist", "SKILL.md")) is False
+        assert _is_excluded_resource_path(("skills", "vendor", "SKILL.md")) is False
 
     def test_skill_named_as_excluded_dir_at_top_level(self):
         """A top-level skill named after an excluded dir should NOT be excluded."""
-        assert _is_excluded_skill_path(("build", "SKILL.md")) is False
-        assert _is_excluded_skill_path(("dist", "SKILL.md")) is False
+        assert _is_excluded_resource_path(("build", "SKILL.md")) is False
+        assert _is_excluded_resource_path(("dist", "SKILL.md")) is False
 
     def test_empty_tuple_not_excluded(self):
         """Edge case: empty parts tuple is not excluded (no excluded dir check)."""
-        assert _is_excluded_skill_path(()) is False
+        assert _is_excluded_resource_path(()) is False