Support providing profile as an argument

rossmacarthur · Jan 26, 2024 · 96bf4a5 · 96bf4a5
1 parent eacf945
commit 96bf4a5
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 6 deletions.
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
@@ -68,7 +68,7 @@ impl Opt {
             data_dir,
             config_dir,
             config_file,
-            profile,
+            mut profile,
             command,
         } = raw_opt;
 
@@ -85,15 +85,22 @@ impl Opt {
             }
             RawCommand::Edit => Command::Edit,
             RawCommand::Remove { name } => Command::Remove { name },
-            RawCommand::Lock { update, reinstall } => {
+            RawCommand::Lock {
+                update,
+                reinstall,
+                profile: p,
+            } => {
+                profile = p.or(profile);
                 lock_mode = LockMode::from_lock_flags(update, reinstall);
                 Command::Lock
             }
             RawCommand::Source {
                 relock,
                 update,
                 reinstall,
+                profile: p,
             } => {
+                profile = p.or(profile);
                 lock_mode = LockMode::from_source_flags(relock, update, reinstall);
                 Command::Source
             }

diff --git a/src/cli/raw.rs b/src/cli/raw.rs
@@ -100,6 +100,10 @@ pub enum RawCommand {
         /// Reinstall all plugin sources.
         #[clap(long, conflicts_with = "update")]
         reinstall: bool,
+
+        /// The profile used for conditional plugins.
+        #[clap(value_name = "PROFILE", env = "SHELDON_PROFILE")]
+        profile: Option<String>,
     },
 
     /// Generate and print out the script.
@@ -115,6 +119,10 @@ pub enum RawCommand {
         /// Reinstall all plugin sources (implies --relock).
         #[clap(long, conflicts_with = "update")]
         reinstall: bool,
+
+        /// The profile used for conditional plugins.
+        #[clap(value_name = "PROFILE", env = "SHELDON_PROFILE")]
+        profile: Option<String>,
     },
 
     /// Generate completions for the given shell.

diff --git a/src/cli/testdata/raw_opt_lock_help.golden b/src/cli/testdata/raw_opt_lock_help.golden
@@ -1,6 +1,9 @@
 Install the plugins sources and generate the lock file
 
-Usage: sheldon lock [OPTIONS]
+Usage: sheldon lock [OPTIONS] [PROFILE]
+
+Arguments:
+  [PROFILE]  The profile used for conditional plugins [env: SHELDON_PROFILE=]
 
 Options:
       --update     Update all plugin sources

diff --git a/src/cli/testdata/raw_opt_source_help.golden b/src/cli/testdata/raw_opt_source_help.golden
@@ -1,6 +1,9 @@
 Generate and print out the script
 
-Usage: sheldon source [OPTIONS]
+Usage: sheldon source [OPTIONS] [PROFILE]
+
+Arguments:
+  [PROFILE]  The profile used for conditional plugins [env: SHELDON_PROFILE=]
 
 Options:
       --relock     Regenerate the lock file

diff --git a/src/cli/tests.rs b/src/cli/tests.rs
@@ -73,7 +73,8 @@ fn raw_opt_no_options() {
             profile: None,
             command: RawCommand::Lock {
                 update: false,
-                reinstall: false
+                reinstall: false,
+                profile: None,
             },
         }
     );
@@ -97,6 +98,7 @@ fn raw_opt_options() {
             "--profile",
             "profile",
             "lock",
+            "profile2",
         ]),
         RawOpt {
             quiet: true,
@@ -109,7 +111,8 @@ fn raw_opt_options() {
             profile: Some("profile".into()),
             command: RawCommand::Lock {
                 update: false,
-                reinstall: false
+                reinstall: false,
+                profile: Some("profile2".into()),
             },
         }
     );