- isolate and handle unix error

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

- refactor: separate error code

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

- wasm target included + update to error convention

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

- fix: build workflow

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

- fix: template issue with zig + docs

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

- revert zig template

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

- specify zig version for ci

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

- revert workflow + re-word response

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

- revert version edit

Signed-off-by: Aminu 'Seun Joshua <[email protected]>

Author: seun-ja

.github/workflows/build.yml

@@ -25,9 +25,9 @@ jobs:
     runs-on: "ubuntu-22.04"
     if: ${{ github.event_name == 'pull_request' }}
     steps:
-      - name: 'Checkout Repository'
+      - name: "Checkout Repository"
         uses: actions/checkout@v4
-      - name: 'Dependency Review'
+      - name: "Dependency Review"
         uses: actions/dependency-review-action@v4
 
   lint-rust:
@@ -83,14 +83,8 @@ jobs:
     strategy:
       matrix:
         config:
-          - {
-              arch: "aarch64",
-              target: "aarch64-unknown-linux-musl"
-            }
-          - {
-              arch: "amd64",
-              target: "x86_64-unknown-linux-musl"
-            }
+          - { arch: "aarch64", target: "aarch64-unknown-linux-musl" }
+          - { arch: "amd64", target: "x86_64-unknown-linux-musl" }
     steps:
       - uses: actions/checkout@v3
 
@@ -141,7 +135,6 @@ jobs:
           name: spin-${{ matrix.os }}
           path: target/release/spin${{ matrix.os == 'windows-latest' && '.exe' || '' }}
 
-
   test-spin:
     name: Test Spin
     runs-on: ${{ matrix.runner }}
@@ -200,14 +193,14 @@ jobs:
       - uses: goto-bus-stop/setup-zig@v2
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.23'
-          cache-dependency-path: "**/go.sum"  # To suppress warning: https://github.com/actions/setup-go/issues/427
+          go-version: "1.23"
+          cache-dependency-path: "**/go.sum" # To suppress warning: https://github.com/actions/setup-go/issues/427
       - uses: acifani/setup-tinygo@v2
         with:
-          tinygo-version: '0.37.0'
+          tinygo-version: "0.37.0"
       - uses: actions/setup-node@v3
         with:
-          node-version: '22.x'
+          node-version: "22.x"
       - name: Install Grain
         run: |
           wget https://github.com/grain-lang/grain/releases/download/grain-v0.6.6/grain-linux-x64

src/subprocess.rs

@@ -4,31 +4,58 @@
 /// When this error is encountered the cli will exit with the status code
 /// instead of printing an error,
 #[derive(Debug)]
-pub struct ExitStatusError {
-    status: Option<i32>,
+pub enum ExitStatusError {
+    /// The subprocess exited with a specific exit code.
+    ExitCode(i32),
+    /// The subprocess was exited by a signal. Only available for `Unix` based systems.
+    Signal(i32),
+    /// Catchall for general errors. Error code `1`
+    Unknown,
 }
 
 impl ExitStatusError {
+    #[cfg(unix)]
     pub(crate) fn new(status: std::process::ExitStatus) -> Self {
-        Self {
-            status: status.code(),
+        use std::os::unix::process::ExitStatusExt as _;
+
+        if let Some(code) = status.code() {
+            Self::ExitCode(code)
+        } else if let Some(signal) = status.signal() {
+            Self::Signal(signal)
+        } else {
+            Self::Unknown
+        }
+    }
+
+    #[cfg(not(unix))]
+    pub(crate) fn new(status: std::process::ExitStatus) -> Self {
+        if let Some(code) = status.code() {
+            Self::ExitCode(code)
+        } else {
+            Self::Unknown
         }
     }
 
     pub fn code(&self) -> i32 {
-        self.status.unwrap_or(1)
+        match self {
+            Self::ExitCode(code) => *code,
+            Self::Signal(signal) => 128 + *signal,
+            Self::Unknown => 1,
+        }
+        .min(255)
     }
 }
 
 impl std::error::Error for ExitStatusError {}
 
 impl std::fmt::Display for ExitStatusError {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        let _ = write!(f, "subprocess exited with status: ");
-        if let Some(status) = self.status {
-            writeln!(f, "{status}")
-        } else {
-            writeln!(f, "unknown")
+        let _ = write!(f, "subprocess exited with ");
+
+        match self {
+            Self::ExitCode(code) => write!(f, "exit code: {code}"),
+            Self::Signal(signal) => write!(f, "signal: {signal}"),
+            Self::Unknown => write!(f, "unknown status"),
         }
     }
 }