feat: set process as last argument in all commands (related to #18)

Author: ankddev

README.md

@@ -88,7 +88,7 @@ This will start TUI, where you will be able to work with environment variables.
 Set environment variable and optionally run process.
 
 Usage:
-`envfetch set <KEY> <VALUE> [PROCESS]`, where:
+`envfetch set <KEY> <VALUE> [-- <PROCESS>]`, where:
 - `KEY` - name of environment variable
 - `VALUE` - value of environment variable
 - `PROCESS` - name of process which you want to run (optional if --global is used)
@@ -101,14 +101,14 @@ Options:
 
 For example:
 ```shell
-$ envfetch set MY_VAR "Hello" "npm run"  # temporary for process
-$ envfetch set MY_VAR "Hello" --global   # permanent system-wide
+$ envfetch set MY_VAR "Hello" -- "npm run"  # temporary for process
+$ envfetch set MY_VAR "Hello" --global      # permanent system-wide
 ```
 #### Add
 Add value to the end of environment variable and optionally run the process
 
 Usage:
-`envfetch add <KEY> <VALUE> [PROCESS]`, where:
+`envfetch add <KEY> <VALUE> [-- <PROCESS>]`, where:
 - `KEY` - name of environment variable
 - `VALUE` - value of environment variable to add
 - `PROCESS` - name of process which you want to run (optional if --global is used)
@@ -121,8 +121,8 @@ Options:
 
 For example:
 ```shell
-$ envfetch add PATH "../hello.exe" "crago run"  # temporary for process
-$ envfetch add MY_VAR "Hello" --global   # permanent system-wide
+$ envfetch add PATH "../hello.exe" -- "cargo run"  # temporary for process
+$ envfetch add MY_VAR "Hello" --global             # permanent system-wide
 ```
 #### Print
 Print all environment variables
@@ -164,7 +164,7 @@ It will print value of specified variable.
 Delete variable and optionally start process.
 
 Usage:
-`envfetch delete <KEY> [PROCESS]`, where:
+`envfetch delete <KEY> [-- <PROCESS>]`, where:
 - `KEY` - name of environment variable
 - `PROCESS` - name of command to run (optional if --global is used)
 
@@ -174,8 +174,8 @@ Options:
 
 For example:
 ```shell
-$ envfetch delete MY_VAR "npm run"  # temporary for process
-$ envfetch delete MY_VAR --global   # permanent system-wide
+$ envfetch delete MY_VAR -- "npm run"  # temporary for process
+$ envfetch delete MY_VAR --global      # permanent system-wide
 ```
 
 #### Load
@@ -193,7 +193,7 @@ By default, program loads variables from `.env` file in current directory.
 
 For example:
 ```shell
-$ envfetch load "npm run"                    # temporary for process
+$ envfetch load -- "npm run"                 # temporary for process
 $ envfetch load --global                     # permanent system-wide
 $ envfetch load --global --file .env.prod    # permanent from specific file
 ```
@@ -223,7 +223,6 @@ $ cd envfetch
 $ cargo run -- <COMMAND> <ARGS>
 ```
 # See Also
-
 - [codewars-api-rs](https://github.com/ankddev/codewars-api-rs) - Rust library for Codewars API
 - [conemu-progressbar-go](https://github.com/ankddev/conemu-progressbar-go) - Progress bar for ConEmu for Go
 - [terminal-go](https://github.com/ankddev/terminal-go) - Go library for working with ANSI/VT terminal sequences

src/main.rs

@@ -68,7 +68,7 @@ mod tests {
 
     #[test]
     fn test_set_command_simple() {
-        let args = Cli::parse_from(["envfetch", "set", "VAR", "VALUE", "npm run"]);
+        let args = Cli::parse_from(["envfetch", "set", "VAR", "VALUE", "--", "npm run"]);
         assert_eq!(
             args.command,
             Commands::Set(SetArgs {
@@ -96,7 +96,7 @@ mod tests {
 
     #[test]
     fn test_set_command_with_global_flag_and_process() {
-        let args = Cli::parse_from(["envfetch", "set", "VAR", "VALUE", "npm run", "--global"]);
+        let args = Cli::parse_from(["envfetch", "set", "VAR", "VALUE", "--global", "--", "npm run"]);
         assert_eq!(
             args.command,
             Commands::Set(SetArgs {
@@ -110,7 +110,7 @@ mod tests {
 
     #[test]
     fn test_add_command_simple() {
-        let args = Cli::parse_from(["envfetch", "add", "PATH", "./executable", "npm run"]);
+        let args = Cli::parse_from(["envfetch", "add", "PATH", "./executable", "--", "npm run"]);
         assert_eq!(
             args.command,
             Commands::Add(AddArgs {
@@ -143,8 +143,9 @@ mod tests {
             "add",
             "PATH",
             "./executable",
-            "npm run",
             "--global",
+            "--",
+            "npm run",
         ]);
         assert_eq!(
             args.command,
@@ -159,7 +160,7 @@ mod tests {
 
     #[test]
     fn test_delete_command_simple() {
-        let args = Cli::parse_from(["envfetch", "delete", "VAR", "npm run"]);
+        let args = Cli::parse_from(["envfetch", "delete", "VAR", "--", "npm run"]);
         assert_eq!(
             args.command,
             Commands::Delete(DeleteArgs {
@@ -185,7 +186,7 @@ mod tests {
 
     #[test]
     fn test_delete_command_with_global_flag_and_process() {
-        let args = Cli::parse_from(["envfetch", "delete", "VAR", "npm run", "--global"]);
+        let args = Cli::parse_from(["envfetch", "delete", "VAR", "--global", "--", "npm run"]);
         assert_eq!(
             args.command,
             Commands::Delete(DeleteArgs {

src/models.rs

@@ -58,7 +58,7 @@ pub struct LoadArgs {
     #[arg(required = false, long, short)]
     pub global: bool,
     /// Process to start, not required if --global flag is set
-    #[arg(required_unless_present = "global")]
+    #[arg(last = true, required_unless_present = "global")]
     pub process: Option<String>,
     /// Relative or absolute path to file to read variables from.
     /// Note that it must be in .env format
@@ -79,7 +79,7 @@ pub struct SetArgs {
     #[arg(required = false, long, short)]
     pub global: bool,
     /// Process to start, not required if --global flag is set
-    #[arg(required_unless_present = "global")]
+    #[arg(last = true, required_unless_present = "global")]
     pub process: Option<String>,
 }
 
@@ -96,7 +96,7 @@ pub struct AddArgs {
     #[arg(required = false, long, short)]
     pub global: bool,
     /// Process to start, not required if --global flag is set
-    #[arg(required_unless_present = "global")]
+    #[arg(last = true, required_unless_present = "global")]
     pub process: Option<String>,
 }
 
@@ -110,7 +110,7 @@ pub struct DeleteArgs {
     #[arg(required = false, long, short)]
     pub global: bool,
     /// Process to start, not required if --global flag is set
-    #[arg(required_unless_present = "global")]
+    #[arg(last = true, required_unless_present = "global")]
     pub process: Option<String>,
 }
 

tests/cli.rs

@@ -15,14 +15,14 @@ fn set_command_success() -> Result<(), Box<dyn std::error::Error>> {
     cmd.arg("set").arg("MY_VAR").arg("Hello");
     // Windows
     #[cfg(target_os = "windows")]
-    cmd.arg("echo %MY_VAR%")
+    cmd.arg("--").arg("echo %MY_VAR%")
         .assert()
         .success()
         .stdout(predicate::str::contains("Hello"));
 
     // Linux and macOS
     #[cfg(not(target_os = "windows"))]
-    cmd.arg("echo $MY_VAR")
+    cmd.arg("--").arg("echo $MY_VAR")
         .assert()
         .success()
         .stdout(predicate::str::contains("Hello"));
@@ -36,15 +36,14 @@ fn set_command_failure() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("envfetch")?;
     cmd.arg("set").arg("MY_VARR").arg("Hello");
     // We can use only Windows command here because it should fail
-    cmd.arg("%MY_VARIABLE%").assert().failure();
+    cmd.arg("--").arg("%MY_VARIABLE%").assert().failure();
     Ok(())
 }
 
 #[test]
 /// Test for get command if specified variable exists
 fn get_variable_exists() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("envfetch")?;
-    // TODO: Audit that the environment access only happens in single-threaded code.
     unsafe { env::set_var("MY_VAR", "Hello") };
     cmd.arg("get").arg("MY_VAR");
     cmd.assert()
@@ -67,7 +66,6 @@ fn get_variable_doesnt_exists() -> Result<(), Box<dyn std::error::Error>> {
 #[test]
 /// Test for get command if specified variable doesn't exist and showing similar variables is enabled
 fn get_variable_doesnt_exists_similar_enabled() -> Result<(), Box<dyn std::error::Error>> {
-    // TODO: Audit that the environment access only happens in single-threaded code.
     unsafe { env::set_var("MY_VARIABLEE", "Hello") };
     let mut cmd = Command::cargo_bin("envfetch")?;
     cmd.arg("get").arg("MY_VARIABLE");
@@ -85,7 +83,6 @@ fn get_variable_doesnt_exists_similar_enabled() -> Result<(), Box<dyn std::error
 /// Test for get command if specified variable doesn't exist and showing similar variables is disabled
 fn get_variable_doesnt_exists_similar_disabled() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("envfetch")?;
-    // TODO: Audit that the environment access only happens in single-threaded code.
     unsafe { env::set_var("MY_VARIABLEE", "Hello") };
     cmd.arg("get").arg("MY_VARIABLE").arg("--no-similar-names");
     cmd.assert().failure();
@@ -96,7 +93,6 @@ fn get_variable_doesnt_exists_similar_disabled() -> Result<(), Box<dyn std::erro
 /// Test for print command
 fn print_success() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("envfetch")?;
-    // TODO: Audit that the environment access only happens in single-threaded code.
     unsafe { env::set_var("PRINT_TEST", "Print") };
     cmd.arg("print")
         .assert()
@@ -109,12 +105,11 @@ fn print_success() -> Result<(), Box<dyn std::error::Error>> {
 /// Test for delete command if specified process is successful
 fn delete_command_success() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("envfetch")?;
-    // TODO: Audit that the environment access only happens in single-threaded code.
     unsafe { env::set_var("MY_VAR", "Hello") };
     cmd.arg("delete").arg("MY_VAR");
     // Windows
     #[cfg(target_os = "windows")]
-    cmd.arg("echo 'Hello'")
+    cmd.arg("--").arg("echo 'Hello'")
         .assert()
         .success()
         .stdout(predicate::str::contains("Hello"));
@@ -137,14 +132,14 @@ fn load_custom_file_exists() -> Result<(), Box<dyn std::error::Error>> {
     cmd.arg("load").arg("--file").arg(file.path());
     // Windows
     #[cfg(target_os = "windows")]
-    cmd.arg("echo %MY_ENV_VAR%")
+    cmd.arg("--").arg("echo %MY_ENV_VAR%")
         .assert()
         .success()
         .stdout(predicate::str::contains("TEST"));
 
     // Linux and macOS
     #[cfg(not(target_os = "windows"))]
-    cmd.arg("echo $MY_ENV_VAR")
+    cmd.arg("--").arg("echo $MY_ENV_VAR")
         .assert()
         .success()
         .stdout(predicate::str::contains("TEST"));
@@ -163,14 +158,14 @@ fn load_custom_file_exists_command_failed() -> Result<(), Box<dyn std::error::Er
     cmd.arg("load").arg("--file").arg(file.path());
     // Windows
     #[cfg(target_os = "windows")]
-    cmd.arg("echo %MY_ENV_VAR_TEST%")
+    cmd.arg("--").arg("echo %MY_ENV_VAR_TEST%")
         .assert()
         .success()
         .stdout(predicate::str::contains("%MY_ENV_VAR_TEST%"));
 
     // Linux and macOS
     #[cfg(not(target_os = "windows"))]
-    cmd.arg("(exit 1)").assert().failure();
+    cmd.arg("--").arg("(exit 1)").assert().failure();
     // Close file after test
     file.close().unwrap();
     Ok(())
@@ -183,11 +178,11 @@ fn load_custom_file_doesnt_exists() -> Result<(), Box<dyn std::error::Error>> {
     cmd.arg("load").arg("--file").arg(".env.production");
     // Windows
     #[cfg(target_os = "windows")]
-    cmd.arg("echo %MY_ENV_VAR%").assert().failure();
+    cmd.arg("--").arg("echo %MY_ENV_VAR%").assert().failure();
 
     // Linux and macOS
     #[cfg(not(target_os = "windows"))]
-    cmd.arg("echo $MY_VARIABLE").assert().failure();
+    cmd.arg("--").arg("echo $MY_VARIABLE").assert().failure();
     Ok(())
 }
 
@@ -203,6 +198,7 @@ fn test_add_local_variable() -> Result<(), Box<dyn std::error::Error>> {
         "add",
         "TEST_VAR",
         "test_value",
+        "--",
         &format!("{} get TEST_VAR", envfetch),
     ])
     .assert()
@@ -224,6 +220,7 @@ fn test_add_variable_with_special_characters() -> Result<(), Box<dyn std::error:
         "add",
         "SPECIAL_VAR",
         "test@#$%^&*",
+        "--",
         &format!("{} get SPECIAL_VAR", envfetch),
     ])
     .assert()
@@ -245,6 +242,7 @@ fn test_add_empty_value() -> Result<(), Box<dyn std::error::Error>> {
         "add",
         "EMPTY_VAR",
         "",
+        "--",
         &format!("{} get EMPTY_VAR", envfetch),
     ])
     .assert()
@@ -257,7 +255,7 @@ fn test_add_empty_value() -> Result<(), Box<dyn std::error::Error>> {
 #[test]
 fn test_add_invalid_variable_name() -> Result<(), Box<dyn std::error::Error>> {
     let mut cmd = Command::cargo_bin("envfetch")?;
-    cmd.args(["add", "INVALID NAME", "test_value", "echo test"])
+    cmd.args(["add", "INVALID NAME", "test_value", "--", "echo test"])
         .assert()
         .failure()
         .stderr(predicates::str::contains(
@@ -285,6 +283,7 @@ fn test_add_with_process() -> Result<(), Box<dyn std::error::Error>> {
         "add",
         "PROCESS_VAR",
         "test_value",
+        "--",
         &format!("{} get PROCESS_VAR", envfetch),
     ])
     .assert()