dotman-git 1.1.0__tar.gz → 1.2.0__tar.gz

{dotman_git-1.1.0 → dotman_git-1.2.0}/CHANGELOG.md

@@ -110,11 +110,67 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - `checkout` → Use `navigate` instead
 - `tag switch` → Use `navigate` instead
 
-## [Unreleased]
+## [1.2.0] - 2026-06-09
 
 ### Added
-- **`dot-man watch`** — auto-save tracked dotfiles on change (watchdog or polling backend, debounced commits, `--no-commit` / `--dry-run` flags)
-- **`dot-man rollback`** — transaction-style rollback to any previous commit, tag, or `HEAD~N`; shows coloured diff, auto-backs up before rolling back
+- **Generalized placeholder system in hooks** — `{qs_config}` replaced with `{config_name}`, `{config_root}`, `{section_name}`, `{paths}`, `{branch}`
+- **Shell completions** — `encrypt <section>`, `export --branch`, `rollback <target>`
+- **Custom Secret Patterns** — Support defining custom regex patterns for secret detection in config
+- **Secret Scanner Customization** — `use_default_patterns = false` to disable built-in patterns
+- **Symlink Deploy Mode** — per-section `deploy_method = "symlink"` for edit-in-place workflows
+- **Quickshell Hook Aliases** — `quickshell_reload`, `quickshell_restart`, `quickshell_validate` with `{qs_config}` → `{config_name}` placeholder
+- **`complete_sections()`** — shell completion callback for section names
 
 ### Changed
-- README completely overhauled: badges, shields, architecture diagram, full command reference tables, TOML/YAML config examples
+- **`switch_cmd` consolidated → thin wrapper** — `switch` is now a 17-line wrapper calling `_navigate_impl()` (~80% code reduction)
+- **`BranchParamType` deduplicated** — moved from `switch_cmd.py`/`navigate_cmd.py` to `common.py`
+- **Schema keys deduplicated** — `VALID_SECTION_KEYS` defined once in `dotman_config.py`
+- **`HOOK_ALIASES` unified** — `constants.py` is canonical; `merge.py` imports from it
+- **Silent `except: pass` cleanup** — `logging.debug()`/`logging.warning()` added to 11+ bare exceptions across `common.py`, `navigate_cmd.py`, `rollback_cmd.py`, `core.py`, `files.py`, `init_cmd.py`
+- **Production `assert` statements removed** — all replaced with `if/error()` pattern in `navigate_cmd.py`, `encrypt_cmd.py`, `import_cmd.py`, `rollback_cmd.py`
+- **Coverage improved from 60% → 66%** — 1146 tests (up from 1021), 1 skipped
+
+### Fixed
+- **Weak `>=` assertions** in `test_section.py`, `test_save_deploy_ops.py`, `test_status_ops.py`, `test_core_extended.py`, and 4 new test files
+- **Missing f-string prefix** in `dotman_config.py:96`
+- **Stale `dot-man.ini` reference** in `status_ops.py:158`
+
+### New Tests
+| File | Tests | Coverage Impact |
+|------|-------|-----------------|
+| `test_files_comprehensive.py` | 55 | `files.py` 73% → 94% |
+| `test_branch_ops.py` | 39 | `branch_ops.py` 40% → 97% |
+| `test_encryption.py` | 32 | `encryption.py` 33% → 100% |
+| `test_completions_cmd.py` | 10 | `completions_cmd.py` 12% → 94% |
+| `test_shell_completions.py` | 7 | Shell completions verified |
+| `test_section.py` | 39 (+36) | `section.py` 70% → 95% |
+| `test_save_deploy_ops.py` | 26 | `save_deploy_ops.py` 52% → 75% |
+| `test_status_ops.py` | 17 | `status_ops.py` 59% → 89% |
+| `test_core_extended.py` | 46 | `core.py` 58% → 66% |
+
+## [1.1.1] - 2026-05-20
+
+### Added
+- **PyPI Publication** - Official release published to PyPI as `dotman-git`.
+- **Command Aliases** - Short 3-letter command aliases added for all major operations:
+  - `nav` (navigate), `doc` (doctor), `dep` (deploy), `enc` (encrypt)
+  - `exp` (export), `imp` (import), `dis` (discover), `aud` (audit)
+  - `cln` (clean), `ver` (verify), `rev` (revert), `rol` (rollback)
+  - `wat` (watch), `cpl` (completions), `rst` (restore), `edt` (edit)
+  - `sta` (status), `ini` (init), `syn` (sync), `log` (log), `dif` (diff)
+  - `hks` (hooks)
+- **`dot-man watch`** — Auto-save tracked dotfiles on change (supporting both watchdog and polling backends, debounced commits, and `--no-commit`/`--dry-run` flags).
+- **`dot-man rollback`** — Transaction-style rollback to any previous commit, tag, or `HEAD~N`, with colored diffs and automatic pre-rollback backups.
+- **YAML Comment Preservation** - Added round-trip YAML configuration comment and layout preservation using `ruamel.yaml`.
+
+### Changed
+- **README Overhaul** - Redesigned README with project badges, architecture diagrams, config examples (TOML/YAML), and command reference tables.
+- **License & Copyright** - Updated license with additional copyright holder (ZVAXEROWS) and copyright years to 2025, 2026.
+
+### Fixed
+- **Profile Switch & Serialization** - Resolved a traceback in `profile switch` by properly parsing branch parameters for `ctx.invoke`.
+- **Global Config Save** - Defaulted `GlobalConfig.save()` to write to disk (`force=True`) to prevent silent save failures across CLI commands.
+- **TOML Serialization of None** - Prevented `tomlkit` ConvertError by omitting the `inherits` key if its value is `None` during profile creation.
+- **YAML Configuration Overwrites** - Resolved a bug where editing configuration fields would silently convert YAML files back to TOML on save.
+- **TOML/YAML Comment Preservation & Key Deletions** - Fixed a bug in document updates where deleted configuration keys were not removed from the saved file, and added value equality checks to prevent losing comments on sequence fields.
+- **Integration Tests** - Added robust test cases covering the complete `profile switch` flow, validating branch switching, warnings, inheritance, and error handling.

{dotman_git-1.1.0 → dotman_git-1.2.0}/CONTRIBUTING.md

@@ -27,7 +27,7 @@ pytest tests/ -v
 dot-man/
 ├── dot_man/              # Main package (20 modules)
 │   ├── __init__.py       # Package version
-│   ├── cli/              # CLI commands (Click-based, 24 files)
+│   ├── cli/              # CLI commands (Click-based, 28 files)
 │   │   ├── main.py       # Entry point: calls cli()
 │   │   ├── interface.py  # Click group definition (DotManGroup)
 │   │   ├── common.py     # Shared utilities: require_init, completions,

{dotman_git-1.1.0 → dotman_git-1.2.0}/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 BeshoyEhab
+Copyright (c) 2025, 2026 BeshoyEhab, ZVAXEROWS
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

{dotman_git-1.1.0 → dotman_git-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotman-git
-Version: 1.1.0
+Version: 1.2.0
 Summary: Dotfile manager with git-powered branching
 Author-email: Bishoy Ehab <beshoyehabhhmm@gmail.com>
 License: MIT
@@ -38,6 +38,7 @@ Requires-Dist: tomlkit>=0.12.0
 Requires-Dist: questionary>=2.0.0
 Provides-Extra: yaml
 Requires-Dist: pyyaml>=6.0; extra == "yaml"
+Requires-Dist: ruamel.yaml>=0.17.0; extra == "yaml"
 Provides-Extra: tui
 Requires-Dist: textual>=0.73.0; extra == "tui"
 Provides-Extra: watch
@@ -45,11 +46,13 @@ Requires-Dist: watchdog>=4.0; extra == "watch"
 Provides-Extra: dev
 Requires-Dist: pytest>=8.3.5; extra == "dev"
 Requires-Dist: pytest-cov>=5.0.0; extra == "dev"
+Requires-Dist: pytest-mock>=3.14.0; extra == "dev"
 Requires-Dist: black>=24.8.0; extra == "dev"
 Requires-Dist: mypy>=1.14.1; extra == "dev"
 Requires-Dist: textual>=0.73.0; extra == "dev"
 Requires-Dist: ruff>=0.4.0; extra == "dev"
 Requires-Dist: pre-commit>=3.0.0; extra == "dev"
+Requires-Dist: ruamel.yaml>=0.17.0; extra == "dev"
 Dynamic: license-file
 
 <div align="center">
@@ -66,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-61%25-yellow)](https://github.com/BeshoyEhab/dot-man)
+[![Coverage](https://img.shields.io/badge/coverage-60%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)
 
 ---
@@ -88,7 +91,7 @@ Your Machine                  dot-man Repo               Any Machine
 ──────────────                ────────────               ───────────
 ~/.bashrc      ──── save ──►  branch: main  ── deploy ──►  ~/.bashrc
 ~/.config/nvim ──── save ──►  branch: work  ── deploy ──►  ~/.config/nvim
-~/.gitconfig   ──── save ──►  branch: server             ~/.gitconfig
+~/.gitconfig   ──── save ──►  branch: server               ~/.gitconfig
 ```
 
 **Secrets are never committed.** API keys, tokens and passwords are automatically detected, encrypted locally in a vault, and replaced with hashes in the repository before any commit.
@@ -178,6 +181,7 @@ dot-man add ~/.config/nvim
 
 # 3. Create a "work" profile (branch)
 dot-man navigate work
+# btw it was "switch" instead of "navigate" untill Bishoy decided to change it to "navigate" for some silly reasons and push that changes so as community help us to make it "switch" again.
 
 # 4. Edit your work-specific configs, then switch back — changes are saved automatically
 dot-man navigate main
@@ -413,6 +417,31 @@ system file: api_key = "sk-abc123..."       ← restored on deploy
 
 Run `dot-man audit` to scan at any time. Use `dot-man audit --strict` in CI/CD pipelines.
 
+### Custom Secret Patterns
+
+You can define custom regular expressions to match sensitive patterns, either globally in `~/.config/dot-man/global.toml` or for a specific repository in `dot-man.toml`.
+
+#### Global custom secrets (`global.toml`)
+```toml
+[security]
+use_default_patterns = true # Set to false to disable built-in patterns
+
+[[security.patterns]]
+name = "My Custom API Token"
+pattern = 'my_api_key_[a-zA-Z0-9]{32}'
+severity = "HIGH"
+description = "Internal service API key"
+```
+
+#### Repository custom secrets (`dot-man.toml`)
+```toml
+[secrets]
+use_default_patterns = true # Set to false to disable built-in patterns
+patterns = [
+  { name = "Special Repo Key", pattern = 'special_[0-9]+', severity = "CRITICAL" }
+]
+```
+
 ---
 
 ## Multi-Machine Profiles
@@ -451,10 +480,10 @@ System variables (`{{HOSTNAME}}`, `{{USER}}`, `{{SHELL}}`, etc.) are auto-popula
 
 | Metric | Value |
 |--------|-------|
-| Version | `1.1.0` |
+| Version | `1.1.1` |
 | Python | `3.9+` |
 | Platforms | Linux, macOS |
-| Test Coverage | 61% |
+| Test Coverage | 59% (869 tests) |
 | Commands | 30+ |
 | PyPI | [`dotman-git`](https://pypi.org/project/dotman-git/) |
 
@@ -504,4 +533,4 @@ All contributions must pass the pre-push quality checklist: `black`, `ruff`, `my
 
 ## License
 
-[MIT](LICENSE) © [Bishoy Ehab](https://github.com/BeshoyEhab)
+[MIT](LICENSE) © [Bishoy Ehab](https://github.com/BeshoyEhab) & [ZVAXEROWS](https://github.com/ZVAXEROWS)

{dotman_git-1.1.0 → dotman_git-1.2.0}/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-61%25-yellow)](https://github.com/BeshoyEhab/dot-man)
+[![Coverage](https://img.shields.io/badge/coverage-60%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)
 
 ---
@@ -34,7 +34,7 @@ Your Machine                  dot-man Repo               Any Machine
 ──────────────                ────────────               ───────────
 ~/.bashrc      ──── save ──►  branch: main  ── deploy ──►  ~/.bashrc
 ~/.config/nvim ──── save ──►  branch: work  ── deploy ──►  ~/.config/nvim
-~/.gitconfig   ──── save ──►  branch: server             ~/.gitconfig
+~/.gitconfig   ──── save ──►  branch: server               ~/.gitconfig
 ```
 
 **Secrets are never committed.** API keys, tokens and passwords are automatically detected, encrypted locally in a vault, and replaced with hashes in the repository before any commit.
@@ -124,6 +124,7 @@ dot-man add ~/.config/nvim
 
 # 3. Create a "work" profile (branch)
 dot-man navigate work
+# btw it was "switch" instead of "navigate" untill Bishoy decided to change it to "navigate" for some silly reasons and push that changes so as community help us to make it "switch" again.
 
 # 4. Edit your work-specific configs, then switch back — changes are saved automatically
 dot-man navigate main
@@ -359,6 +360,31 @@ system file: api_key = "sk-abc123..."       ← restored on deploy
 
 Run `dot-man audit` to scan at any time. Use `dot-man audit --strict` in CI/CD pipelines.
 
+### Custom Secret Patterns
+
+You can define custom regular expressions to match sensitive patterns, either globally in `~/.config/dot-man/global.toml` or for a specific repository in `dot-man.toml`.
+
+#### Global custom secrets (`global.toml`)
+```toml
+[security]
+use_default_patterns = true # Set to false to disable built-in patterns
+
+[[security.patterns]]
+name = "My Custom API Token"
+pattern = 'my_api_key_[a-zA-Z0-9]{32}'
+severity = "HIGH"
+description = "Internal service API key"
+```
+
+#### Repository custom secrets (`dot-man.toml`)
+```toml
+[secrets]
+use_default_patterns = true # Set to false to disable built-in patterns
+patterns = [
+  { name = "Special Repo Key", pattern = 'special_[0-9]+', severity = "CRITICAL" }
+]
+```
+
 ---
 
 ## Multi-Machine Profiles
@@ -397,10 +423,10 @@ System variables (`{{HOSTNAME}}`, `{{USER}}`, `{{SHELL}}`, etc.) are auto-popula
 
 | Metric | Value |
 |--------|-------|
-| Version | `1.1.0` |
+| Version | `1.1.1` |
 | Python | `3.9+` |
 | Platforms | Linux, macOS |
-| Test Coverage | 61% |
+| Test Coverage | 59% (869 tests) |
 | Commands | 30+ |
 | PyPI | [`dotman-git`](https://pypi.org/project/dotman-git/) |
 
@@ -450,4 +476,4 @@ All contributions must pass the pre-push quality checklist: `black`, `ruff`, `my
 
 ## License
 
-[MIT](LICENSE) © [Bishoy Ehab](https://github.com/BeshoyEhab)
+[MIT](LICENSE) © [Bishoy Ehab](https://github.com/BeshoyEhab) & [ZVAXEROWS](https://github.com/ZVAXEROWS)

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/__init__.py

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

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/branch_ops.py

@@ -131,6 +131,13 @@ class BranchMixin:
                 result["saved_count"] = save_result["saved"]
                 result["secrets_redacted"] = len(save_result["secrets"])
                 result["errors"].extend(save_result["errors"])
+                # Warn about symlinked paths
+                symlinks: list[Path] = save_result.get("symlinks", [])
+                for sym_path in symlinks:
+                    result["errors"].append(
+                        f"⚠ {sym_path} is a symlink → {sym_path.resolve()}. "
+                        f"Edits affect the symlink target, not the config folder."
+                    )
 
                 commit_msg = f"Auto-save from '{current_branch}' before switch to '{target_branch}'"
                 self.git.commit(commit_msg)
@@ -195,7 +202,7 @@ class BranchMixin:
                 self.global_config.current_branch = target_branch
                 self.global_config.save()
 
-            # Clear file comparison cache since files have likely changed
+                # Clear file comparison cache since files have likely changed
             clear_comparison_cache()
 
         return result
@@ -299,9 +306,17 @@ class BranchMixin:
 
             for pattern, hook_name in FILE_TO_HOOK_MAP.items():
                 if pattern in file_str or file_str.endswith(pattern):
-                    hook_cmd = get_hook_for_config(pattern)
-                    if hook_cmd:
-                        hooks_to_run.add(hook_cmd)
+                    # Try to resolve the hook alias first
+                    from .constants import HOOK_ALIASES
+
+                    if hook_name in HOOK_ALIASES:
+                        resolved_cmd: str = HOOK_ALIASES[hook_name]
+                        hooks_to_run.add(resolved_cmd)
+                    else:
+                        # Fallback to get_hook_for_config
+                        fallback_cmd = get_hook_for_config(pattern)
+                        if fallback_cmd:
+                            hooks_to_run.add(fallback_cmd)
                     break
 
             section_name = self._find_section_for_file(file_path)

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/__init__.py

@@ -10,6 +10,7 @@ from .backup_cmd import backup
 from .branch_cmd import branch
 from .clean_cmd import clean
 from .common import (
+    BRANCH,
     DotManGroup,
     _clear_completion_cache,
     _set_git_runner,
@@ -17,6 +18,7 @@ from .common import (
     complete_commits,
     complete_config_keys,
     complete_profiles,
+    complete_sections,
     complete_switch_args,
     complete_tags,
     complete_template_keys,
@@ -72,7 +74,9 @@ __all__ = [
     "complete_template_keys",
     "complete_config_keys",
     "complete_profiles",
+    "complete_sections",
     "complete_switch_args",
+    "BRANCH",
     "parse_branch_arg",
     "get_secret_handler",
     "_set_git_runner",

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/add_cmd.py

@@ -9,11 +9,18 @@ from ..config import DotManConfig, GlobalConfig
 from ..constants import REPO_DIR
 from ..exceptions import DotManError
 from ..files import copy_directory, copy_file
-from .common import error, get_secret_handler, require_init, success, warn
+from .common import (
+    AliasedCommand,
+    error,
+    get_secret_handler,
+    require_init,
+    success,
+    warn,
+)
 from .interface import cli as main
 
 
-@main.command()
+@main.command("add", cls=AliasedCommand, aliases=["add"])
 @click.argument("path", type=click.Path(exists=True))
 @click.option(
     "--section", "-s", help="Section name (default: auto-generated from path)"

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/audit_cmd.py

@@ -6,12 +6,12 @@ from .. import ui
 from ..constants import REPO_DIR
 from ..core import GitManager
 from ..exceptions import DotManError
-from ..secrets import PermanentRedactGuard, SecretGuard, SecretMatch, SecretScanner
-from .common import error, handle_exception, require_init, success
+from ..secrets import PermanentRedactGuard, SecretGuard, SecretMatch, get_custom_scanner
+from .common import AliasedCommand, error, handle_exception, require_init, success
 from .interface import cli as main
 
 
-@main.command()
+@main.command("audit", cls=AliasedCommand, aliases=["aud"])
 @click.option(
     "--strict", is_flag=True, help="Exit with error if secrets found (for CI/CD)"
 )
@@ -26,7 +26,7 @@ def audit(strict: bool, fix: bool):
     Use --strict in CI/CD pipelines to fail builds if secrets are found.
     """
     try:
-        scanner = SecretScanner()
+        scanner = get_custom_scanner()
         guard = SecretGuard()
         permanent_guard = PermanentRedactGuard()
 

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/backup_cmd.py

@@ -8,7 +8,7 @@ from .common import error, require_init, success
 from .interface import cli as main
 
 
-@main.group()
+@main.group("backup")
 def backup():
     """Manage local safety backups."""
     pass

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/branch_cmd.py

@@ -11,7 +11,7 @@ from .common import complete_branches, error, handle_exception, require_init, su
 from .interface import cli as main
 
 
-@main.group()
+@main.group("branch")
 def branch():
     """Manage configuration branches."""
     pass

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/clean_cmd.py

@@ -4,11 +4,11 @@ import click
 
 from .. import ui
 from ..constants import REPO_DIR
-from .common import error, require_init, success
+from .common import AliasedCommand, error, require_init, success
 from .interface import cli as main
 
 
-@main.command("clean")
+@main.command("clean", cls=AliasedCommand, aliases=["cln"])
 @click.option("--backups", is_flag=True, help="Clean old backups")
 @click.option("--orphans", is_flag=True, help="Clean orphaned files from repo")
 @click.option("--all", "clean_all", is_flag=True, help="Clean both backups and orphans")

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/common.py

@@ -1,6 +1,7 @@
 """Common utilities for dot-man CLI commands."""
 
 import json
+import logging
 import os
 import re
 import subprocess
@@ -57,9 +58,50 @@ def handle_exception(exc: BaseException, context: str = "Operation") -> None:
     raise SystemExit(1)
 
 
+class AliasedCommand(click.Command):
+    """Custom Command class that supports aliases."""
+
+    def __init__(self, *args, aliases=None, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._aliases = aliases or []
+
+    @property
+    def aliases(self):
+        return self._aliases
+
+
+def command(name=None, cls=None, aliases=None, **kwargs):
+    """Decorator to create a command with optional aliases.
+
+    Args:
+        name: Command name (default: function name)
+        cls: Command class (default: AliasedCommand)
+        aliases: List of alias names for the command
+
+    Example:
+        @command("navigate", aliases=["nav", "go"])
+        def navigate():
+            ...
+    """
+    if cls is None:
+        cls = AliasedCommand
+
+    def decorator(f):
+        return click.command(name=name, cls=cls, aliases=aliases, **kwargs)(f)
+
+    return decorator
+
+
 class DotManGroup(click.Group):
     """Custom Click Group to provide suggestions for typos."""
 
+    def add_command(self, command, name=None):
+        name = name or command.name
+        super().add_command(command, name)
+        if hasattr(command, "aliases") and command.aliases:
+            for alias in command.aliases:
+                super().add_command(command, alias)
+
     def get_command(self, ctx, cmd_name):
         rv = click.Group.get_command(self, ctx, cmd_name)
         if rv is not None:
@@ -86,6 +128,20 @@ def require_init(func):
             ui.console.print()
             ui.console.print("[bold]The Dotfile Manager for Professionals[/bold]")
             ui.console.print()
+            ui.console.print("[bold cyan]Coming from another tool?[/bold cyan]")
+            ui.console.print(
+                "  [cyan]dot-man import chezmoi[/cyan]    - Import from chezmoi"
+            )
+            ui.console.print(
+                "  [cyan]dot-man import yadm[/cyan]       - Import from yadm"
+            )
+            ui.console.print(
+                "  [cyan]dot-man import stow[/cyan]       - Import from GNU Stow"
+            )
+            ui.console.print(
+                "  [cyan]dot-man import all[/cyan]        - Auto-detect and import"
+            )
+            ui.console.print()
             ui.console.print("[bold cyan]Get started:[/bold cyan]")
             ui.console.print(
                 "  [cyan]dot-man init[/cyan]              - Initialize your dotfiles repository"
@@ -173,6 +229,7 @@ def _get_completion_cache() -> dict:
                 _memory_cache_time = time.time()
                 return _memory_cache
     except Exception:
+        logging.debug("Failed to load completion cache from file")
         pass
 
     _memory_cache = {}
@@ -192,6 +249,7 @@ def _save_completion_cache(data: dict) -> None:
         _COMPLETION_CACHE_FILE.parent.mkdir(parents=True, exist_ok=True)
         _COMPLETION_CACHE_FILE.write_text(json.dumps(data))
     except Exception:
+        logging.debug("Failed to save completion cache to file")
         pass
 
 
@@ -205,6 +263,9 @@ def _clear_completion_cache() -> None:
         if _COMPLETION_CACHE_FILE.exists():
             _COMPLETION_CACHE_FILE.unlink()
     except Exception:
+        logging.debug(
+            "Failed to unlink completion cache file in _clear_completion_cache"
+        )
         pass
 
 
@@ -223,6 +284,7 @@ def _clear_all_caches() -> None:
         if _COMPLETION_CACHE_FILE.exists():
             _COMPLETION_CACHE_FILE.unlink()
     except Exception:
+        logging.debug("Failed to unlink completion cache file in _clear_all_caches")
         pass
 
 
@@ -263,6 +325,20 @@ def parse_branch_arg(arg: str) -> dict:
     return {"type": "branch", "base": arg, "target": arg}
 
 
+class BranchParamType(click.ParamType):
+    """Parameter type that accepts branch, branch@tag, or commit SHA."""
+
+    name = "branch"
+
+    def convert(self, value, param, ctx):
+        if not value:
+            return None
+        return parse_branch_arg(value)
+
+
+BRANCH = BranchParamType()
+
+
 def complete_switch_args(ctx, param, incomplete):
     """Shell completion callback for switch (branches, tags, commits).
 
@@ -378,6 +454,7 @@ def _complete_navigate_items(
         _save_completion_cache(cache)
         return items
     except Exception:
+        logging.debug("Failed to complete navigate items")
         return []
 
 
@@ -396,6 +473,7 @@ def complete_branches(ctx, param, incomplete):
             branches = cache["branches"]
         return [b for b in branches if b.startswith(incomplete)]
     except Exception:
+        logging.debug("Failed to complete branches")
         return []
 
 
@@ -412,6 +490,7 @@ def complete_tags(ctx, param, incomplete):
             tags = cache["tags"]
         return [t for t in tags if t.startswith(incomplete)]
     except Exception:
+        logging.debug("Failed to complete tags")
         return []
 
 
@@ -432,6 +511,7 @@ def complete_commits(ctx, param, incomplete):
             commits = cache["commits_all"]
         return [c for c in commits if c.startswith(incomplete)]
     except Exception:
+        logging.debug("Failed to complete commits")
         return []
 
 
@@ -450,6 +530,7 @@ def complete_template_keys(ctx, param, incomplete):
         _template_cache = list(templates.keys())
         return [k for k in _template_cache if k.startswith(incomplete)]
     except Exception:
+        logging.debug("Failed to complete template keys")
         return []
 
 
@@ -471,6 +552,7 @@ def complete_config_keys(ctx, param, incomplete):
         _config_keys_cache = keys
         return [k for k in keys if k.startswith(incomplete)]
     except Exception:
+        logging.debug("Failed to complete config keys")
         return []
 
 
@@ -489,6 +571,22 @@ def complete_profiles(ctx, param, incomplete):
         _profiles_cache = list(profiles.keys())
         return [k for k in _profiles_cache if k.startswith(incomplete)]
     except Exception:
+        logging.debug("Failed to complete profiles")
+        return []
+
+
+def complete_sections(ctx, param, incomplete):
+    """Shell completion callback for section names."""
+    try:
+        from ..dotman_config import DotManConfig
+
+        config = DotManConfig()
+        config.load()
+        return [
+            name for name in config.get_section_names() if name.startswith(incomplete)
+        ]
+    except Exception:
+        logging.debug("Failed to complete sections")
         return []
 
 

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/completions_cmd.py

@@ -5,10 +5,11 @@ from pathlib import Path
 
 import click
 
+from .common import AliasedCommand
 from .interface import cli as main
 
 
-@main.command("completions")
+@main.command("completions", cls=AliasedCommand, aliases=["cpl"])
 @click.option(
     "--shell",
     type=click.Choice(["bash", "zsh", "fish", "all"]),

{dotman_git-1.1.0 → dotman_git-1.2.0}/dot_man/cli/config_cmd.py

@@ -12,7 +12,7 @@ from .common import complete_config_keys, error, require_init, success
 from .interface import cli as main
 
 
-@main.group()
+@main.group("config")
 def config():
     """Manage global configuration."""
     pass