Merge main into fix/ci-release-patterns: resolve test_release_patterns conflicts (lowercase duf/lazygit + keychain cases)

Author: basnijholt

.github/workflows/pytest.yml

@@ -14,7 +14,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
-      - uses: astral-sh/setup-uv@v5
+      - uses: astral-sh/setup-uv@v6
       - name: Cache release downloads
         id: cache-release-downloads
         uses: actions/cache@v4
@@ -45,7 +45,7 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
       - name: Install dependencies
         run: |
           uv sync --all-extras

.github/workflows/real-test.yml

@@ -22,7 +22,7 @@ jobs:
         with:
           python-version: 3.13
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
       - name: dotbins sync
         run: |
           cd .github

.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
       - name: Build
         run: uv build
       - name: Publish package distributions to PyPI

.github/workflows/update-readme.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-python@v5
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
 
       - name: Run markdown-code-runner
         run: uvx --with . markdown-code-runner README.md

.gitignore

@@ -127,6 +127,7 @@ venv/
 ENV/
 env.bak/
 venv.bak/
+.envrc
 
 # Spyder project settings
 .spyderproject

README.md

@@ -204,7 +204,7 @@ Here's what happens during `dotbins sync`:
 
 1. **Version Detection**:
 
-   - Checks each tool's current version in `versions.json`
+   - Checks each tool's current version in `manifest.json`
    - Queries GitHub API for the latest release of each tool
 
 2. **Smart Updates**:
@@ -220,10 +220,15 @@ Here's what happens during `dotbins sync`:
    - Can be limited to current system only: `dotbins sync -c`
 
 4. **File Generation**:
-   - Updates `versions.json` with new version information
+   - Updates `manifest.json` with new version information
    - Regenerates shell integration scripts with PATH and tool configurations
    - Creates a README in the tools directory with installation status
 
+5. **Pinning to Manifest**:
+
+   - Use the `dotbins sync --pin-to-manifest` CLI flag to force `sync` to use the tags already recorded in `manifest.json`.
+   - This ignores the latest release information from GitHub and ensures that the installed versions match exactly what's in your manifest, which is useful for reproducibility or if your manifest file is version-controlled.
+
 Example update workflow:
 
 ```bash
@@ -239,7 +244,10 @@ dotbins sync --current
 # Force reinstall everything, even if up to date
 dotbins sync --force
 
-# See what would be updated without making changes
+# Update tools using only the versions recorded in manifest.json
+dotbins sync --pin-to-manifest
+
+# See what is installed
 dotbins status
 ```
 
@@ -432,7 +440,7 @@ Here's what gets created:
 │   ├── nushell.nu
 │   ├── powershell.ps1
 │   └── zsh.sh
-└── versions.json          # Version tracking information
+└── manifest.json          # Version tracking information
 ```
 
 ### Tool Configuration
@@ -756,7 +764,7 @@ tools:
     repo: eza-community/eza
     shell_code:
       bash,zsh: |
-        alias l="eza -lah --git --icons"
+        alias l="eza --long --all --git --icons=auto"
   fzf:
     repo: junegunn/fzf
     shell_code:
@@ -790,6 +798,10 @@ tools:
       bash,zsh: |
         eval "$(atuin init __DOTBINS_SHELL__ --disable-up-arrow)"
 
+  keychain:
+    repo: funtoo/keychain
+    asset_patterns: keychain
+
   uv:
     repo: astral-sh/uv
     binary_name: [uv, uvx]
@@ -943,7 +955,7 @@ source "$HOME/.dotbins/shell/bash.sh"
 source "$HOME/.dotbins/shell/fish.fish"
 
 # For Nushell
-source $env.HOME/.dotbins/shell/nushell.nu
+source ~/.dotbins/shell/nushell.nu
 ```
 
 ---
@@ -1024,6 +1036,7 @@ tools:
   yq: mikefarah/yq                # YAML/XML/TOML processor similar to jq
   zellij: zellij-org/zellij       # Terminal multiplexer
   zoxide: ajeetdsouza/zoxide      # Smarter cd command with learning
+  keychain: funtoo/keychain       # ssh-agent manager
 
 platforms:
   linux:

dotbins.yaml

@@ -32,7 +32,7 @@ tools:
     repo: eza-community/eza
     shell_code:
       bash,zsh: |
-        alias l="eza -lah --git --icons"
+        alias l="eza --long --all --git --icons=auto"
   fzf:
     repo: junegunn/fzf
     shell_code:
@@ -66,6 +66,10 @@ tools:
       bash,zsh: |
         eval "$(atuin init __DOTBINS_SHELL__ --disable-up-arrow)"
 
+  keychain:
+    repo: funtoo/keychain
+    asset_patterns: keychain
+
   uv:
     repo: astral-sh/uv
     binary_name: [uv, uvx]

dotbins/cli.py

@@ -91,7 +91,12 @@ def _initialize(config: Config) -> None:
     config.generate_readme()
 
 
-def _get_tool(source: str, dest_dir: str | Path, name: str | None = None) -> None:
+def _get_tool(
+    source: str,
+    dest_dir: str | Path,
+    name: str | None = None,
+    tag: str | None = None,
+) -> int:
     """Get a specific tool and install it directly to a location.
 
     This command bypasses the standard configuration and tools directory,
@@ -102,6 +107,7 @@ def _get_tool(source: str, dest_dir: str | Path, name: str | None = None) -> Non
         source: GitHub repository in the format 'owner/repo' or URL/path to a YAML configuration file.
         dest_dir: Directory to install the binary to (e.g., ~/.local/bin)
         name: Optional name to use for the binary (defaults to repo name)
+        tag: Optional tag to use for the binary (if None, the latest release will be used)
 
     """
     platform, arch = current_platform()
@@ -116,10 +122,12 @@ def _get_tool(source: str, dest_dir: str | Path, name: str | None = None) -> Non
         config = Config(
             tools_dir=dest_dir_path,
             platforms={platform: [arch]},
-            tools={tool_name: build_tool_config(tool_name, {"repo": source})},
+            tools={tool_name: build_tool_config(tool_name, {"repo": source, "tag": tag})},
         )
     config._bin_dir = dest_dir_path
     config.sync_tools(current=True, force=True, generate_readme=False, copy_config_file=False)
+    exit_code = 1 if config._update_summary.failed else 0
+    return exit_code  # noqa: RET504
 
 
 def create_parser() -> argparse.ArgumentParser:
@@ -167,6 +175,10 @@ def create_parser() -> argparse.ArgumentParser:
         "--name",
         help="Name to use for the binary (defaults to repository name if not specified) and is ignored if source is a URL",
     )
+    get_parser.add_argument(
+        "--tag",
+        help="Tag to use for the binary (if None, the latest release will be used)",
+    )
 
     # sync command
     sync_parser = subparsers.add_parser(
@@ -201,7 +213,15 @@ def create_parser() -> argparse.ArgumentParser:
         "-c",
         "--current",
         action="store_true",
-        help="Only install or update for the current platform and architecture (convenient shorthand)",
+        help="Install/update only for the current platform and architecture."
+        " This allows syncing for the current system even if it's not explicitly"
+        " listed in the `platforms` configuration.",
+    )
+    sync_parser.add_argument(
+        "--pin-to-manifest",
+        action="store_true",
+        help="Use the tags from the `manifest.json` file instead of the latest release"
+        " or the tag specified in the config file",
     )
     sync_parser.add_argument(
         "--no-shell-scripts",
@@ -305,8 +325,8 @@ def main() -> None:  # pragma: no cover
 
     try:
         if args.command == "get":
-            _get_tool(args.source, args.dest, args.name)
-            return
+            exit_code = _get_tool(args.source, args.dest, args.name, args.tag)
+            sys.exit(exit_code)
         if args.command is None:
             parser.print_help()
             return
@@ -334,12 +354,12 @@ def main() -> None:  # pragma: no cover
                 github_token=args.github_token,
                 verbose=args.verbose,
                 generate_shell_scripts=not args.no_shell_scripts,
+                pin_to_manifest=args.pin_to_manifest,
             )
+            if config._update_summary.failed:
+                sys.exit(1)
         elif args.command == "readme":
-            config.generate_readme(
-                not args.no_file,
-                args.verbose,
-            )
+            config.generate_readme(not args.no_file, args.verbose)
         elif args.command == "status":
             platform = args.platform
             arch = args.architecture
@@ -348,7 +368,7 @@ def main() -> None:  # pragma: no cover
                 platform, arch = current_platform()
 
             # If both --compact and --full are specified, --compact takes precedence
-            config.version_store.print(
+            config.manifest.print(
                 config,
                 compact=not args.full,
                 platform=platform,