Prefer fast installer providers for cargo and gem

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

Author: pirate

abxpkg/binprovider.py

@@ -17,6 +17,7 @@
 
 from typing import (
     Optional,
+    ClassVar,
     cast,
     final,
     Any,
@@ -359,6 +360,7 @@ class BinProvider(BaseModel):
         repr=False,
     )  # e.g.  '/opt/homebrew/bin:/opt/archivebox/bin'
     INSTALLER_BIN: BinName = "env"
+    INSTALLER_BINPROVIDERS: ClassVar[tuple[BinProviderName, ...] | None] = None
 
     euid: int | None = None
     install_root: Path | None = None
@@ -841,10 +843,16 @@ def INSTALLER_BINARY(self, no_cache: bool = False) -> ShallowBinary:
             if raw_provider_names
             else list(DEFAULT_PROVIDER_NAMES)
         )
+        preferred_provider_names = (
+            selected_provider_names
+            if raw_provider_names or not self.INSTALLER_BINPROVIDERS
+            else list(self.INSTALLER_BINPROVIDERS)
+        )
         installer_provider_names = [
             provider_name
-            for provider_name in selected_provider_names
+            for provider_name in preferred_provider_names
             if provider_name
+            and provider_name in selected_provider_names
             and provider_name in PROVIDER_CLASS_BY_NAME
             and provider_name != self.name
         ]

abxpkg/binprovider_cargo.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 
 from pydantic import Field, model_validator, computed_field
-from typing import Self, cast
+from typing import Self, cast, ClassVar
 
 from .base_types import (
     BinProviderName,
@@ -28,6 +28,12 @@ class CargoProvider(BinProvider):
     name: BinProviderName = "cargo"
     _log_emoji = "🦀"
     INSTALLER_BIN: BinName = "cargo"
+    INSTALLER_BINPROVIDERS: ClassVar[tuple[BinProviderName, ...] | None] = (
+        "env",
+        "apt",
+        "brew",
+        "nix",
+    )
 
     PATH: PATHStr = ""  # Starts empty; setup_PATH() fills it with cargo_home/bin plus any install_root/bin override.
 
@@ -111,13 +117,20 @@ def INSTALLER_BINARY(self, no_cache: bool = False):
             if raw_provider_names
             else list(DEFAULT_PROVIDER_NAMES)
         )
+        if raw_provider_names:
+            preferred_provider_names = selected_provider_names
+        else:
+            installer_binproviders = self.INSTALLER_BINPROVIDERS
+            assert installer_binproviders is not None
+            preferred_provider_names = list(installer_binproviders)
         env_provider = EnvProvider(install_root=None, bin_dir=None)
         installer_providers: list[BinProvider] = [
             env_provider
             if provider_name == "env"
             else PROVIDER_CLASS_BY_NAME[provider_name]()
-            for provider_name in selected_provider_names
+            for provider_name in preferred_provider_names
             if provider_name
+            and provider_name in selected_provider_names
             and provider_name in PROVIDER_CLASS_BY_NAME
             and provider_name != self.name
         ]

abxpkg/binprovider_gem.py

@@ -6,7 +6,7 @@
 from pathlib import Path
 
 from pydantic import Field, model_validator, computed_field
-from typing import Self
+from typing import Self, ClassVar
 
 from .binary import Binary
 from .base_types import (
@@ -34,6 +34,12 @@ class GemProvider(BinProvider):
     name: BinProviderName = "gem"
     _log_emoji = "💎"
     INSTALLER_BIN: BinName = "gem"
+    INSTALLER_BINPROVIDERS: ClassVar[tuple[BinProviderName, ...] | None] = (
+        "env",
+        "apt",
+        "brew",
+        "nix",
+    )
 
     PATH: PATHStr = DEFAULT_ENV_PATH  # Starts with ambient system PATH; setup_PATH() prepends/appends gem bin_dir depending on whether install_root/bin_dir were overridden.
 
@@ -95,12 +101,19 @@ def INSTALLER_BINARY(self, no_cache: bool = False):
             if raw_provider_names
             else list(DEFAULT_PROVIDER_NAMES)
         )
+        if raw_provider_names:
+            preferred_provider_names = selected_provider_names
+        else:
+            installer_binproviders = self.INSTALLER_BINPROVIDERS
+            assert installer_binproviders is not None
+            preferred_provider_names = list(installer_binproviders)
         dependency_providers = [
             EnvProvider(install_root=None, bin_dir=None)
             if provider_name == "env"
             else PROVIDER_CLASS_BY_NAME[provider_name]()
-            for provider_name in selected_provider_names
+            for provider_name in preferred_provider_names
             if provider_name
+            and provider_name in selected_provider_names
             and provider_name in PROVIDER_CLASS_BY_NAME
             and provider_name != self.name
         ]

abxpkg/cli.py

@@ -371,10 +371,28 @@ def merge_dicts(
                 else:
                     merged_overrides[provider_name] = provider_overrides
 
+    provider_names = options.provider_names
+    if provider_names == list(DEFAULT_PROVIDER_NAMES):
+        for provider_class in PROVIDER_CLASS_BY_NAME.values():
+            if provider_class.model_fields["INSTALLER_BIN"].default != binary_name:
+                continue
+            preferred_provider_names = getattr(
+                provider_class,
+                "INSTALLER_BINPROVIDERS",
+                None,
+            )
+            if preferred_provider_names:
+                provider_names = [
+                    provider_name
+                    for provider_name in preferred_provider_names
+                    if provider_name in options.provider_names
+                ]
+            break
+
     binary_kwargs: dict[str, Any] = {
         "name": binary_name,
         "binproviders": build_providers(
-            options.provider_names,
+            provider_names,
             dry_run=dry_run,
             install_root=options.install_root,
             bin_dir=options.bin_dir,

tests/test_cli.py

@@ -1663,6 +1663,53 @@ def test_build_binary_forwards_binary_level_fields(tmp_path):
     assert binary.overrides == {"pip": {"install_args": ["custom==1.0"]}}
 
 
+@pytest.mark.parametrize("binary_name", ["cargo", "gem"])
+def test_build_binary_uses_installer_provider_preferences_for_default_provider_set(
+    tmp_path,
+    binary_name,
+):
+    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)
+    provider_class = cli_module.PROVIDER_CLASS_BY_NAME[binary_name]
+    assert provider_class.INSTALLER_BINPROVIDERS is not None
+    expected_provider_names = [
+        provider_name
+        for provider_name in provider_class.INSTALLER_BINPROVIDERS
+        if provider_name in cli_module.DEFAULT_PROVIDER_NAMES
+    ]
+
+    assert [
+        provider.name for provider in binary.binproviders
+    ] == expected_provider_names
+
+
+def test_build_binary_preserves_explicit_provider_order_for_installer_binaries(
+    tmp_path,
+):
+    options = cli_module.CliOptions(
+        lib_dir=tmp_path,
+        provider_names=["env", "brew", "cargo"],
+        dry_run=False,
+        debug=False,
+        no_cache=False,
+    )
+
+    binary = cli_module.build_binary("cargo", options, dry_run=False)
+
+    assert [provider.name for provider in binary.binproviders] == [
+        "env",
+        "brew",
+        "cargo",
+    ]
+
+
 def test_build_binary_merges_cli_handler_overrides_into_all_selected_providers(
     tmp_path,
 ):