Refactor exists to print true/false in shell format

src/output.rs

@@ -103,9 +103,9 @@ fn format_shell(data: ResponseData) -> ResponseOut {
         )),
         ResponseData::Exists(exists) => {
             if exists {
-                ResponseOut::StdoutLine("Does exist.".to_string())
+                ResponseOut::StdoutLine("true".to_string())
             } else {
-                ResponseOut::StdoutLine("Does not exist.".to_string())
+                ResponseOut::StdoutLine("false".to_string())
             }
         }
         ResponseData::Metadata {

tests/cli/action/exists.rs

@@ -0,0 +1,95 @@
+use crate::cli::{fixtures::*, utils::random_tenant};
+use assert_cmd::Command;
+use assert_fs::prelude::*;
+use distant_core::{Request, RequestData, Response, ResponseData};
+use rstest::*;
+
+#[rstest]
+fn should_output_true_if_exists(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    // Create file
+    let file = temp.child("file");
+    file.touch().unwrap();
+
+    // distant action exists {path}
+    action_cmd
+        .args(&["exists", file.to_str().unwrap()])
+        .assert()
+        .success()
+        .stdout("true\n")
+        .stderr("");
+}
+
+#[rstest]
+fn should_output_false_if_not_exists(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    // Don't create file
+    let file = temp.child("file");
+
+    // distant action exists {path}
+    action_cmd
+        .args(&["exists", file.to_str().unwrap()])
+        .assert()
+        .success()
+        .stdout("false\n")
+        .stderr("");
+}
+
+#[rstest]
+fn should_support_json_true_if_exists(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    // Create file
+    let file = temp.child("file");
+    file.touch().unwrap();
+
+    let req = Request {
+        id: rand::random(),
+        tenant: random_tenant(),
+        payload: vec![RequestData::Exists {
+            path: file.to_path_buf(),
+        }],
+    };
+
+    // distant action --format json --interactive
+    let cmd = action_cmd
+        .args(&["--format", "json"])
+        .arg("--interactive")
+        .write_stdin(format!("{}\n", serde_json::to_string(&req).unwrap()))
+        .assert()
+        .success()
+        .stderr("");
+
+    let res: Response = serde_json::from_slice(&cmd.get_output().stdout).unwrap();
+    assert_eq!(res.payload[0], ResponseData::Exists(true));
+}
+
+#[rstest]
+fn should_support_json_false_if_not_exists(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    // Don't create file
+    let file = temp.child("file");
+
+    let req = Request {
+        id: rand::random(),
+        tenant: random_tenant(),
+        payload: vec![RequestData::Exists {
+            path: file.to_path_buf(),
+        }],
+    };
+
+    // distant action --format json --interactive
+    let cmd = action_cmd
+        .args(&["--format", "json"])
+        .arg("--interactive")
+        .write_stdin(format!("{}\n", serde_json::to_string(&req).unwrap()))
+        .assert()
+        .success()
+        .stderr("");
+
+    let res: Response = serde_json::from_slice(&cmd.get_output().stdout).unwrap();
+    assert_eq!(res.payload[0], ResponseData::Exists(false));
+}

tests/cli/action/mod.rs

@@ -1,6 +1,7 @@
 mod copy;
 mod dir_create;
 mod dir_read;
+mod exists;
 mod file_append;
 mod file_append_text;
 mod file_read;
@@ -8,3 +9,4 @@ mod file_read_text;
 mod file_write;
 mod file_write_text;
 mod remove;
+mod rename;

tests/cli/action/rename.rs

@@ -0,0 +1,204 @@
+use crate::cli::{
+    fixtures::*,
+    utils::{random_tenant, FAILURE_LINE},
+};
+use assert_cmd::Command;
+use assert_fs::prelude::*;
+use distant::ExitCode;
+use distant_core::{
+    data::{Error, ErrorKind},
+    Request, RequestData, Response, ResponseData,
+};
+use predicates::prelude::*;
+use rstest::*;
+
+const FILE_CONTENTS: &str = r#"
+some text
+on multiple lines
+that is a file's contents
+"#;
+
+#[rstest]
+fn should_support_renaming_file(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    let src = temp.child("file");
+    src.write_str(FILE_CONTENTS).unwrap();
+
+    let dst = temp.child("file2");
+
+    // distant action rename {src} {dst}
+    action_cmd
+        .args(&["rename", src.to_str().unwrap(), dst.to_str().unwrap()])
+        .assert()
+        .success()
+        .stdout("")
+        .stderr("");
+
+    src.assert(predicate::path::missing());
+    dst.assert(FILE_CONTENTS);
+}
+
+#[rstest]
+fn should_support_renaming_nonempty_directory(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    // Make a non-empty directory
+    let src = temp.child("dir");
+    src.create_dir_all().unwrap();
+    let src_file = src.child("file");
+    src_file.write_str(FILE_CONTENTS).unwrap();
+
+    let dst = temp.child("dir2");
+    let dst_file = dst.child("file");
+
+    // distant action rename {src} {dst}
+    action_cmd
+        .args(&["rename", src.to_str().unwrap(), dst.to_str().unwrap()])
+        .assert()
+        .success()
+        .stdout("")
+        .stderr("");
+
+    src.assert(predicate::path::missing());
+    src_file.assert(predicate::path::missing());
+
+    dst.assert(predicate::path::is_dir());
+    dst_file.assert(FILE_CONTENTS);
+}
+
+#[rstest]
+fn yield_an_error_when_fails(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    let src = temp.child("dir");
+    let dst = temp.child("dir2");
+
+    // distant action rename {src} {dst}
+    action_cmd
+        .args(&["rename", src.to_str().unwrap(), dst.to_str().unwrap()])
+        .assert()
+        .code(ExitCode::Software.to_i32())
+        .stdout("")
+        .stderr(FAILURE_LINE.clone());
+
+    src.assert(predicate::path::missing());
+    dst.assert(predicate::path::missing());
+}
+
+#[rstest]
+fn should_support_json_renaming_file(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    let src = temp.child("file");
+    src.write_str(FILE_CONTENTS).unwrap();
+
+    let dst = temp.child("file2");
+
+    let req = Request {
+        id: rand::random(),
+        tenant: random_tenant(),
+        payload: vec![RequestData::Rename {
+            src: src.to_path_buf(),
+            dst: dst.to_path_buf(),
+        }],
+    };
+
+    // distant action --format json --interactive
+    let cmd = action_cmd
+        .args(&["--format", "json"])
+        .arg("--interactive")
+        .write_stdin(format!("{}\n", serde_json::to_string(&req).unwrap()))
+        .assert()
+        .success()
+        .stderr("");
+
+    let res: Response = serde_json::from_slice(&cmd.get_output().stdout).unwrap();
+    assert_eq!(res.payload[0], ResponseData::Ok);
+
+    src.assert(predicate::path::missing());
+    dst.assert(FILE_CONTENTS);
+}
+
+#[rstest]
+fn should_support_json_renaming_nonempty_directory(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    // Make a non-empty directory
+    let src = temp.child("dir");
+    src.create_dir_all().unwrap();
+    let src_file = src.child("file");
+    src_file.write_str(FILE_CONTENTS).unwrap();
+
+    let dst = temp.child("dir2");
+    let dst_file = dst.child("file");
+
+    let req = Request {
+        id: rand::random(),
+        tenant: random_tenant(),
+        payload: vec![RequestData::Rename {
+            src: src.to_path_buf(),
+            dst: dst.to_path_buf(),
+        }],
+    };
+
+    // distant action --format json --interactive
+    let cmd = action_cmd
+        .args(&["--format", "json"])
+        .arg("--interactive")
+        .write_stdin(format!("{}\n", serde_json::to_string(&req).unwrap()))
+        .assert()
+        .success()
+        .stderr("");
+
+    let res: Response = serde_json::from_slice(&cmd.get_output().stdout).unwrap();
+    assert_eq!(res.payload[0], ResponseData::Ok);
+
+    src.assert(predicate::path::missing());
+    src_file.assert(predicate::path::missing());
+
+    dst.assert(predicate::path::is_dir());
+    dst_file.assert(FILE_CONTENTS);
+}
+
+#[rstest]
+fn should_support_json_output_for_error(mut action_cmd: Command) {
+    let temp = assert_fs::TempDir::new().unwrap();
+
+    let src = temp.child("dir");
+    let dst = temp.child("dir2");
+
+    let req = Request {
+        id: rand::random(),
+        tenant: random_tenant(),
+        payload: vec![RequestData::Rename {
+            src: src.to_path_buf(),
+            dst: dst.to_path_buf(),
+        }],
+    };
+
+    // distant action --format json --interactive
+    let cmd = action_cmd
+        .args(&["--format", "json"])
+        .arg("--interactive")
+        .write_stdin(format!("{}\n", serde_json::to_string(&req).unwrap()))
+        .assert()
+        .success()
+        .stderr("");
+
+    let res: Response = serde_json::from_slice(&cmd.get_output().stdout).unwrap();
+    assert!(
+        matches!(
+            res.payload[0],
+            ResponseData::Error(Error {
+                kind: ErrorKind::NotFound,
+                ..
+            })
+        ),
+        "Unexpected response: {:?}",
+        res.payload[0]
+    );
+
+    src.assert(predicate::path::missing());
+    dst.assert(predicate::path::missing());
+}