Alias cargo and gem installer packages

Signed-off-by: Nick Sweeting <git@sweeting.me>

Author: pirate

abxpkg/binprovider_apt.py

@@ -4,7 +4,8 @@
 import sys
 import time
 
-from pydantic import TypeAdapter
+from pydantic import TypeAdapter, model_validator
+from typing import Self
 
 from .base_types import BinProviderName, PATHStr, BinName, InstallArgs
 from .semver import SemVer
@@ -21,11 +22,18 @@ class AptProvider(BinProvider):
     INSTALLER_BIN: BinName = "apt-get"
 
     PATH: PATHStr = ""  # Starts empty; setup_PATH() discovers package runtime bin dirs via dpkg and replaces PATH with those dirs.
-
     euid: int | None = (
         0  # Import-time default that forces every apt subprocess through the root/sudo execution path.
     )
 
+    @model_validator(mode="after")
+    def add_package_aliases(self) -> Self:
+        self.overrides["gem"] = {
+            **self.overrides.get("gem", {}),
+            "install_args": ["ruby"],
+        }
+        return self
+
     def setup_PATH(self, no_cache: bool = False) -> None:
         """Populate PATH on first use from dpkg-discovered package runtime bin dirs, not from apt-get itself."""
         # Rebuild PATH on first use, when the caller forces no_cache, or when

abxpkg/binprovider_brew.py

@@ -7,7 +7,8 @@
 import platform
 from pathlib import Path
 
-from pydantic import Field, TypeAdapter, computed_field
+from pydantic import Field, TypeAdapter, computed_field, model_validator
+from typing import Self
 
 from .base_types import (
     BinProviderName,
@@ -57,6 +58,18 @@ class BrewProvider(BinProvider):
     # to ``<install_root>/bin`` for the shim/link refresh paths used by load().
     bin_dir: Path | None = None
 
+    @model_validator(mode="after")
+    def add_formula_aliases(self) -> Self:
+        self.overrides["cargo"] = {
+            **self.overrides.get("cargo", {}),
+            "install_args": ["rust"],
+        }
+        self.overrides["gem"] = {
+            **self.overrides.get("gem", {}),
+            "install_args": ["ruby"],
+        }
+        return self
+
     @computed_field
     @property
     def ENV(self) -> "dict[str, str]":

abxpkg/binprovider_cargo.py

@@ -30,8 +30,8 @@ class CargoProvider(BinProvider):
     INSTALLER_BIN: BinName = "cargo"
     INSTALLER_BINPROVIDERS: ClassVar[tuple[BinProviderName, ...] | None] = (
         "env",
-        "apt",
         "brew",
+        "apt",
         "nix",
     )
 

tests/test_cli.py

@@ -1690,6 +1690,40 @@ def test_build_binary_uses_installer_provider_preferences_for_default_provider_s
     ] == expected_provider_names
 
 
+@pytest.mark.parametrize(
+    ("binary_name", "expected_overrides"),
+    [
+        ("cargo", {"brew": {"install_args": ["rust"]}}),
+        (
+            "gem",
+            {
+                "apt": {"install_args": ["ruby"]},
+                "brew": {"install_args": ["ruby"]},
+            },
+        ),
+    ],
+)
+def test_build_binary_merges_provider_aliases_for_installer_binaries(
+    tmp_path,
+    binary_name,
+    expected_overrides,
+):
+    options = cli_module.CliOptions(
+        lib_dir=tmp_path,
+        provider_names=list(cli_module.DEFAULT_PROVIDER_NAMES),
+        dry_run=False,
+        debug=False,
+        no_cache=False,
+    )
+
+    binary = cli_module.build_binary(binary_name, options, dry_run=False)
+
+    for provider_name, expected_override in expected_overrides.items():
+        if provider_name not in cli_module.DEFAULT_PROVIDER_NAMES:
+            continue
+        assert binary.overrides[provider_name] == expected_override
+
+
 def test_build_binary_preserves_explicit_provider_order_for_installer_binaries(
     tmp_path,
 ):