feat: mise rm

Fixes #1465
jdx · Dec 18, 2024 · df387b7 · df387b7
1 parent ab902be
commit df387b7
Show file tree

Hide file tree

Showing 11 changed files with 157 additions and 50 deletions.
diff --git a/e2e/cli/test_unuse b/e2e/cli/test_unuse
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+assert "mise use dummy@1.0.0"
+assert_contains "mise ls dummy" "1.0.0"
+assert "mise unuse dummy"
+assert_empty "mise ls dummy"
+
+assert "mise use dummy@1.0.0"
+mkdir subdir
+cd subdir || exit 1
+assert "mise use -p mise.toml dummy@1.0.0"
+assert "mise ls dummy" "dummy  1.0.0  ~/workdir/subdir/mise.toml  1.0.0"
+assert "mise unuse dummy"
+# version is not pruned because it's in ~/workdir/mise.toml
+assert "mise ls dummy" "dummy  1.0.0  ~/workdir/mise.toml  1.0.0"
+assert "mise unuse dummy"
+assert_empty "mise ls dummy"
+
+assert "mise use -g dummy@1.0.0"
+assert "mise ls dummy" "dummy  1.0.0  ~/.config/mise/config.toml  1.0.0"
+assert "mise unuse dummy"
+assert_empty "mise ls dummy"
diff --git a/src/cli/local.rs b/src/cli/local.rs
@@ -115,7 +115,7 @@ pub fn local(
 
     if let Some(plugins) = &remove {
         for plugin in plugins {
-            cf.remove_plugin(plugin)?;
+            cf.remove_tool(plugin)?;
         }
         let tools = plugins
             .iter()

diff --git a/src/cli/mod.rs b/src/cli/mod.rs
@@ -65,6 +65,7 @@ pub mod version;
 mod watch;
 mod r#where;
 mod r#which;
+mod unuse;
 
 #[derive(clap::ValueEnum, Debug, Clone, strum::Display)]
 #[strum(serialize_all = "kebab-case")]
@@ -222,6 +223,7 @@ pub enum Commands {
     Trust(trust::Trust),
     Uninstall(uninstall::Uninstall),
     Unset(unset::Unset),
+    Unuse(unuse::Unuse),
     Upgrade(upgrade::Upgrade),
     Usage(usage::Usage),
     Use(r#use::Use),
@@ -284,6 +286,7 @@ impl Commands {
             Self::Trust(cmd) => cmd.run(),
             Self::Uninstall(cmd) => cmd.run(),
             Self::Unset(cmd) => cmd.run(),
+            Self::Unuse(cmd) => cmd.run(),
             Self::Upgrade(cmd) => cmd.run(),
             Self::Usage(cmd) => cmd.run(),
             Self::Use(cmd) => cmd.run(),

diff --git a/src/cli/prune.rs b/src/cli/prune.rs
@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 use std::sync::Arc;
 
 use crate::backend::Backend;
-use crate::cli::args::BackendArg;
+use crate::cli::args::{BackendArg, ToolArg};
 use crate::config::tracking::Tracker;
 use crate::config::{Config, SETTINGS};
 use crate::toolset::{ToolVersion, Toolset, ToolsetBuilder};
@@ -22,9 +22,9 @@ use super::trust::Trust;
 #[derive(Debug, clap::Args)]
 #[clap(verbatim_doc_comment, after_long_help = AFTER_LONG_HELP)]
 pub struct Prune {
-    /// Prune only versions from this plugin(s)
+    /// Prune only these tools
     #[clap()]
-    pub plugin: Option<Vec<BackendArg>>,
+    pub installed_tool: Option<Vec<ToolArg>>,
 
     /// Do not actually delete anything
     #[clap(long, short = 'n')]
@@ -45,7 +45,11 @@ impl Prune {
             self.prune_configs()?;
         }
         if self.tools || !self.configs {
-            self.prune_tools()?;
+            let backends = self
+                .installed_tool
+                .as_ref()
+                .map(|it| it.iter().map(|ta| &ta.ba).collect());
+            prune(backends.unwrap_or_default(), self.dry_run)?;
         }
         Ok(())
     }
@@ -60,49 +64,46 @@ impl Prune {
         }
         Ok(())
     }
+}
 
-    fn prune_tools(&self) -> Result<()> {
-        let config = Config::try_get()?;
-        let ts = ToolsetBuilder::new().build(&config)?;
-        let mut to_delete = ts
-            .list_installed_versions()?
-            .into_iter()
-            .map(|(p, tv)| ((tv.ba().short.to_string(), tv.tv_pathname()), (p, tv)))
-            .collect::<BTreeMap<(String, String), (Arc<dyn Backend>, ToolVersion)>>();
+pub fn prune(tools: Vec<&BackendArg>, dry_run: bool) -> Result<()> {
+    let config = Config::try_get()?;
+    let ts = ToolsetBuilder::new().build(&config)?;
+    let mut to_delete = ts
+        .list_installed_versions()?
+        .into_iter()
+        .map(|(p, tv)| ((tv.ba().short.to_string(), tv.tv_pathname()), (p, tv)))
+        .collect::<BTreeMap<(String, String), (Arc<dyn Backend>, ToolVersion)>>();
 
-        if let Some(backends) = &self.plugin {
-            to_delete.retain(|_, (_, tv)| backends.contains(tv.ba()));
-        }
+    if !tools.is_empty() {
+        to_delete.retain(|_, (_, tv)| tools.contains(&&tv.ba()));
+    }
 
-        for cf in config.get_tracked_config_files()?.values() {
-            let mut ts = Toolset::from(cf.to_tool_request_set()?);
-            ts.resolve()?;
-            for (_, tv) in ts.list_current_versions() {
-                to_delete.remove(&(tv.ba().short.to_string(), tv.tv_pathname()));
-            }
+    for cf in config.get_tracked_config_files()?.values() {
+        let mut ts = Toolset::from(cf.to_tool_request_set()?);
+        ts.resolve()?;
+        for (_, tv) in ts.list_current_versions() {
+            to_delete.remove(&(tv.ba().short.to_string(), tv.tv_pathname()));
         }
-
-        self.delete(to_delete.into_values().collect())
     }
 
-    fn delete(&self, to_delete: Vec<(Arc<dyn Backend>, ToolVersion)>) -> Result<()> {
-        let mpr = MultiProgressReport::get();
-        for (p, tv) in to_delete {
-            let mut prefix = tv.style();
-            if self.dry_run {
-                prefix = format!("{} {} ", prefix, style("[dryrun]").bold());
-            }
-            let pr = mpr.add(&prefix);
-            if self.dry_run
-                || SETTINGS.yes
-                || prompt::confirm_with_all(format!("remove {} ?", &tv))?
-            {
-                p.uninstall_version(&tv, pr.as_ref(), self.dry_run)?;
-                pr.finish();
-            }
+    delete(dry_run, to_delete.into_values().collect())
+}
+
+fn delete(dry_run: bool, to_delete: Vec<(Arc<dyn Backend>, ToolVersion)>) -> Result<()> {
+    let mpr = MultiProgressReport::get();
+    for (p, tv) in to_delete {
+        let mut prefix = tv.style();
+        if dry_run {
+            prefix = format!("{} {} ", prefix, style("[dryrun]").bold());
+        }
+        let pr = mpr.add(&prefix);
+        if dry_run || SETTINGS.yes || prompt::confirm_with_all(format!("remove {} ?", &tv))? {
+            p.uninstall_version(&tv, pr.as_ref(), dry_run)?;
+            pr.finish();
         }
-        Ok(())
     }
+    Ok(())
 }
 
 static AFTER_LONG_HELP: &str = color_print::cstr!(

diff --git a/src/cli/uninstall.rs b/src/cli/uninstall.rs
@@ -16,7 +16,7 @@ use crate::{config, dirs, file};
 ///
 /// This only removes the installed version, it does not modify mise.toml.
 #[derive(Debug, clap::Args)]
-#[clap(verbatim_doc_comment, visible_aliases = ["remove", "rm"], after_long_help = AFTER_LONG_HELP)]
+#[clap(verbatim_doc_comment, after_long_help = AFTER_LONG_HELP)]
 pub struct Uninstall {
     /// Tool(s) to remove
     #[clap(value_name = "INSTALLED_TOOL@VERSION", required_unless_present = "all")]

diff --git a/src/cli/unuse.rs b/src/cli/unuse.rs
@@ -0,0 +1,76 @@
+use eyre::Result;
+
+use crate::cli::args::ToolArg;
+use crate::cli::prune::prune;
+use crate::config;
+use crate::config::config_file::ConfigFile;
+use crate::config::{config_file, Config};
+use crate::file::display_path;
+
+/// Removes installed tool versions from mise.toml
+///
+/// Will also prune the installed version if no other configurations are using it.
+#[derive(Debug, clap::Args)]
+#[clap(verbatim_doc_comment, visible_aliases = ["rm", "remove"], after_long_help = AFTER_LONG_HELP)]
+pub struct Unuse {
+    /// Tool(s) to remove
+    #[clap(value_name = "INSTALLED_TOOL@VERSION", required = true)]
+    installed_tool: Vec<ToolArg>,
+
+    /// Do not also prune the installed version
+    #[clap(long)]
+    no_prune: bool,
+
+    /// Remove tool from global config
+    #[clap(long)]
+    global: bool,
+}
+
+impl Unuse {
+    pub fn run(self) -> Result<()> {
+        let config = Config::get();
+        let mut cf = self.get_config_file(&config)?;
+        let tools = cf.to_tool_request_set()?.tools;
+        let mut removed = vec![];
+        for ta in &self.installed_tool {
+            if tools.contains_key(&ta.ba) {
+                removed.push(ta);
+            }
+            cf.remove_tool(&ta.ba)?;
+        }
+        if removed.is_empty() {
+            debug!("no tools to remove");
+            return Ok(());
+        }
+        cf.save()?;
+        info!("removed: {} from {}", removed.iter().map(|ta| ta.to_string()).collect::<Vec<_>>().join(", "), display_path(cf.get_path()));
+
+        if !self.no_prune {
+            prune(self.installed_tool.iter().map(|ta| &ta.ba).collect(), false)?;
+        }
+
+        Ok(())
+    }
+
+    pub fn get_config_file(&self, config: &Config) -> Result<Box<dyn ConfigFile>> {
+        for cf in config.config_files.values() {
+            if cf
+                .to_tool_request_set()?
+                .tools
+                .keys()
+                .any(|ba| self.installed_tool.iter().any(|ta| ta.ba == *ba))
+            {
+                return config_file::parse(cf.get_path());
+            }
+        }
+        config_file::parse_or_init(&config::local_toml_config_path())
+    }
+}
+
+static AFTER_LONG_HELP: &str = color_print::cstr!(
+    r#"<bold><underline>Examples:</underline></bold>
+
+    # will uninstall specific version
+    $ <bold>mise remove node@18.0.0</bold>
+"#
+);
diff --git a/src/cli/use.rs b/src/cli/use.rs
@@ -179,7 +179,7 @@ impl Use {
             self.warn_if_hidden(&config, cf.get_path());
         }
         for plugin_name in &self.remove {
-            cf.remove_plugin(plugin_name)?;
+            cf.remove_tool(plugin_name)?;
         }
         cf.save()?;
 

diff --git a/src/config/config_file/idiomatic_version.rs b/src/config/config_file/idiomatic_version.rs
@@ -56,7 +56,7 @@ impl ConfigFile for IdiomaticVersionFile {
     }
 
     #[cfg_attr(coverage_nightly, coverage(off))]
-    fn remove_plugin(&mut self, _fa: &BackendArg) -> Result<()> {
+    fn remove_tool(&mut self, _fa: &BackendArg) -> Result<()> {
         unimplemented!()
     }
 

diff --git a/src/config/config_file/mise_toml.rs b/src/config/config_file/mise_toml.rs
@@ -307,7 +307,7 @@ impl ConfigFile for MiseToml {
         self.tasks.0.values().collect()
     }
 
-    fn remove_plugin(&mut self, fa: &BackendArg) -> eyre::Result<()> {
+    fn remove_tool(&mut self, fa: &BackendArg) -> eyre::Result<()> {
         self.tools.shift_remove(fa);
         let doc = self.doc_mut()?;
         if let Some(tools) = doc.get_mut("tools") {
@@ -1752,7 +1752,7 @@ mod tests {
         )
         .unwrap();
         let mut cf = MiseToml::from_file(&p).unwrap();
-        cf.remove_plugin(&"node".into()).unwrap();
+        cf.remove_tool(&"node".into()).unwrap();
 
         assert_debug_snapshot!(cf.to_toolset().unwrap());
         let cf: Box<dyn ConfigFile> = Box::new(cf);

diff --git a/src/config/config_file/mod.rs b/src/config/config_file/mod.rs
@@ -80,7 +80,7 @@ pub trait ConfigFile: Debug + Send + Sync {
     fn tasks(&self) -> Vec<&Task> {
         Default::default()
     }
-    fn remove_plugin(&mut self, ba: &BackendArg) -> eyre::Result<()>;
+    fn remove_tool(&mut self, ba: &BackendArg) -> eyre::Result<()>;
     fn replace_versions(&mut self, ba: &BackendArg, versions: Vec<ToolRequest>)
         -> eyre::Result<()>;
     fn save(&self) -> eyre::Result<()>;
@@ -216,9 +216,14 @@ fn init(path: &Path) -> Box<dyn ConfigFile> {
 }
 
 pub fn parse_or_init(path: &Path) -> eyre::Result<Box<dyn ConfigFile>> {
+    let path = if path.is_dir() {
+        path.join("mise.toml")
+    } else {
+        path.into()
+    };
     let cf = match path.exists() {
-        true => parse(path)?,
-        false => init(path),
+        true => parse(&path)?,
+        false => init(&path),
     };
     Ok(cf)
 }
@@ -501,7 +506,7 @@ fn trust_file_hash(path: &Path) -> eyre::Result<bool> {
 }
 
 fn detect_config_file_type(path: &Path) -> Option<ConfigFileType> {
-    match path.file_name().unwrap().to_str().unwrap() {
+    match path.file_name().and_then(|f| f.to_str()).unwrap_or("mise.toml") {
         f if f.ends_with(".toml") => Some(ConfigFileType::MiseToml),
         f if env::MISE_OVERRIDE_CONFIG_FILENAMES.contains(f) => Some(ConfigFileType::MiseToml),
         f if env::MISE_DEFAULT_CONFIG_FILENAME.as_str() == f => Some(ConfigFileType::MiseToml),

diff --git a/src/config/config_file/tool_versions.rs b/src/config/config_file/tool_versions.rs
@@ -150,7 +150,7 @@ impl ConfigFile for ToolVersions {
         self.path.as_path()
     }
 
-    fn remove_plugin(&mut self, fa: &BackendArg) -> Result<()> {
+    fn remove_tool(&mut self, fa: &BackendArg) -> Result<()> {
         self.plugins.shift_remove(fa);
         Ok(())
     }