Print --timestamps with script recipes (#3050)

Author: casey

src/config.rs

@@ -675,6 +675,14 @@ impl Config {
     }
   }
 
+  pub(crate) fn timestamp(&self) -> Option<String> {
+    self.timestamp.then(|| {
+      chrono::Local::now()
+        .format(&self.timestamp_format)
+        .to_string()
+    })
+  }
+
   pub(crate) fn from_matches(matches: &ArgMatches) -> ConfigResult<Self> {
     let mut overrides = BTreeMap::new();
     if let Some(mut values) = matches.get_many::<String>(arg::SET) {

src/recipe.rs

@@ -298,15 +298,8 @@ impl<'src, D> Recipe<'src, D> {
         }
         .stderr();
 
-        if config.timestamp {
-          eprint!(
-            "[{}] ",
-            color.paint(
-              &chrono::Local::now()
-                .format(&config.timestamp_format)
-                .to_string()
-            ),
-          );
+        if let Some(timestamp) = config.timestamp() {
+          eprint!("[{}] ", color.paint(&timestamp));
         }
 
         eprintln!("{}", color.paint(command));
@@ -387,6 +380,17 @@ impl<'src, D> Recipe<'src, D> {
   ) -> RunResult<'src, ()> {
     let config = &context.config;
 
+    if let Some(timestamp) = config.timestamp() {
+      let color = if config.highlight {
+        config.color.command(config.command_color)
+      } else {
+        config.color
+      }
+      .stderr();
+
+      eprintln!("[{}] {}", color.paint(&timestamp), self.name);
+    }
+
     let mut evaluated_lines = Vec::new();
     for line in &self.body {
       evaluated_lines.push(evaluator.evaluate_line(line, false)?);

tests/timestamps.rs

@@ -1,7 +1,7 @@
 use super::*;
 
 #[test]
-fn print_timestamps() {
+fn linewise() {
   Test::new()
     .justfile(
       "
@@ -16,7 +16,23 @@ fn print_timestamps() {
 }
 
 #[test]
-fn print_timestamps_with_format_string() {
+fn script() {
+  Test::new()
+    .justfile(
+      "
+     recipe:
+        #!/bin/sh
+        echo 'one'
+    ",
+    )
+    .arg("--timestamp")
+    .stderr_regex(concat!(r"\[\d\d:\d\d:\d\d\] recipe", "\n"))
+    .stdout("one\n")
+    .run();
+}
+
+#[test]
+fn format_string() {
   Test::new()
     .justfile(
       "