Add a simple test for horustctl status

commands/src/lib.rs

@@ -24,9 +24,6 @@ pub struct UdsConnectionHandler {
     socket: UnixStream,
 }
 impl UdsConnectionHandler {
-    fn get_path(socket_folder: &Path, socket_name: u32) -> PathBuf {
-        socket_folder.join(format!("hourst-{socket_name}.sock"))
-    }
     pub fn new(socket: UnixStream) -> Self {
         Self { socket }
     }

horustctl/Cargo.toml

@@ -10,5 +10,11 @@ log = "~0.4"
 env_logger = "~0.11"
 crossbeam = "~0.8"
 clap = { version = "~4.5", features = ["derive"] }
-horust-commands-lib = {path = "../commands"}
+horust-commands-lib = { path = "../commands" }
+
+[dev-dependencies]
+assert_cmd = "~2.0"
+predicates = "~3.1"
+rand = "~0.8"
+tempdir = "~0.3"
 

horustctl/README.md

@@ -0,0 +1,4 @@
+## Horustctl
+
+A command line interface to interact with an horust process. It works using Unix Domain Sockets.
+Each horust process will create a new uds socket inside /var/run/horust/horust-<pid>.sock folder (can be configured).

horustctl/tests/cli.rs

@@ -1 +1,117 @@
+use assert_cmd::Command;
+use predicates::boolean::PredicateBooleanExt;
+use predicates::str::contains;
+use rand::distributions::Alphanumeric;
+use rand::{thread_rng, Rng};
+use std::path::Path;
+use std::thread;
+use std::time::Duration;
+use tempdir::TempDir;
 
+/// Creates script and service file, and stores them in dir.
+/// It will append a `command` at the top of the service, with a reference to script.
+/// Returns the service name.
+/// if service_name is None a random name will be used.
+pub fn store_service(
+    dir: &Path,
+    script: &str,
+    service_content: Option<&str>,
+    filename: Option<&str>,
+) -> String {
+    let rnd_name = thread_rng()
+        .sample_iter(&Alphanumeric)
+        .take(5)
+        .map(|x| x as char)
+        .collect::<String>();
+    let service_name = format!("{}.toml", filename.unwrap_or(rnd_name.as_str()));
+    let script_name = format!("{}.sh", rnd_name);
+    let script_path = dir.join(script_name);
+    std::fs::write(&script_path, script).unwrap();
+    let service = format!(
+        r#"command = "/usr/bin/env bash {}"
+{}"#,
+        script_path.display(),
+        service_content.unwrap_or("")
+    );
+    std::fs::write(dir.join(&service_name), service).unwrap();
+    service_name
+}
+
+#[test]
+fn test_cli_help() {
+    let mut cmd = Command::cargo_bin("horustctl").unwrap();
+    cmd.args(vec!["--help"]).assert().success();
+}
+
+static ENVIRONMENT_SCRIPT: &str = r#"#!/usr/bin/env bash
+printenv"#;
+
+#[test]
+fn test_cli_status() {
+    let temp_dir = TempDir::new("horustctl").unwrap();
+    let mut horust_cmd = Command::cargo_bin("horust").unwrap();
+
+    horust_cmd.current_dir(&temp_dir).args(vec![
+        "--services-path",
+        temp_dir.path().display().to_string().as_str(),
+        "--uds-folder-path",
+        temp_dir.path().display().to_string().as_str(),
+    ]);
+
+    store_service(
+        temp_dir.path(),
+        ENVIRONMENT_SCRIPT,
+        None,
+        Some("terminated"),
+    );
+    horust_cmd.assert().success().stdout(contains("bar").not());
+    // Exit after 5 seconds.
+    store_service(
+        temp_dir.path(),
+        r#"#!/usr/bin/env bash
+    trap 'quit=1' USR1
+    touch file
+i=0;
+while [ "$i" -lt 5 ]; do
+    sleep 1
+done"#,
+        None,
+        Some("running"),
+    );
+
+    thread::spawn(move || {
+        horust_cmd.assert().success().stdout(contains("bar"));
+    });
+    let mut total_wait = 0;
+    const MAX_WAIT_TIME: u32 = 1000;
+    // created by running script
+    while !temp_dir.path().join("file").exists() && total_wait < MAX_WAIT_TIME {
+        total_wait += 50;
+        thread::sleep(Duration::from_millis(50));
+    }
+    let mut horustctl_cmd = Command::cargo_bin("horustctl").unwrap();
+    horustctl_cmd
+        .current_dir(&temp_dir)
+        .args(vec![
+            "--uds-folder-path",
+            temp_dir.path().display().to_string().as_str(),
+            "status",
+            "terminated.toml",
+        ])
+        .assert()
+        .success()
+        .stdout(contains("terminated"));
+
+    let mut horustctl_cmd = Command::cargo_bin("horustctl").unwrap();
+    horustctl_cmd
+        .current_dir(&temp_dir)
+        .args(vec![
+            "--uds-folder-path",
+            temp_dir.path().display().to_string().as_str(),
+            "status",
+            "running.toml",
+        ])
+        .assert()
+        .success()
+        .stdout(contains("running"));
+}