feat: better error messages when mock is not installed

FyraLabs · Oct 22, 2024 · 2668f05 · 2668f05
1 parent 712a6c4
commit 2668f05
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 78 deletions.
diff --git a/src/script.rs b/src/script.rs
diff --git a/src/util.rs b/src/util.rs
@@ -1,7 +1,7 @@
 //! Utility functions and types
 use anda_config::{Docker, DockerImage, Manifest, Project, RpmBuild};
 use clap_verbosity_flag::LevelFilter;
-use color_eyre::{eyre::eyre, Result};
+use color_eyre::{eyre::eyre, Result, Section};
 use console::style;
 use nix::{sys::signal, unistd::Pid};
 use regex::Regex;
@@ -94,101 +94,81 @@ impl CommandLog for Command {
                 }
             };
 
-            let formatter = format!("{process}\t| {output}");
-            println!("{formatter}");
+            println!("{process} | {output}");
         }
 
-        // let cmd_name = self;
         // make process name a constant string that we can reuse every time we call print_log
         let process = self.as_std().get_program().to_owned().into_string().unwrap();
         let args =
             self.as_std().get_args().map(|a| a.to_str().unwrap()).collect::<Vec<&str>>().join(" ");
         debug!("Running command: {process} {args}",);
         let c = self.stdout(std::process::Stdio::piped()).stderr(std::process::Stdio::piped());
 
-        // copy self
-
-        let mut output = c.spawn().unwrap();
-
-        // handles so we can run both at the same time
-        let mut tasks = vec![];
-        // stream stdout
-
-        let stdout = output.stdout.take().unwrap();
-        let stdout_reader = tokio::io::BufReader::new(stdout);
-        let mut stdout_lines = stdout_reader.lines();
+        let mut output = c.spawn().map_err(|e| {
+            eyre!("Cannot run command")
+                .wrap_err(e)
+                .note(format!("Process: {process}"))
+                .note("Args: {args}")
+                .suggestion(format!("You might need to install `{process}` via a package manager."))
+        })?;
 
         // HACK: Rust ownership is very fun.
         let t = process.clone();
-        let stdout_handle = tokio::spawn(async move {
-            while let Some(line) = stdout_lines.next_line().await.unwrap() {
-                print_log(&t, &line, ConsoleOut::Stdout);
-            }
-            Ok(())
-        });
 
-        tasks.push(stdout_handle);
-
-        // stream stderr
+        let stdout = output.stdout.take().unwrap();
+        let mut stdout_lines = tokio::io::BufReader::new(stdout).lines();
 
-        debug!("Streaming stderr");
         let stderr = output.stderr.take().unwrap();
-        let stderr_reader = tokio::io::BufReader::new(stderr).lines();
-        let mut stderr_lines = stderr_reader;
-
-        debug!("stderr: {stderr_lines:?}");
-
-        let stderr_handle = tokio::spawn(async move {
-            while let Some(line) = stderr_lines.next_line().await.unwrap() {
-                print_log(&process, &line, ConsoleOut::Stderr);
-            }
-            Ok(())
-        });
+        let mut stderr_lines = tokio::io::BufReader::new(stderr).lines();
 
-        // send sigint to child process when we ctrl-c
-        tasks.push(stderr_handle);
-
-        // sigint handle
-
-        let sigint_handle = tokio::spawn(async move {
-            // wait for ctrl-c or child process to finish
-
-            tokio::select! {
-                _ = tokio::signal::ctrl_c() => {
-                    info!("Received ctrl-c, sending sigint to child process");
-                    #[allow(clippy::cast_possible_wrap)]
-                    signal::kill(Pid::from_raw(output.id().unwrap() as i32), signal::Signal::SIGINT).unwrap();
-
-                    // exit program
-                    eprintln!("Received ctrl-c, exiting");
-                    // std::process::exit(127);
-                    Err(eyre!("Received ctrl-c, exiting"))
+        // handles so we can run both at the same time
+        for task in [
+            tokio::spawn(async move {
+                while let Some(line) = stdout_lines.next_line().await.unwrap() {
+                    print_log(&t, &line, ConsoleOut::Stdout);
+                }
+                Ok(())
+            }),
+            tokio::spawn(async move {
+                while let Some(line) = stderr_lines.next_line().await.unwrap() {
+                    print_log(&process, &line, ConsoleOut::Stderr);
                 }
-                w = output.wait() => {
-
-                    // check exit status
-                    let status = w.unwrap();
-                    if status.success() {
-                        info!("Command exited successfully");
-                        Ok(())
-                    } else {
-                        info!("Command exited with status: {status}");
-                        Err(eyre!("Command exited with status: {status}"))
+                Ok(())
+            }),
+            tokio::spawn(async move {
+                // wait for ctrl-c or child process to finish
+
+                tokio::select! {
+                    _ = tokio::signal::ctrl_c() => {
+                        info!("Received ctrl-c, sending sigint to child process");
+                        #[allow(clippy::cast_possible_wrap)]
+                        signal::kill(Pid::from_raw(output.id().unwrap() as i32), signal::Signal::SIGINT).unwrap();
+
+                        // exit program
+                        eprintln!("Received ctrl-c, exiting");
+                        // std::process::exit(127);
+                        Err(eyre!("Received ctrl-c, exiting"))
+                    }
+                    w = output.wait() => {
+
+                        // check exit status
+                        let status = w.unwrap();
+                        if status.success() {
+                            info!("Command exited successfully");
+                            Ok(())
+                        } else {
+                            info!("Command exited with status: {status}");
+                            Err(eyre!("Command exited with status: {status}"))
+                        }
+                        // info!("Child process finished");
                     }
-                    // info!("Child process finished");
                 }
-            }
-        });
-
-        tasks.push(sigint_handle);
-
-        for task in tasks {
+            }),
+        ] {
             task.await??;
         }
 
         Ok(())
-
-        // output.wait().await.unwrap();
     }
 }