diff --git a/docs/registry.md b/docs/registry.md index 8351d847c..f9c3452c2 100644 --- a/docs/registry.md +++ b/docs/registry.md @@ -78,7 +78,6 @@ editLink: false | btrace | [asdf:joschi/asdf-btrace](https://github.com/joschi/asdf-btrace) | | buf | [asdf:truepay/asdf-buf](https://github.com/truepay/asdf-buf) | | buildpack | [asdf:johnlayton/asdf-buildpack](https://github.com/johnlayton/asdf-buildpack) | -| bun | [core:bun](https://mise.jdx.dev/lang/bun.html) | | bundler | [asdf:jonathanmorley/asdf-bundler](https://github.com/jonathanmorley/asdf-bundler) | | cabal | [asdf:sestrella/asdf-ghcup](https://github.com/sestrella/asdf-ghcup) | | caddy | [asdf:salasrod/asdf-caddy](https://github.com/salasrod/asdf-caddy) | @@ -159,7 +158,6 @@ editLink: false | dbmate | [asdf:juusujanar/asdf-dbmate](https://github.com/juusujanar/asdf-dbmate) | | deck | [asdf:nutellinoit/asdf-deck](https://github.com/nutellinoit/asdf-deck) | | delta | [asdf:andweeb/asdf-delta](https://github.com/andweeb/asdf-delta) | -| deno | [core:deno](https://mise.jdx.dev/lang/deno.html) | | dep | [asdf:paxosglobal/asdf-dep](https://github.com/paxosglobal/asdf-dep) | | depot | [asdf:depot/asdf-depot](https://github.com/depot/asdf-depot) | | desk | [asdf:endorama/asdf-desk](https://github.com/endorama/asdf-desk) | @@ -208,7 +206,7 @@ editLink: false | envcli | [asdf:zekker6/asdf-envcli](https://github.com/zekker6/asdf-envcli) | | envsubst | [asdf:dex4er/asdf-envsubst](https://github.com/dex4er/asdf-envsubst) | | ephemeral-postgres | [asdf:smashedtoatoms/asdf-ephemeral-postgres](https://github.com/smashedtoatoms/asdf-ephemeral-postgres) | -| erlang | [core:erlang](https://mise.jdx.dev/lang/erlang.html) | +| erlang | [asdf:asdf-vm/asdf-erlang](https://github.com/asdf-vm/asdf-erlang) | | esy | [asdf:asdf-community/asdf-esy](https://github.com/asdf-community/asdf-esy) | | etcd | [asdf:particledecay/asdf-etcd](https://github.com/particledecay/asdf-etcd) | | evans | [asdf:goki90210/asdf-evans](https://github.com/goki90210/asdf-evans) | @@ -259,7 +257,6 @@ editLink: false | glen | [asdf:bradym/asdf-glen](https://github.com/bradym/asdf-glen) | | glooctl | [asdf:halilkaya/asdf-glooctl](https://github.com/halilkaya/asdf-glooctl) | | glow | [asdf:chessmango/asdf-glow](https://github.com/chessmango/asdf-glow) | -| go | [core:go](https://mise.jdx.dev/lang/go.html) | | go-containerregistry | [asdf:dex4er/asdf-go-containerregistry](https://github.com/dex4er/asdf-go-containerregistry) | | go-getter | [asdf:ryodocx/asdf-go-getter](https://github.com/ryodocx/asdf-go-getter) | | go-jira | [asdf:dguihal/asdf-go-jira](https://github.com/dguihal/asdf-go-jira) | @@ -333,7 +330,6 @@ editLink: false | io | [asdf:mracos/asdf-io](https://github.com/mracos/asdf-io) | | istioctl | [asdf:virtualstaticvoid/asdf-istioctl](https://github.com/virtualstaticvoid/asdf-istioctl) | | janet | [asdf:Jakski/asdf-janet](https://github.com/Jakski/asdf-janet) | -| java | [core:java](https://mise.jdx.dev/lang/java.html) | | jb | [asdf:beardix/asdf-jb](https://github.com/beardix/asdf-jb) | | jbang | [asdf:jbangdev/jbang-asdf](https://github.com/jbangdev/jbang-asdf) | | jfrog-cli | [asdf:LozanoMatheus/asdf-jfrog-cli](https://github.com/LozanoMatheus/asdf-jfrog-cli) | @@ -488,7 +484,6 @@ editLink: false | nfpm | [asdf:ORCID/asdf-nfpm](https://github.com/ORCID/asdf-nfpm) | | nim | [asdf:asdf-community/asdf-nim](https://github.com/asdf-community/asdf-nim) | | ninja | [asdf:asdf-community/asdf-ninja](https://github.com/asdf-community/asdf-ninja) | -| node | [core:node](https://mise.jdx.dev/lang/node.html) | | nomad | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) | | nomad-pack | [asdf:asdf-community/asdf-hashicorp](https://github.com/asdf-community/asdf-hashicorp) | | notation | [asdf:bodgit/asdf-notation](https://github.com/bodgit/asdf-notation) | @@ -560,7 +555,6 @@ editLink: false | purerl | [asdf:GoNZooo/asdf-purerl](https://github.com/GoNZooo/asdf-purerl) | | purescript | [asdf:jrrom/asdf-purescript](https://github.com/jrrom/asdf-purescript) | | purty | [asdf:nsaunders/asdf-purty](https://github.com/nsaunders/asdf-purty) | -| python | [core:python](https://mise.jdx.dev/lang/python.html) | | qdns | [asdf:moritz-makandra/asdf-plugin-qdns](https://github.com/moritz-makandra/asdf-plugin-qdns) | | quarkus | [asdf:asdf-community/asdf-quarkus](https://github.com/asdf-community/asdf-quarkus) | | r | [asdf:asdf-community/asdf-r](https://github.com/asdf-community/asdf-r) | @@ -589,7 +583,6 @@ editLink: false | rlwrap | [asdf:asdf-community/asdf-rlwrap](https://github.com/asdf-community/asdf-rlwrap) | | rome | [asdf:kichiemon/asdf-rome](https://github.com/kichiemon/asdf-rome) | | rstash | [asdf:carlduevel/asdf-rstash](https://github.com/carlduevel/asdf-rstash) | -| ruby | [core:ruby](https://mise.jdx.dev/lang/ruby.html) | | ruff | [asdf:simhem/asdf-ruff](https://github.com/simhem/asdf-ruff) | | rust | [asdf:code-lever/asdf-rust](https://github.com/code-lever/asdf-rust) | | rust-analyzer | [asdf:Xyven1/asdf-rust-analyzer](https://github.com/Xyven1/asdf-rust-analyzer) | @@ -782,7 +775,7 @@ editLink: false | zbctl | [asdf:camunda-community-hub/asdf-zbctl](https://github.com/camunda-community-hub/asdf-zbctl) | | zellij | [asdf:chessmango/asdf-zellij](https://github.com/chessmango/asdf-zellij) | | zephyr | [asdf:nsaunders/asdf-zephyr](https://github.com/nsaunders/asdf-zephyr) | -| zig | [core:zig](https://mise.jdx.dev/lang/zig.html) | +| zig | [asdf:cheetah/asdf-zig](https://github.com/cheetah/asdf-zig) | | zigmod | [asdf:mise-plugins/asdf-zigmod](https://github.com/mise-plugins/asdf-zigmod) | | zola | [asdf:salasrod/asdf-zola](https://github.com/salasrod/asdf-zola) | | zoxide | [asdf:nyrst/asdf-zoxide](https://github.com/nyrst/asdf-zoxide) | diff --git a/src/cli/args/forge_arg.rs b/src/cli/args/forge_arg.rs index 88e6347b8..9cc5d512d 100644 --- a/src/cli/args/forge_arg.rs +++ b/src/cli/args/forge_arg.rs @@ -109,14 +109,14 @@ mod tests { }; let asdf = |s, id, name| t(s, id, name, ForgeType::Asdf); let cargo = |s, id, name| t(s, id, name, ForgeType::Cargo); - let core = |s, id, name| t(s, id, name, ForgeType::Core); + // let core = |s, id, name| t(s, id, name, ForgeType::Core); let npm = |s, id, name| t(s, id, name, ForgeType::Npm); asdf("asdf:poetry", "poetry", "poetry"); asdf("poetry", "poetry", "poetry"); asdf("", "", ""); cargo("cargo:eza", "cargo:eza", "eza"); - core("node", "node", "node"); + // core("node", "node", "node"); npm("npm:@antfu/ni", "npm:@antfu/ni", "@antfu/ni"); npm("npm:prettier", "npm:prettier", "prettier"); } diff --git a/src/cli/registry.rs b/src/cli/registry.rs index 4462c0655..601bfd330 100644 --- a/src/cli/registry.rs +++ b/src/cli/registry.rs @@ -73,6 +73,8 @@ mod tests { fn test_registry() { reset(); let out = assert_cli!("registry"); - assert_snapshot!(grep(out, "node"), @"node core:node"); + // TODO: enable this when core plugins are back in the registry + // assert_snapshot!(grep(out, "node"), @"node core:node"); + assert_snapshot!(grep(out, "poetry"), @"poetry asdf:mise-plugins/mise-poetry"); } } diff --git a/src/forge/mod.rs b/src/forge/mod.rs index 925754a60..e5c5f2239 100644 --- a/src/forge/mod.rs +++ b/src/forge/mod.rs @@ -21,7 +21,7 @@ use crate::forge::cargo::CargoForge; use crate::install_context::InstallContext; use crate::lock_file::LockFile; use crate::plugins::core::CORE_PLUGINS; -use crate::plugins::{core, ExternalPlugin, PluginType, VERSION_REGEX}; +use crate::plugins::{ExternalPlugin, PluginType, VERSION_REGEX}; use crate::runtime_symlinks::is_runtime_symlink; use crate::toolset::{ToolRequest, ToolVersion, Toolset}; use crate::ui::multi_progress_report::MultiProgressReport; @@ -63,7 +63,8 @@ impl Display for ForgeType { static FORGES: Mutex> = Mutex::new(None); -fn load_forges() -> ForgeMap { +// TODO: make this private +pub fn load_forges() -> ForgeMap { let mut forges = FORGES.lock().unwrap(); if let Some(forges) = &*forges { return forges.clone(); @@ -90,9 +91,7 @@ fn list_installed_forges() -> eyre::Result { match fa.forge_type { ForgeType::Asdf => Arc::new(ExternalPlugin::new(fa.name)) as AForge, ForgeType::Cargo => Arc::new(CargoForge::new(fa.name)) as AForge, - ForgeType::Core => { - core::get(&fa.name).unwrap_or_else(|| panic!("Core tool not found {fa}")) - } + ForgeType::Core => Arc::new(ExternalPlugin::new(fa.name)) as AForge, ForgeType::Npm => Arc::new(npm::NPMForge::new(fa.name)) as AForge, ForgeType::Go => Arc::new(go::GoForge::new(fa.name)) as AForge, ForgeType::Pipx => Arc::new(pipx::PIPXForge::new(fa.name)) as AForge, @@ -123,7 +122,7 @@ pub fn get(fa: &ForgeArg) -> AForge { .or_insert_with(|| match fa.forge_type { ForgeType::Asdf => Arc::new(ExternalPlugin::new(name)), ForgeType::Cargo => Arc::new(CargoForge::new(name)), - ForgeType::Core => core::get(&fa.name).unwrap(), + ForgeType::Core => Arc::new(ExternalPlugin::new(name)), ForgeType::Npm => Arc::new(npm::NPMForge::new(name)), ForgeType::Go => Arc::new(go::GoForge::new(name)), ForgeType::Pipx => Arc::new(pipx::PIPXForge::new(name)), diff --git a/src/plugins/core/mod.rs b/src/plugins/core/mod.rs index 50251f6f4..b2e9e9de1 100644 --- a/src/plugins/core/mod.rs +++ b/src/plugins/core/mod.rs @@ -52,10 +52,6 @@ pub static CORE_PLUGINS: Lazy = Lazy::new(|| { plugins }); -pub fn get(name: &str) -> Option> { - CORE_PLUGINS.iter().find(|p| p.name() == name).cloned() -} - #[derive(Debug)] pub struct CorePlugin { pub fa: ForgeArg, diff --git a/src/registry.rs b/src/registry.rs index 00c8ef88b..15b767f65 100644 --- a/src/registry.rs +++ b/src/registry.rs @@ -2,8 +2,6 @@ use std::collections::BTreeMap; use once_cell::sync::Lazy; -use crate::plugins::core::CORE_PLUGINS; - const _REGISTRY: &[(&str, &str)] = &[ ("ubi", "cargo:ubi"), ("cargo-binstall", "cargo:cargo-binstall"), @@ -11,9 +9,11 @@ const _REGISTRY: &[(&str, &str)] = &[ ]; pub static REGISTRY: Lazy> = Lazy::new(|| { - let core = CORE_PLUGINS - .iter() - .map(|p| (p.name(), format!("core:{}", p.name()))); + // TODO: make sure core plugins can be overridden with this enabled + // let core = CORE_PLUGINS + // .iter() + // .map(|p| (p.name(), format!("core:{}", p.name()))); let registry = _REGISTRY.iter().map(|(k, v)| (*k, v.to_string())); - core.chain(registry).collect() + registry.collect() + // core.chain(registry).collect() });