Switch to clap 4 (incomplete)

Author: gaborcsardi

Cargo.lock

@@ -59,3 +59,7 @@ clap_complete = "4.1.2"
 lazy_static = "1.4.0"
 simplelog = { version = "^0.12.0", features = ["paris"] }
 static_vcruntime = "2.0"
+
+[dev-dependencies]
+assert_cmd = "2.0.8"
+predicates = "2.1.5"

Cargo.toml

@@ -0,0 +1,52 @@
+use assert_cmd::prelude::*; // Add methods on commands
+use predicates::prelude::*; // Used for writing assertions
+use std::process::Command; // Run programs
+
+#[test]
+fn rig_add_invalid_version() -> Result<(), Box<dyn std::error::Error>> {
+    let mut cmd = Command::cargo_bin("rig")?;
+    cmd.args(["add", "foobar"]);
+    cmd.assert()
+        .failure()
+        .stderr(predicate::str::contains("Failed to resolve R version"));
+
+    Ok(())
+}
+
+#[test]
+fn rig_add() -> Result<(), Box<dyn std::error::Error>> {
+    let mut cmd = Command::cargo_bin("rig")?;
+    cmd.args(["add", "4.1"]);
+    cmd.assert()
+        .success();
+
+    let mut cmd2 = Command::cargo_bin("rig")?;
+    cmd2.args(["ls", "--json"]);
+    cmd2.assert()
+        .success()
+        .stdout(predicate::str::contains("\"name\": \"4.1"));
+
+    let mut cmd3 = Command::cargo_bin("rig")?;
+    cmd3.args(["add", "4.2"]);
+    cmd3.assert()
+        .success();
+
+    let mut cmd4 = Command::cargo_bin("rig")?;
+    cmd4.args(["ls", "--json"]);
+    cmd4.assert()
+        .success()
+        .stdout(predicate::str::contains("\"name\": \"4.2"));
+
+    let mut cmd5 = Command::cargo_bin("rig")?;
+    cmd5.args(["add", "devel"]);
+    cmd5.assert()
+        .success();
+
+    let mut cmd6 = Command::cargo_bin("rig")?;
+    cmd6.args(["ls", "--json"]);
+    cmd6.assert()
+        .success()
+        .stdout(predicate::str::contains("\"aliases\": [\"devel\"],"));
+    
+    Ok(())
+}

tests/rig-add.rs

@@ -0,0 +1,25 @@
+use assert_cmd::prelude::*; // Add methods on commands
+use predicates::prelude::*; // Used for writing assertions
+use std::process::Command; // Run programs
+
+#[test]
+#[cfg(target_os = "macos")]
+fn rig_system_make_links() -> Result<(), Box<dyn std::error::Error>> {
+    let mut cmd = Command::cargo_bin("rig")?;
+    cmd.args(["system", "make-links"]);
+    cmd.assert()
+        .success();
+
+    let mut cmd2 = Command::new("R-4.1");
+    cmd2.args(["-q", "-s", "-e", "cat(as.character(getRversion()))"]);
+    cmd2.assert()
+        .success()
+        .stdout(predicate::str::is_match("^4[.]1[.][0-9]$").unwrap());
+
+    let mut cmd2 = Command::new("R-4.2");
+    cmd2.args(["-q", "-s", "-e", "cat(as.character(getRversion()))"]);
+    cmd2.assert()
+        .success()
+        .stdout(predicate::str::is_match("^4[.]2[.][0-9]$").unwrap());
+    Ok(())
+}