dotman-git 1.3.0__tar.gz → 1.3.1__tar.gz

{dotman_git-1.3.0 → dotman_git-1.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dotman-git
-Version: 1.3.0
+Version: 1.3.1
 Summary: Dotfile manager with git-powered branching
 Author-email: Bishoy Ehab <beshoyehabhhmm@gmail.com>
 License: MIT
@@ -18,7 +18,6 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Operating System :: MacOS
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
@@ -26,7 +25,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Systems Administration
 Classifier: Topic :: Utilities
 Classifier: Typing :: Typed
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: click>=8.0
@@ -70,13 +69,14 @@ Dynamic: license-file
 [![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-83%25-green)](https://github.com/BeshoyEhab/dot-man)
+[![Docs](https://img.shields.io/badge/docs-online-blue)](https://beshoyehab.github.io/dot-man/)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/BeshoyEhab/dot-man/pulls)
 
 ---
 
 *Switch your entire development environment in one command.*
 
-[**Install**](#installation) · [**Quick Start**](#quick-start) · [**Commands**](#commands) · [**Config**](#configuration) · [**Docs**](docs/)
+[**Install**](https://github.com/BeshoyEhab/dot-man#installation) · [**Quick Start**](https://github.com/BeshoyEhab/dot-man#quick-start) · [**Commands**](https://github.com/BeshoyEhab/dot-man#commands) · [**Config**](https://github.com/BeshoyEhab/dot-man#configuration) · [**Docs**](https://beshoyehab.github.io/dot-man/)
 
 </div>
 

{dotman_git-1.3.0 → dotman_git-1.3.1}/README.md

@@ -13,13 +13,14 @@
 [![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-83%25-green)](https://github.com/BeshoyEhab/dot-man)
+[![Docs](https://img.shields.io/badge/docs-online-blue)](https://beshoyehab.github.io/dot-man/)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/BeshoyEhab/dot-man/pulls)
 
 ---
 
 *Switch your entire development environment in one command.*
 
-[**Install**](#installation) · [**Quick Start**](#quick-start) · [**Commands**](#commands) · [**Config**](#configuration) · [**Docs**](docs/)
+[**Install**](https://github.com/BeshoyEhab/dot-man#installation) · [**Quick Start**](https://github.com/BeshoyEhab/dot-man#quick-start) · [**Commands**](https://github.com/BeshoyEhab/dot-man#commands) · [**Config**](https://github.com/BeshoyEhab/dot-man#configuration) · [**Docs**](https://beshoyehab.github.io/dot-man/)
 
 </div>
 

{dotman_git-1.3.0 → dotman_git-1.3.1}/dot_man/__init__.py

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

{dotman_git-1.3.0 → dotman_git-1.3.1}/dot_man/cli/__init__.py

@@ -4,7 +4,7 @@ This package provides the CLI entry point for dot-man.
 It exposes the modular CLI implementation.
 """
 
-from . import discover_cmd, encrypt_cmd, export_cmd, import_cmd
+from . import bootstrap_cmd, discover_cmd, encrypt_cmd, export_cmd, import_cmd
 from .add_cmd import add
 from .audit_cmd import audit
 from .backup_cmd import backup
@@ -35,19 +35,21 @@ from .config_cmd import config
 from .deploy_cmd import deploy
 from .doctor_cmd import doctor
 from .edit_cmd import edit
+from .hooks_cmd import hooks
 
 # Import commands for easier access and backward compatibility
 from .init_cmd import init
 from .interface import cli
 from .log_cmd import checkout, diff, log
 from .main import main
-from .navigate_cmd import hooks, navigate
+from .navigate_cmd import navigate
 from .onboarding import is_first_run, mark_onboarded, run_onboarding
 from .profile_cmd import profile
 from .remote_cmd import remote, sync
 from .restore_cmd import restore
 from .revert_cmd import revert
 from .rollback_cmd import rollback
+from .save_cmd import save
 from .show_cmd import show
 from .status_cmd import status
 from .switch_cmd import switch
@@ -96,6 +98,7 @@ __all__ = [
     "config",
     "revert",
     "restore",
+    "save",
     "clean",
     "doctor",
     "verify",
@@ -112,6 +115,7 @@ __all__ = [
     "export_cmd",
     "encrypt_cmd",
     "discover_cmd",
+    "bootstrap_cmd",
     "completions",
     "watch",
     "rollback",

dotman_git-1.3.1/dot_man/cli/bootstrap_cmd.py

@@ -0,0 +1,240 @@
+"""Bootstrap command for dot-man — install packages via system package managers."""
+
+import logging
+import shutil
+import subprocess
+
+import click
+
+from .. import ui
+from .common import require_init, success, warn
+from .interface import cli as main
+
+# Package manager detection: command → (install_cmd, update_cmd)
+PACKAGE_MANAGERS = {
+    "brew": {
+        "install": "brew install {package}",
+        "update": "brew update",
+        "detect": "brew",
+    },
+    "apt": {
+        "install": "sudo apt-get install -y {package}",
+        "update": "sudo apt-get update",
+        "detect": "apt-get",
+    },
+    "dnf": {
+        "install": "sudo dnf install -y {package}",
+        "update": "sudo dnf check-update",
+        "detect": "dnf",
+    },
+    "pacman": {
+        "install": "sudo pacman -S --noconfirm {package}",
+        "update": "sudo pacman -Sy",
+        "detect": "pacman",
+    },
+    "zypper": {
+        "install": "sudo zypper install -y {package}",
+        "update": "sudo zypper refresh",
+        "detect": "zypper",
+    },
+    "nix-env": {
+        "install": "nix-env -iA nixpkgs.{package}",
+        "update": "nix-channel --update",
+        "detect": "nix-env",
+    },
+    "xbps-install": {
+        "install": "sudo xbps-install -y {package}",
+        "update": "sudo xbps-install -Su",
+        "detect": "xbps-install",
+    },
+    "pkg": {
+        "install": "pkg install -y {package}",
+        "update": "pkg update",
+        "detect": "pkg",
+    },
+}
+
+
+def _detect_package_manager() -> str | None:
+    """Detect the available package manager on this system."""
+    import platform
+
+    os_name = platform.system().lower()
+
+    # Preferred order by OS
+    if os_name == "darwin":
+        preferred = ["brew"]
+    elif os_name == "linux":
+        preferred = ["apt", "dnf", "pacman", "zypper", "xbps-install", "nix-env"]
+    elif os_name == "freebsd":
+        preferred = ["pkg"]
+    else:
+        preferred = list(PACKAGE_MANAGERS.keys())
+
+    for pm in preferred:
+        if shutil.which(PACKAGE_MANAGERS[pm]["detect"]):
+            return pm
+
+    return None
+
+
+def _load_bootstrap_packages() -> dict[str, list[str]]:
+    """Load packages from dot-man config or bootstrap.toml."""
+    try:
+        from ..config import DotManConfig
+
+        config = DotManConfig()
+        config.load()
+
+        # Check for [bootstrap] section in config
+        bootstrap = config._data.get("bootstrap", {})
+        if bootstrap:
+            packages = {}
+            # Support both flat list and grouped format
+            if isinstance(bootstrap, dict):
+                for key, value in bootstrap.items():
+                    if key == "packages" and isinstance(value, list):
+                        packages["default"] = value
+                    elif isinstance(value, list):
+                        packages[key] = value
+            return packages
+
+    except Exception as e:
+        logging.debug(f"Failed to load bootstrap config: {e}")
+
+    return {}
+
+
+def _run_with_pm(pm: str, command_template: str, package: str) -> bool:
+    """Run a package manager command. Returns True on success."""
+    cmd = command_template.format(package=package)
+    ui.console.print(f"  [cyan]$ {cmd}[/cyan]")
+    try:
+        result = subprocess.run(
+            cmd, shell=True, capture_output=True, text=True, timeout=300
+        )
+        if result.returncode == 0:
+            return True
+        else:
+            warn(f"Failed to install {package} (exit code {result.returncode})")
+            if result.stderr:
+                for line in result.stderr.splitlines()[:3]:
+                    ui.console.print(f"    [dim]{line}[/dim]")
+            return False
+    except subprocess.TimeoutExpired:
+        warn(f"Timeout installing {package}")
+        return False
+    except Exception as e:
+        warn(f"Error installing {package}: {e}")
+        return False
+
+
+@main.command("bootstrap")
+@click.option(
+    "--list",
+    "list_only",
+    is_flag=True,
+    help="List packages that would be installed without installing",
+)
+@click.option("--pm", help="Package manager to use (auto-detected if not specified)")
+@click.option("--update", is_flag=True, help="Update package manager first")
+@click.argument("packages", nargs=-1)
+@require_init
+def bootstrap(list_only: bool, pm: str | None, update: bool, packages: tuple[str, ...]):
+    """Install system packages via package managers.
+
+    Detects your system package manager (brew, apt, dnf, pacman, etc.)
+    and installs the specified packages. Packages can also be defined
+    in your dot-man config under [bootstrap].
+
+    Examples:
+        # Install specific packages
+        dot-man bootstrap neovim tmux git
+
+        # List what would be installed from config
+        dot-man bootstrap --list
+
+        # Use a specific package manager
+        dot-man bootstrap --pm brew neovim
+
+        # Update package manager first
+        dot-man bootstrap --update neovim
+    """
+    # Detect package manager
+    if not pm:
+        pm = _detect_package_manager()
+        if not pm:
+            ui.console.print("[red]No supported package manager found.[/red]")
+            ui.console.print(
+                "Supported: brew, apt, dnf, pacman, zypper, nix-env, xbps-install, pkg"
+            )
+            ui.console.print("Use --pm to specify one manually.")
+            raise SystemExit(1)
+
+    if pm not in PACKAGE_MANAGERS:
+        ui.console.print(f"[red]Unknown package manager: {pm}[/red]")
+        raise SystemExit(1)
+
+    pm_info = PACKAGE_MANAGERS[pm]
+    ui.console.print(f"[bold]Using package manager:[/bold] [cyan]{pm}[/cyan]")
+
+    # Collect packages from args and config
+    all_packages: dict[str, list[str]] = {}
+
+    if packages:
+        all_packages["command-line"] = list(packages)
+
+    config_packages = _load_bootstrap_packages()
+    all_packages.update(config_packages)
+
+    if not all_packages:
+        ui.console.print("[yellow]No packages specified.[/yellow]")
+        ui.console.print("Usage: dot-man bootstrap <package1> <package2> ...")
+        ui.console.print("Or add [bootstrap] section to your dot-man.toml:")
+        ui.console.print('  [bootstrap]\n  packages = ["neovim", "tmux", "git"]')
+        return
+
+    # List mode
+    if list_only:
+        ui.console.print()
+        ui.console.print("[bold]Packages to install:[/bold]")
+        for group, pkgs in all_packages.items():
+            ui.console.print(f"  [cyan]{group}:[/cyan]")
+            for pkg in pkgs:
+                ui.console.print(f"    • {pkg}")
+        ui.console.print()
+        total = sum(len(pkgs) for pkgs in all_packages.values())
+        ui.console.print(f"  [dim]{total} package(s) total[/dim]")
+        return
+
+    # Update package manager if requested
+    if update:
+        ui.console.print()
+        ui.console.print("[bold]Updating package manager...[/bold]")
+        _run_with_pm(pm, pm_info["update"], "")
+
+    # Install packages
+    installed = 0
+    failed = 0
+
+    for group, pkgs in all_packages.items():
+        ui.console.print()
+        ui.console.print(f"[bold]Installing {group}:[/bold]")
+        for pkg in pkgs:
+            ui.console.print(f"\n[bold]→ {pkg}[/bold]")
+            result = _run_with_pm(pm, pm_info["install"], pkg)
+            if result:
+                installed += 1
+            else:
+                failed += 1
+
+    # Summary
+    ui.console.print()
+    ui.console.print("[bold]Bootstrap complete:[/bold]")
+    ui.console.print(f"  [green]✓ {installed} installed[/green]")
+    if failed:
+        ui.console.print(f"  [red]✗ {failed} failed[/red]")
+    ui.console.print()
+
+    if installed > 0:
+        success(f"Installed {installed} package(s) via {pm}")

dotman_git-1.3.1/dot_man/cli/config_cmd.py

@@ -0,0 +1,243 @@
+"""Config command for dot-man CLI."""
+
+import json
+
+import click
+from rich.table import Table
+
+from .. import ui
+from ..config import GlobalConfig
+from ..exceptions import ConfigurationError
+from .common import complete_config_keys, error, require_init, success
+from .interface import cli as main
+
+
+@main.group("config")
+def config():
+    """Manage global configuration."""
+    pass
+
+
+@config.command("defaults")
+def config_defaults():
+    """Show all configurable defaults with descriptions."""
+    table = Table(title="Configurable Defaults", show_header=True)
+    table.add_column("Setting", style="cyan", no_wrap=True)
+    table.add_column("Default Value", style="green")
+    table.add_column("Description")
+
+    defaults = [
+        (
+            "switch.default_behavior",
+            "save",
+            "What to do with unsaved changes when switching (save/no-save)",
+        ),
+        (
+            "remote.auto_sync",
+            "false",
+            "Auto push/pull when switching branches (true/false)",
+        ),
+        ("remote.url", "", "Remote repository URL for sync"),
+        ("defaults.secrets_filter", "true", "Redact secrets when saving (true/false)"),
+        (
+            "defaults.update_strategy",
+            "replace",
+            "How to deploy: replace/rename_old/ignore",
+        ),
+        (
+            "defaults.follow_symlinks",
+            "false",
+            "Follow symlinks when deploying (true/false)",
+        ),
+        (
+            "security.strict_mode",
+            "false",
+            "Exit with error if secrets detected (true/false)",
+        ),
+        ("security.audit_on_commit", "true", "Run audit before commits (true/false)"),
+        ("backup.max_count", "5", "Maximum number of backups to keep"),
+    ]
+
+    for key, default_val, desc in defaults:
+        table.add_row(key, str(default_val), desc)
+
+    ui.console.print(table)
+    ui.console.print()
+    ui.console.print("[bold]Section-level settings (in dot-man.toml):[/bold]")
+    ui.console.print("  [cyan]paths[/cyan]           - List of files/dirs to track")
+    ui.console.print("  [cyan]secrets_filter[/cyan]  - Enable secret detection")
+    ui.console.print("  [cyan]update_strategy[/cyan] - How to handle existing files")
+    ui.console.print("  [cyan]pre_deploy[/cyan]      - Command to run before deploying")
+    ui.console.print("  [cyan]post_deploy[/cyan]     - Command to run after deploying")
+    ui.console.print()
+    ui.console.print("[bold]To change a setting:[/bold]")
+    ui.console.print("  [cyan]dot-man config set <key> <value>[/cyan]")
+    ui.console.print()
+    ui.console.print("[dim]Examples:[/dim]")
+    ui.console.print("  dot-man config set switch.default_behavior no-save")
+    ui.console.print("  dot-man config set remote.auto_sync true")
+    ui.console.print("  dot-man config set defaults.update_strategy rename_old")
+    ui.console.print()
+
+
+@config.command("list")
+def config_list():
+    """List all global configuration values."""
+    try:
+        cfg = GlobalConfig()
+        cfg.load()
+
+        def flatten(d, parent_key="", sep="."):
+            items = []
+            for k, v in d.items():
+                new_key = f"{parent_key}{sep}{k}" if parent_key else k
+                if isinstance(v, dict):
+                    items.extend(flatten(v, new_key, sep=sep).items())
+                else:
+                    items.append((new_key, v))
+            return dict(items)
+
+        flat_data = flatten(cfg._data)
+
+        table = Table(title="Global Configuration")
+        table.add_column("Key", style="cyan")
+        table.add_column("Value")
+
+        for k, v in sorted(flat_data.items()):
+            table.add_row(k, str(v))
+
+        ui.console.print(table)
+
+    except Exception as e:
+        error(f"Failed to list config: {e}")
+
+
+@config.command("get")
+@click.argument("key", shell_complete=complete_config_keys)
+def config_get(key: str):
+    """Get a configuration value.
+
+    Example: dot-man config get dot-man.editor
+    """
+    try:
+        cfg = GlobalConfig()
+        cfg.load()
+
+        parts = key.split(".")
+        current = cfg._data
+
+        for part in parts:
+            if isinstance(current, dict) and part in current:
+                current = current[part]
+            else:
+                ui.console.print(f"[red]Key not found:[/red] {key}")
+                ui.hint("Run 'dot-man config list' to see all available keys")
+                raise SystemExit(1)
+
+        if isinstance(current, dict):
+            ui.console.print(f"[dim]Section '{key}' contains:[/dim]")
+            ui.console.print(json.dumps(current, indent=2))
+        else:
+            ui.console.print(str(current))
+
+    except Exception as e:
+        error(f"Failed to get config: {e}")
+
+
+@config.command("set")
+@click.argument("key", shell_complete=complete_config_keys)
+@click.argument("value")
+def config_set(key: str, value: str):
+    """Set a configuration value.
+
+    Example: dot-man config set dot-man.editor nvim
+    """
+    try:
+        cfg = GlobalConfig()
+        try:
+            cfg.load()
+        except (FileNotFoundError, ConfigurationError):
+            cfg.create_default()
+
+        val: bool | str
+        if value.lower() == "true":
+            val = True
+        elif value.lower() == "false":
+            val = False
+        else:
+            val = value
+
+        parts = key.split(".")
+        current = cfg._data
+
+        for i, part in enumerate(parts[:-1]):
+            if part not in current:
+                current[part] = {}
+            current = current[part]
+            if not isinstance(current, dict):
+                error(
+                    f"Key path conflict: '{'.'.join(parts[: i + 1])}' is not a section"
+                )
+
+        current[parts[-1]] = val
+        cfg.save()
+
+        success(f"Set '{key}' to '{val}'")
+        ui.console.print(f"[dim]  Verified: {key} = {val}[/dim]")
+
+    except Exception as e:
+        error(f"Failed to set config: {e}")
+
+
+@config.command("create")
+@click.option(
+    "--examples",
+    "with_examples",
+    is_flag=True,
+    default=True,
+    help="Include commented examples in the config file (default: True)",
+)
+@click.option(
+    "--minimal",
+    is_flag=True,
+    help="Create a minimal config file without examples or comments",
+)
+@click.option(
+    "--force", is_flag=True, help="Overwrite existing config file without prompting"
+)
+@require_init
+def config_create(with_examples: bool, minimal: bool, force: bool):
+    """Create or regenerate the dot-man.toml configuration file."""
+    try:
+        from ..config import DotManConfig
+        from ..constants import DOT_MAN_TOML, REPO_DIR
+
+        config_path = REPO_DIR / DOT_MAN_TOML
+
+        if config_path.exists() and not force:
+            if not ui.confirm(
+                f"Config file already exists at {config_path}. Overwrite?"
+            ):
+                ui.console.print("Cancelled.")
+                return
+
+        dotman_config = DotManConfig()
+
+        if minimal:
+            dotman_config._data = {}
+            dotman_config.save()
+            ui.console.print(f"Created minimal config at {config_path}")
+        else:
+            dotman_config.create_default()
+            ui.console.print(f"Created config with examples at {config_path}")
+
+        ui.console.print("Tip: Use 'dot-man edit' to open the config in your editor")
+
+    except Exception as e:
+        error(f"Failed to create config: {e}")
+
+
+# Register tutorial subcommand from config_tutorial module
+from .config_tutorial import register as _register_tutorial  # noqa: E402
+
+_register_tutorial(config)