feat: multiple MISE_ENV environments

jdx · Dec 5, 2024 · 7ad74d5 · 7ad74d5
1 parent cc37bf0
commit 7ad74d5
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/docs/cli/index.md b/docs/cli/index.md
@@ -18,7 +18,7 @@ Shorthand for `mise task run <TASK>`.
 
 Change directory before running command
 
-### `-E --env <ENV>`
+### `-E --env... <ENV>`
 
 Set the environment for loading `mise.<ENV>.toml`
 

diff --git a/mise.usage.kdl b/mise.usage.kdl
@@ -17,7 +17,7 @@ flag "-C --cd" help="Change directory before running command" global=true {
 }
 flag "-n --dry-run" help="Dry run, don't actually do anything" hide=true global=true
 flag "--debug" help="Sets log level to debug" hide=true global=true
-flag "-E --env" help="Set the environment for loading `mise.<ENV>.toml`" global=true {
+flag "-E --env" help="Set the environment for loading `mise.<ENV>.toml`" var=true global=true {
     arg "<ENV>"
 }
 flag "-f --force" help="Force the operation" hide=true
@@ -31,7 +31,7 @@ flag "--log-level" hide=true global=true {
     }
 }
 flag "-p --prefix" hide=true
-flag "-P --profile" help="Set the profile (environment)" hide=true global=true {
+flag "-P --profile" help="Set the profile (environment)" var=true hide=true global=true {
     arg "<PROFILE>"
 }
 flag "-s --shell" hide=true {

diff --git a/src/cli/mod.rs b/src/cli/mod.rs
@@ -111,7 +111,7 @@ pub struct Cli {
     #[clap(long, short, hide = true, overrides_with = "interleave")]
     pub prefix: bool,
     /// Set the profile (environment)
-    #[clap(short = 'P', long, global = true, hide = true)]
+    #[clap(short = 'P', long, global = true, hide = true, conflicts_with = "env")]
     pub profile: Option<Vec<String>>,
     #[clap(long, short, hide = true)]
     pub shell: Option<String>,

diff --git a/src/env.rs b/src/env.rs
@@ -431,6 +431,7 @@ fn environment(args: &[String]) -> Vec<String> {
         .or_else(|| var("MISE_ENVIRONMENT").ok())
         .unwrap_or_default()
         .split(',')
+        .filter(|s| !s.is_empty())
         .map(String::from)
         .collect()
 }

diff --git a/xtasks/fig/src/mise.ts b/xtasks/fig/src/mise.ts
@@ -3145,7 +3145,7 @@ const completionSpec: Fig.Spec = {
                 "--env"
             ],
             "description": "Set the environment for loading `mise.<ENV>.toml`",
-            "isRepeatable": false,
+            "isRepeatable": true,
             "args": {
                 "name": "env",
                 "isOptional": false,