dotman-git 1.2.2__tar.gz → 1.2.3__tar.gz

{dotman_git-1.2.2 → dotman_git-1.2.3}/CHANGELOG.md

@@ -7,11 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.2.2] - 2026-06-10
+## [1.2.3] - 2026-06-11
+
+### Added
+
+- **Interactive symlink handling** — `dot-man add`, `navigate`, and `watch` now detect symlinked config paths and prompt the user with three choices: follow the link (save target content), ignore (skip this path), or ignore all. Deploying also warns when overwriting a symlinked local path.
 
 ### Fixed
 
-- **Python 3.10 CI compatibility** — `dot_man/cli/__init__.py` no longer shadows module names with same-named function imports (`from .discover_cmd import discover_cmd` → `from . import discover_cmd`). On Python 3.10, `unittest.mock.patch` resolves dotted paths via attribute lookup, so the shadowing caused `AttributeError` when test patches tried to access module-level names like `ConfigDetector` on the Click command function instead of the module. (Affected `test_discover_cmd.py`, `test_encrypt_cmd.py`, `test_import_cmd.py`.)
+- **Python 3.10 CI compatibility** — `dot_man/cli/__init__.py` no longer shadows module names with same-named function imports.
 
 ## [1.2.1] - 2026-06-10
 

{dotman_git-1.2.2/dotman_git.egg-info → dotman_git-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotman-git
-Version: 1.2.2
+Version: 1.2.3
 Summary: Dotfile manager with git-powered branching
 Author-email: Bishoy Ehab <beshoyehabhhmm@gmail.com>
 License: MIT
@@ -69,7 +69,7 @@ Dynamic: license-file
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
-[![Coverage](https://img.shields.io/badge/coverage-60%25-green)](https://github.com/BeshoyEhab/dot-man)
+[![Coverage](https://img.shields.io/badge/coverage-83%25-green)](https://github.com/BeshoyEhab/dot-man)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/BeshoyEhab/dot-man/pulls)
 
 ---
@@ -480,10 +480,10 @@ System variables (`{{HOSTNAME}}`, `{{USER}}`, `{{SHELL}}`, etc.) are auto-popula
 
 | Metric | Value |
 |--------|-------|
-| Version | `1.1.1` |
-| Python | `3.9+` |
+| Version | `1.2.3` |
+| Python | `3.10 · 3.11 · 3.12 · 3.13` |
 | Platforms | Linux, macOS |
-| Test Coverage | 59% (869 tests) |
+| Test Coverage | 83% (1519 tests) |
 | Commands | 30+ |
 | PyPI | [`dotman-git`](https://pypi.org/project/dotman-git/) |
 
@@ -512,9 +512,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) and [DEVELOPMENT.md](DEVELOPMENT.md) for
 
 ## Roadmap
 
-- [ ] 80%+ test coverage
+- [x] 80%+ test coverage
 - [ ] Full documentation site (mkdocs)
-- [ ] Symlink mode
+- [x] Symlink mode
 - [x] `dot-man watch` — auto-sync on file change
 - [x] Deploy rollback (transaction-style)
 - [ ] Plugin system

{dotman_git-1.2.2 → dotman_git-1.2.3}/README.md

@@ -12,7 +12,7 @@
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
-[![Coverage](https://img.shields.io/badge/coverage-60%25-green)](https://github.com/BeshoyEhab/dot-man)
+[![Coverage](https://img.shields.io/badge/coverage-83%25-green)](https://github.com/BeshoyEhab/dot-man)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/BeshoyEhab/dot-man/pulls)
 
 ---
@@ -423,10 +423,10 @@ System variables (`{{HOSTNAME}}`, `{{USER}}`, `{{SHELL}}`, etc.) are auto-popula
 
 | Metric | Value |
 |--------|-------|
-| Version | `1.1.1` |
-| Python | `3.9+` |
+| Version | `1.2.3` |
+| Python | `3.10 · 3.11 · 3.12 · 3.13` |
 | Platforms | Linux, macOS |
-| Test Coverage | 59% (869 tests) |
+| Test Coverage | 83% (1519 tests) |
 | Commands | 30+ |
 | PyPI | [`dotman-git`](https://pypi.org/project/dotman-git/) |
 
@@ -455,9 +455,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) and [DEVELOPMENT.md](DEVELOPMENT.md) for
 
 ## Roadmap
 
-- [ ] 80%+ test coverage
+- [x] 80%+ test coverage
 - [ ] Full documentation site (mkdocs)
-- [ ] Symlink mode
+- [x] Symlink mode
 - [x] `dot-man watch` — auto-sync on file change
 - [x] Deploy rollback (transaction-style)
 - [ ] Plugin system

{dotman_git-1.2.2 → dotman_git-1.2.3}/dot_man/__init__.py

@@ -1,4 +1,4 @@
 """dot-man: Dotfile manager with git-powered branching."""
 
-__version__ = "1.2.2"
+__version__ = "1.2.3"
 __author__ = "Bishoy Ehab"

{dotman_git-1.2.2 → dotman_git-1.2.3}/dot_man/branch_ops.py

@@ -54,7 +54,9 @@ class BranchMixin:
 
     @abstractmethod
     def save_all(
-        self, secret_handler: Optional[Callable[[SecretMatch], str]] = None
+        self,
+        secret_handler: Optional[Callable[[SecretMatch], str]] = None,
+        symlink_ignore: Optional[set[Path]] = None,
     ) -> dict[str, Any]: ...
 
     @property
@@ -93,10 +95,17 @@ class BranchMixin:
         target_branch: str,
         dry_run: bool = False,
         secret_handler: Optional[Callable[[SecretMatch], str]] = None,
+        symlink_ignore: Optional[set[Path]] = None,
     ) -> dict:
         """
         Switch to a different branch.
 
+        Args:
+            target_branch: Branch to switch to.
+            dry_run: If True, don't make changes.
+            secret_handler: Optional callback for secret handling.
+            symlink_ignore: Set of symlinked paths to skip when saving.
+
         Returns dict with:
             - saved_count: files saved from current branch
             - deployed_count: files deployed from target branch
@@ -127,7 +136,7 @@ class BranchMixin:
         with lock_context:
             # Phase 1: Save current branch
             if not dry_run:
-                save_result = self.save_all(secret_handler)
+                save_result = self.save_all(secret_handler, symlink_ignore)
                 result["saved_count"] = save_result["saved"]
                 result["secrets_redacted"] = len(save_result["secrets"])
                 result["errors"].extend(save_result["errors"])

{dotman_git-1.2.2 → dotman_git-1.2.3}/dot_man/cli/add_cmd.py

@@ -70,7 +70,18 @@ def add(
         dot-man add ~/.config/hypr --inherits linux-gui --post-deploy "hyprctl reload"
     """
     try:
-        local_path = Path(path).expanduser().resolve()
+        raw_path = Path(path).expanduser()
+
+        # Warn if path is a symlink
+        if raw_path.is_symlink():
+            from ..interactive import prompt_symlink_action
+
+            action = prompt_symlink_action(raw_path)
+            if action in ("ignore", "all_ignore"):
+                warn(f"Skipped symlink: {raw_path}")
+                return
+
+        local_path = raw_path.resolve()
 
         # Auto-generate section name if not provided
         if not section:

{dotman_git-1.2.2 → dotman_git-1.2.3}/dot_man/cli/navigate_cmd.py

@@ -128,6 +128,37 @@ def _warn_symlinks(save_result: dict) -> None:
         )
 
 
+def _prompt_for_symlinks(ops) -> set[Path]:
+    """Scan sections for symlinks and prompt user how to handle each.
+
+    Returns a set of symlinked paths the user chose to ignore.
+    """
+    from ..interactive import prompt_symlink_action
+
+    symlink_ignore: set[Path] = set()
+    ignore_all = False
+
+    for section_name in ops.get_sections():
+        section = ops.get_section(section_name)
+        for path in section.paths:
+            if not path.is_symlink():
+                continue
+            if ignore_all:
+                symlink_ignore.add(path)
+                continue
+            if path in symlink_ignore:
+                continue
+            action = prompt_symlink_action(path)
+            if action == "ignore":
+                symlink_ignore.add(path)
+            elif action == "all_ignore":
+                symlink_ignore.add(path)
+                ignore_all = True
+            # "follow" — no-op, proceed with default behavior
+
+    return symlink_ignore
+
+
 def run_branch_hooks(ops, hook_type: str) -> None:
     """Run on_activate or on_deactivate hooks from sections.
 
@@ -527,7 +558,8 @@ def _handle_commit_navigate(
     if save_mode == "save":
         ui.console.print(f"[bold]Saving current branch '{current_branch}'...[/bold]")
         secret_handler = get_secret_handler()
-        save_result = ops.save_all(secret_handler)
+        symlink_ignore = _prompt_for_symlinks(ops)
+        save_result = ops.save_all(secret_handler, symlink_ignore=symlink_ignore)
         _warn_symlinks(save_result)
         saved_count = save_result["saved"]
         sections = get_changed_sections(ops)
@@ -592,7 +624,8 @@ def _handle_tag_navigate(
     if save_mode == "save":
         ui.console.print(f"[bold]Saving current branch '{current_branch}'...[/bold]")
         secret_handler = get_secret_handler()
-        save_result = ops.save_all(secret_handler)
+        symlink_ignore = _prompt_for_symlinks(ops)
+        save_result = ops.save_all(secret_handler, symlink_ignore=symlink_ignore)
         _warn_symlinks(save_result)
         saved_count = save_result["saved"]
         sections = get_changed_sections(ops)
@@ -670,7 +703,8 @@ def _handle_branch_navigate(
 
     if save_mode == "save":
         secret_handler = get_secret_handler()
-        save_result = ops.save_all(secret_handler)
+        symlink_ignore = _prompt_for_symlinks(ops)
+        save_result = ops.save_all(secret_handler, symlink_ignore=symlink_ignore)
         _warn_symlinks(save_result)
         saved_count = save_result["saved"]
         secrets = save_result["secrets"]

{dotman_git-1.2.2 → dotman_git-1.2.3}/dot_man/cli/watch_cmd.py

@@ -212,6 +212,20 @@ def watch(interval: float, commit: bool, message: str, dry_run: bool):
             warn("No paths to watch.")
             return
 
+        # Scan for symlinks
+        symlink_paths = [p for p in tracked_paths if p.is_symlink()]
+        if symlink_paths:
+            ui.console.print()
+            for sym_path in symlink_paths:
+                target = sym_path.resolve()
+                ui.console.print(
+                    f"  [yellow]⚠ {sym_path} is a symlink → {target}[/yellow]"
+                )
+                ui.console.print(
+                    "  [dim]  Edits affect the symlink target, not the dot-man repo.[/dim]"
+                )
+            ui.console.print()
+
         backend = "watchdog" if _WATCHDOG_AVAILABLE else "polling"
         ui.console.print(
             f"[bold]👁  dot-man watch[/bold]  [dim]({backend} backend)[/dim]"

{dotman_git-1.2.2 → dotman_git-1.2.3}/dot_man/interactive.py

@@ -5,9 +5,11 @@ __all__ = [
     "run_global_wizard",
     "run_templates_wizard",
     "edit_template",
+    "prompt_symlink_action",
 ]
 
 from pathlib import Path
+from typing import cast
 
 import questionary
 from questionary import Style, ValidationError, Validator
@@ -458,3 +460,43 @@ def edit_template(config: DotManConfig, name: str):
             ).ask()
             if val:
                 template["update_strategy"] = val
+
+
+def prompt_symlink_action(path: Path) -> str:
+    """Ask the user how to handle a symlinked config path.
+
+    Args:
+        path: The symlinked path.
+
+    Returns:
+        "follow" to save the symlink target content,
+        "ignore" to skip this path,
+        "all_ignore" to skip this and all remaining symlinks.
+    """
+    target = path.resolve()
+    warn(
+        f"{path} is a symlink to {target}. "
+        "Changes to the repo may not affect the original file."
+    )
+    choice = questionary.select(
+        "How would you like to handle this symlink?",
+        choices=[
+            questionary.Choice(
+                title="Follow the link — save the target file's content into the repo",
+                value="follow",
+            ),
+            questionary.Choice(
+                title="Ignore — don't track this path",
+                value="ignore",
+            ),
+            questionary.Choice(
+                title="Ignore all — skip all symlinked paths in this operation",
+                value="all_ignore",
+            ),
+        ],
+        default="follow",
+        style=custom_style,
+    ).ask()
+    if choice is None:
+        return "follow"
+    return cast(str, choice)

{dotman_git-1.2.2 → dotman_git-1.2.3}/dot_man/save_deploy_ops.py

@@ -216,10 +216,16 @@ class SaveDeployMixin:
         self,
         section: Section,
         secret_handler: Optional[Callable[[SecretMatch], str]] = None,
+        symlink_ignore: Optional[set[Path]] = None,
     ) -> tuple[int, list[SecretMatch], list[str], list[Path]]:
         """
         Save a section from local to repo.
 
+        Args:
+            section: Section to save.
+            secret_handler: Optional callback for secret handling.
+            symlink_ignore: Set of symlinked paths to skip (ignore).
+
         Returns:
             (files_saved, secrets_detected, errors, symlink_paths)
         """
@@ -258,13 +264,17 @@ class SaveDeployMixin:
         # Merge exclude patterns with ignored directories
         final_excludes = self._build_final_excludes(section)
 
+        symlink_ignore = symlink_ignore or set()
+
         for local_path in section.paths:
             if not local_path.exists():
                 continue
 
-            # Warn if path is a symlink (real content lives elsewhere)
+            # If path is a symlink, check if user chose to ignore it
             if local_path.is_symlink():
                 symlink_paths.append(local_path)
+                if local_path in symlink_ignore:
+                    continue
 
             repo_path = section.get_repo_path(local_path, REPO_DIR)
 
@@ -316,6 +326,12 @@ class SaveDeployMixin:
         for local_path in section.paths:
             repo_path = section.get_repo_path(local_path, REPO_DIR)
 
+            if local_path.is_symlink():
+                errors.append(
+                    f"⚠ {local_path} is a symlink → {local_path.resolve()}. "
+                    f"Deploy will overwrite it with a regular file."
+                )
+
             if section.update_strategy == "ignore" and local_path.exists():
                 continue
 
@@ -431,7 +447,9 @@ class SaveDeployMixin:
         }
 
     def save_all(
-        self, secret_handler: Optional[Callable[[SecretMatch], str]] = None
+        self,
+        secret_handler: Optional[Callable[[SecretMatch], str]] = None,
+        symlink_ignore: Optional[set[Path]] = None,
     ) -> dict:
         """
         Save all sections from local to repo.
@@ -447,7 +465,9 @@ class SaveDeployMixin:
 
             with self.vault.batch(), ThreadPoolExecutor() as executor:
                 future_to_section = {
-                    executor.submit(self.save_section, section, secret_handler): section
+                    executor.submit(
+                        self.save_section, section, secret_handler, symlink_ignore
+                    ): section
                     for section in sections
                 }
 

{dotman_git-1.2.2 → dotman_git-1.2.3/dotman_git.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotman-git
-Version: 1.2.2
+Version: 1.2.3
 Summary: Dotfile manager with git-powered branching
 Author-email: Bishoy Ehab <beshoyehabhhmm@gmail.com>
 License: MIT
@@ -69,7 +69,7 @@ Dynamic: license-file
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
 [![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 [![Checked with mypy](https://www.mypy-lang.org/static/mypy_badge.svg)](https://mypy-lang.org/)
-[![Coverage](https://img.shields.io/badge/coverage-60%25-green)](https://github.com/BeshoyEhab/dot-man)
+[![Coverage](https://img.shields.io/badge/coverage-83%25-green)](https://github.com/BeshoyEhab/dot-man)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/BeshoyEhab/dot-man/pulls)
 
 ---
@@ -480,10 +480,10 @@ System variables (`{{HOSTNAME}}`, `{{USER}}`, `{{SHELL}}`, etc.) are auto-popula
 
 | Metric | Value |
 |--------|-------|
-| Version | `1.1.1` |
-| Python | `3.9+` |
+| Version | `1.2.3` |
+| Python | `3.10 · 3.11 · 3.12 · 3.13` |
 | Platforms | Linux, macOS |
-| Test Coverage | 59% (869 tests) |
+| Test Coverage | 83% (1519 tests) |
 | Commands | 30+ |
 | PyPI | [`dotman-git`](https://pypi.org/project/dotman-git/) |
 
@@ -512,9 +512,9 @@ See [CONTRIBUTING.md](CONTRIBUTING.md) and [DEVELOPMENT.md](DEVELOPMENT.md) for
 
 ## Roadmap
 
-- [ ] 80%+ test coverage
+- [x] 80%+ test coverage
 - [ ] Full documentation site (mkdocs)
-- [ ] Symlink mode
+- [x] Symlink mode
 - [x] `dot-man watch` — auto-sync on file change
 - [x] Deploy rollback (transaction-style)
 - [ ] Plugin system

{dotman_git-1.2.2 → dotman_git-1.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "dotman-git"
-version = "1.2.2"
+version = "1.2.3"
 description = "Dotfile manager with git-powered branching"
 readme = "README.md"
 requires-python = ">=3.9"

{dotman_git-1.2.2 → dotman_git-1.2.3}/tests/test_add_cmd.py

@@ -94,6 +94,71 @@ class TestAddWithInit:
 
         assert result.exit_code in [0, 1, 7]
 
+    def test_add_symlink_follows(self, clean_env):
+        """Add follows a symlink when prompt returns 'follow'."""
+        runner, dot_man_dir, repo_dir, global_toml, home = clean_env
+
+        # Create minimal global config
+        if not global_toml.parent.exists():
+            global_toml.parent.mkdir(parents=True)
+        global_toml.write_text("[defaults]\n")
+
+        from git import Repo
+
+        repo = Repo.init(repo_dir)
+        config_writer = repo.config_writer()
+        config_writer.set_value("user", "name", "Test")
+        config_writer.set_value("user", "email", "test@test.com")
+        config_writer.release()
+
+        (repo_dir / "test.txt").write_text("test")
+        repo.index.add(["test.txt"])
+        repo.index.commit("Initial")
+
+        target = home / "real_config.txt"
+        target.write_text("real content")
+
+        link = home / ".linked_config"
+        link.symlink_to(target)
+
+        with patch("dot_man.interactive.prompt_symlink_action", return_value="follow"):
+            result = runner.invoke(cli, ["add", str(link)])
+
+        assert result.exit_code in [0, 1, 7]
+
+    def test_add_symlink_ignore(self, clean_env):
+        """Add skips a symlink when prompt returns 'ignore'."""
+        runner, dot_man_dir, repo_dir, global_toml, home = clean_env
+
+        # Create minimal global config
+        if not global_toml.parent.exists():
+            global_toml.parent.mkdir(parents=True)
+        global_toml.write_text("[defaults]\n")
+
+        from git import Repo
+
+        repo = Repo.init(repo_dir)
+        config_writer = repo.config_writer()
+        config_writer.set_value("user", "name", "Test")
+        config_writer.set_value("user", "email", "test@test.com")
+        config_writer.release()
+
+        (repo_dir / "test.txt").write_text("test")
+        repo.index.add(["test.txt"])
+        repo.index.commit("Initial")
+
+        target = home / "real_config.txt"
+        target.write_text("real content")
+
+        link = home / ".linked_config"
+        link.symlink_to(target)
+
+        with patch("dot_man.interactive.prompt_symlink_action", return_value="ignore"):
+            result = runner.invoke(cli, ["add", str(link)])
+
+        assert result.exit_code == 0
+        assert "Skipped symlink" in result.output
+
     def test_add_directory(self, clean_env):
         """Add a directory to tracking."""
         runner, dot_man_dir, repo_dir, global_toml, home = clean_env

{dotman_git-1.2.2 → dotman_git-1.2.3}/tests/test_branch_ops.py

@@ -30,7 +30,7 @@ class FakeOps(BranchMixin):
     def current_branch(self) -> str:
         return self._current_branch
 
-    def save_all(self, secret_handler=None):
+    def save_all(self, secret_handler=None, symlink_ignore=None):
         return self._save_all_result
 
     @property