Nicer errors

Cargo.toml

@@ -9,7 +9,6 @@ log = "0.4.21"
 env_logger = { version = "0.11.3", features = [] }
 thiserror = "1.0.58"
 anyhow = { version = "1.0.82", features = ["backtrace"] }
-ariadne = "0.4.0"
 colored = "2.1.0"
 pest = { version = "2.7.9" }
 pest_derive = { version = "2.7.9", features = ["grammar-extras"] }

src/cli.rs

@@ -1,7 +1,8 @@
 use std::collections::HashMap;
+use std::process::exit;
 
 use crate::args::Args;
-use crate::error::Result;
+use crate::error::{FriggenError, Result};
 use crate::friggen::Friggen;
 use crate::fs_context::resolve_fs_context;
 use crate::print::{OutputPrinter, PrintTheme};
@@ -48,13 +49,32 @@ impl Cli {
         ))
     }
 
-    pub fn run(&self) -> Result<()> {
+    pub fn run(&self) {
         if self.args.version {
             println!("{} {}", APP_NAME, VERSION);
-            return Ok(());
+            return;
         }
 
-        let friggen = self.create_friggen()?;
-        friggen.run()
+        let friggen = match self.create_friggen() {
+            Ok(f) => f,
+            Err(err) => {
+                eprintln!("{}", err);
+                exit(1);
+            }
+        };
+
+        if let Err(err) = friggen.run() {
+            match err {
+                FriggenError::TaskError { task: _, exit_code} => {
+                    // Message already printed in task summary, but make sure we:
+                    exit(exit_code)
+                }
+                _ => {
+                    eprintln!("{}", err);
+                    exit(1);
+                }
+            }
+        }
     }
+
 }

src/error.rs

@@ -9,7 +9,7 @@ pub enum FriggenError {
     #[error("friggenfile not found")]
     FriggenfileNotFound,
 
-    #[error("friggenfile syntax error")]
+    #[error("friggenfile syntax error:\n{0}")]
     FriggenfileSyntaxError(Box<pest::error::Error<Rule>>),
 
     #[error("duplicate task definition: {0}")]
@@ -24,6 +24,9 @@ pub enum FriggenError {
     #[error("cyclic task reference: {0:?}")]
     CyclicTaskReference(Vec<String>),
 
+    #[error("task failed: {task} ({exit_code})")]
+    TaskError { task: String, exit_code: i32 },
+
     #[error("io error: {source:?}")]
     Io {
         #[from]

src/friggen.rs

@@ -1,6 +1,5 @@
 use std::borrow::Cow;
 use std::collections::HashMap;
-use std::process::exit;
 use std::time::SystemTime;
 
 use colored::Colorize;
@@ -61,8 +60,10 @@ impl<'a> Friggen<'a> {
         let task_seq = build_task_sequence(&self.tasks, &tasks)?;
         log::debug!("sequence: {:?}", task_seq);
 
+        let mut last_task: &str = "";
         let mut last_code: i32 = 0;
         for task_name in task_seq {
+            last_task = task_name;
             last_code = self.run_task(task_name, &tasks, &vars)?;
             if last_code != 0 {
                 break;
@@ -74,7 +75,10 @@ impl<'a> Friggen<'a> {
             .print_timed_header("★ done", start_time);
 
         if last_code != 0 {
-            exit(last_code);
+            return Err(FriggenError::TaskError {
+                task: last_task.to_string(),
+                exit_code: last_code,
+            });
         }
 
         Ok(())

src/main.rs

@@ -1,5 +1,3 @@
-use std::process::exit;
-
 use clap::Parser;
 use dotenv::dotenv;
 
@@ -26,9 +24,5 @@ fn main() {
 
     let args = Args::parse();
     let cli = Cli::new(args);
-    let result = cli.run();
-    if let Err(err) = result {
-        log::error!("{}", err);
-        exit(1)
-    }
+    cli.run();
 }

src/parser.rs

@@ -115,7 +115,7 @@ fn process_script(script: &mut [&str]) {
 }
 
 fn find_indent(script: &[&str]) -> usize {
-    let first_line = script.iter().find(|line| !is_whitespace(line)).unwrap(); // TODO
+    let first_line = script.iter().find(|line| !is_whitespace(line)).unwrap();
     leading_whitespace(first_line)
 }