modern-python-guidance 0.4.1__tar.gz → 0.4.2__tar.gz

{modern_python_guidance-0.4.1 → modern_python_guidance-0.4.2}/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.4.2] — 2026-06-04
+
+### Fixed
+
+- `_find_project_root()` escaping to `$HOME` when `~/.claude/` exists but the repo has no `.claude/` directory. Marker search is now per-level (nearest ancestor with any marker wins) instead of per-marker-type. If you previously ran `mpg setup` and have stale symlinks at `~/.claude/skills/modern-python-guidance` or `~/.claude/rules/modern-python.md`, remove them manually. (closes #90)
+
 ## [0.4.1] — 2026-06-03
 
 ### Added

{modern_python_guidance-0.4.1 → modern_python_guidance-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modern-python-guidance
-Version: 0.4.1
+Version: 0.4.2
 Summary: Version-aware BAD/GOOD pattern guides that help AI coding agents generate modern Python
 Project-URL: Homepage, https://github.com/yottayoshida/modern-python-guidance
 Project-URL: Repository, https://github.com/yottayoshida/modern-python-guidance

{modern_python_guidance-0.4.1 → modern_python_guidance-0.4.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "modern-python-guidance"
-version = "0.4.1"
+version = "0.4.2"
 description = "Version-aware BAD/GOOD pattern guides that help AI coding agents generate modern Python"
 readme = "README.md"
 license = "Apache-2.0 OR MIT"

{modern_python_guidance-0.4.1 → modern_python_guidance-0.4.2}/src/modern_python_guidance/__init__.py

@@ -1,3 +1,3 @@
 """Modern Python Guidance — version-aware BAD/GOOD pattern guides for AI coding agents."""
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"

{modern_python_guidance-0.4.1 → modern_python_guidance-0.4.2}/src/modern_python_guidance/setup_cmd.py

@@ -61,20 +61,19 @@ def _find_rule_source() -> Path:
 
 
 def _find_project_root(start: Path | None = None) -> Path:
-    """Walk upward from *start* to find the project root."""
+    """Walk upward; return the nearest ancestor containing any marker."""
     current = (start or Path.cwd()).resolve()
-    markers = [".claude", ".git", "pyproject.toml"]
+    markers = [".git", "pyproject.toml", ".claude"]
 
-    for marker in markers:
-        d = current
-        while True:
-            candidate = d / marker
-            if candidate.exists():
+    d = current
+    while True:
+        for marker in markers:
+            if (d / marker).exists():
                 return d
-            parent = d.parent
-            if parent == d:
-                break
-            d = parent
+        parent = d.parent
+        if parent == d:
+            break
+        d = parent
 
     return current
 

{modern_python_guidance-0.4.1 → modern_python_guidance-0.4.2}/tests/test_setup.py

@@ -59,13 +59,31 @@ class TestFindProjectRoot:
         sub.mkdir(parents=True)
         assert _find_project_root(sub) == tmp_path
 
-    def test_claude_takes_priority_over_git(self, tmp_path: Path):
-        """.claude/ at parent wins over .git/ at child (higher-priority marker)."""
+    def test_nearest_marker_wins(self, tmp_path: Path):
+        """Nearest ancestor with any marker wins over distant ancestor."""
         (tmp_path / ".claude").mkdir()
         child = tmp_path / "child"
         child.mkdir()
         (child / ".git").mkdir()
-        assert _find_project_root(child) == tmp_path
+        assert _find_project_root(child) == child
+
+    def test_bug_repro_home_claude_escapes(self, tmp_path: Path):
+        """V-001: .claude at home + .git at repo -> repo wins, not home."""
+        home = tmp_path / "home"
+        (home / ".claude").mkdir(parents=True)
+        repo = home / "projects" / "repo"
+        repo.mkdir(parents=True)
+        (repo / ".git").mkdir()
+        src = repo / "src"
+        src.mkdir()
+        assert _find_project_root(src) == repo
+
+    def test_git_as_file(self, tmp_path: Path):
+        """V-008: .git as a file (worktree/submodule) is detected."""
+        (tmp_path / ".git").write_text("gitdir: /some/other/path")
+        sub = tmp_path / "src"
+        sub.mkdir()
+        assert _find_project_root(sub) == tmp_path
 
     def test_falls_back_to_cwd(self, tmp_path: Path):
         bare = tmp_path / "empty"
@@ -308,6 +326,24 @@ class TestSetupSkills:
         err = capsys.readouterr().err
         assert "'" in err or '"' in err
 
+    def test_autodetect_avoids_home_escape(self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch):
+        """setup_skills auto-discovers repo root, not distant ~/.claude."""
+        source = self._make_source(tmp_path)
+        home = tmp_path / "home"
+        (home / ".claude").mkdir(parents=True)
+        repo = home / "projects" / "repo"
+        repo.mkdir(parents=True)
+        (repo / ".git").mkdir()
+
+        monkeypatch.chdir(repo)
+        with patch("modern_python_guidance.setup_cmd._find_skills_dir", return_value=source):
+            ok = setup_skills()
+
+        assert ok is True
+        link = repo / ".claude" / "skills" / "modern-python-guidance"
+        assert link.is_symlink()
+        assert not (home / ".claude" / "skills" / "modern-python-guidance").exists()
+
     def test_dry_run(self, tmp_path: Path, capsys: pytest.CaptureFixture[str]):
         """V-010: dry-run does not create symlink."""
         source = self._make_source(tmp_path)

{modern_python_guidance-0.4.1 → modern_python_guidance-0.4.2}/tests/test_uninstall.py

@@ -248,6 +248,27 @@ class TestUninstallSkills:
         assert link.is_symlink()  # still there
         assert "Would remove" in capsys.readouterr().out
 
+    def test_resolves_correct_root_not_distant_ancestor(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ):
+        """V-009: uninstall resolves nearest project root, not distant ancestor."""
+        home = tmp_path / "home"
+        (home / ".claude" / "skills" / "modern-python-guidance").mkdir(parents=True)
+        repo = home / "projects" / "repo"
+        repo.mkdir(parents=True)
+        (repo / ".git").mkdir()
+        link = repo / ".claude" / "skills" / "modern-python-guidance"
+        link.parent.mkdir(parents=True)
+        os.symlink(tmp_path / "pkg_skills", link)
+
+        monkeypatch.chdir(repo)
+        ok = uninstall_skills()
+
+        assert ok is True
+        assert not link.is_symlink()
+        # Home-level skills dir must be untouched
+        assert (home / ".claude" / "skills" / "modern-python-guidance").is_dir()
+
     def test_non_symlink_path_quoted(self, tmp_path: Path, capsys):
         """V-028: rm hint uses shell-safe quoting for paths with spaces."""
         project = tmp_path / "my project"