stdout and stderr working with spinner, extra tests and better lib st…

…ructure

Cargo.toml

@@ -8,6 +8,7 @@ description="Simple deployment tool for deploying small applications and loading
 repository="https://github.com/tiptenbrink/tidploy"
 readme="README.md"
 
+
 [dependencies]
 base64 = "=0.21.7"
 clap = { version = "=4.4.16", features = ["derive"] }
@@ -23,4 +24,6 @@ tracing = "=0.1.40"
 tracing-subscriber = "=0.3.18"
 tracing-error = "=0.2.0"
 directories = "=5.0.1"
-color-eyre = "=0.6.3"
+color-eyre = "=0.6.3"
+test-log = { version="=0.2.15", default-features = false, features = ["trace"] }
+duct = "=0.13.7"

examples/run/example_input.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Read a single line of input from stdin
+read -r line
+
+# Print the input line to stdout
+echo "You entered: $line"

examples/run/example_spinner.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+spin[0]="-"
+spin[1]="\\"
+spin[2]="|"
+spin[3]="/"
+
+j=0
+while [ $j -lt 3 ]; do
+  for i in "${spin[@]}"
+  do
+        echo -ne "\b$i"
+        sleep 0.1
+  done
+  j=$((j+1))
+done

examples/run/example_stderr.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+echoerr() { echo "$@" 1>&2; }
+echo hello1
+echo hello2
+sleep 2
+echo hello3
+sleep 1
+echoerr hello world2
+echoerr hello world3
+sleep 1
+echoerr hello world1

src/commands.rs

@@ -1,4 +1,5 @@
 use std::path::{Path, PathBuf};
+use std::process::ExitCode;
 
 use crate::archives::{extract_archive, make_archive};
 use crate::errors::{ProcessError, RepoError};
@@ -236,7 +237,7 @@ fn prepare_command(
     Ok(Some(state))
 }
 
-pub(crate) fn run_cli() -> Result<(), Report> {
+pub fn run_cli() -> Result<ExitCode, Report> {
     // We get our CLI arguments using the clap crate. This allows us to state all our arguments using
     // a set of structs, indicating the structure of our commands
     // Note that it uses the Cargo.toml description as the main help command description
@@ -260,14 +261,14 @@ pub(crate) fn run_cli() -> Result<(), Report> {
 
             secret_command(&state, key).map_err(ErrorRepr::Auth)?;
 
-            Ok(())
+            Ok(ExitCode::SUCCESS)
         }
         Commands::Download { repo_only } => {
             let state = create_state_create(cli_state.clone(), None, None, false)
                 .map_err(ErrorRepr::Load)?;
             download_command(cli_state, state.repo, repo_only)?;
 
-            Ok(())
+            Ok(ExitCode::SUCCESS)
         }
         Commands::Deploy {
             executable,
@@ -314,14 +315,18 @@ pub(crate) fn run_cli() -> Result<(), Report> {
             run_entrypoint(state.deploy_dir(), &state.exe_name, state.envs)
                 .map_err(ErrorRepr::Exe)?;
 
-            Ok(())
+                Ok(ExitCode::SUCCESS)
         }
         Commands::Run {
             executable,
             variables,
             archive,
         } => {
-            run_command(cli_state, executable, variables, archive)
+            let out = run_command(cli_state, executable, variables, archive)?;
+            // If [process::ExitCode::from_raw] gets stabilized this can be simplified
+            let code = u8::try_from(out.exit.code().unwrap_or(0))?;
+
+            Ok(ExitCode::from(code))
         }
     }
 }

src/lib.rs

@@ -0,0 +1,14 @@
+mod next;
+mod archives;
+mod config;
+mod errors;
+mod filesystem;
+mod git;
+mod process;
+mod secret;
+mod secret_store;
+mod state;
+
+pub mod commands;
+
+pub use next::api::*;

src/main.rs

@@ -1,14 +1,6 @@
-mod archives;
-mod commands;
-mod config;
-mod errors;
-mod filesystem;
-mod git;
-mod next;
-mod process;
-mod secret;
-mod secret_store;
-mod state;
+use std::process::ExitCode;
+
+use tidploy::commands;
 
 use color_eyre::eyre::Report;
 use tracing_error::ErrorLayer;
@@ -25,7 +17,7 @@ fn install_tracing() {
         .init();
 }
 
-fn main() -> Result<(), Report> {
+fn main() -> Result<ExitCode, Report> {
     install_tracing();
     color_eyre::install()?;