internal: Include stdout in command failures.

moonrepo · Dec 6, 2023 · 9dd0239 · 9dd0239
1 parent 2690928
commit 9dd0239
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/crates/pdk-api/src/api.rs b/crates/pdk-api/src/api.rs
@@ -474,7 +474,7 @@ impl InstallGlobalOutput {
 
         Self {
             installed: false,
-            error: Some(result.stderr),
+            error: Some(result.get_output()),
         }
     }
 }
@@ -516,7 +516,7 @@ impl UninstallGlobalOutput {
 
         Self {
             uninstalled: false,
-            error: Some(result.stderr),
+            error: Some(result.get_output()),
         }
     }
 }

diff --git a/crates/pdk-api/src/host_funcs.rs b/crates/pdk-api/src/host_funcs.rs
@@ -100,3 +100,20 @@ json_struct!(
         pub stdout: String,
     }
 );
+
+impl ExecCommandOutput {
+    pub fn get_output(&self) -> String {
+        let mut out = String::new();
+        out.push_str(self.stdout.trim());
+
+        if !self.stderr.is_empty() {
+            if !out.is_empty() {
+                out.push(' ');
+            }
+
+            out.push_str(self.stderr.trim());
+        }
+
+        out
+    }
+}