From b1a5bddc4c42308942d007ad71654f4bf4c0f282 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Mon, 10 Jan 2011 14:08:27 -0800
Subject: Add the ability to CC an email when builds fail

---
 scripts/build-failed.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts/build-failed.sh')

diff --git a/scripts/build-failed.sh b/scripts/build-failed.sh
index 43463b3..644e35f 100755
--- a/scripts/build-failed.sh
+++ b/scripts/build-failed.sh
@@ -2,10 +2,11 @@ COMMITER=$1
 MESSAGE=$2
 OUTPUT=$3
 SHA=$4
+CC_EMAIL=$5
 
 echo "
 Message:
 $MESSAGE
 
 $OUTPUT
-" | mail -s "[jitterbug] BUILD FAILED $SHA" $COMMITER
+" | mail -c "$CC_EMAIL" -s "[jitterbug] BUILD FAILED $SHA" $COMMITER
-- 
cgit 1.4.1


From 0f24016d696f5a7fbac7de7e7712c8e26278bc8f Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Tue, 11 Jan 2011 10:47:35 -0800
Subject: Attempt to fix the mangled build failure email bug

---
 lib/jitterbug/Builder.pm | 18 +++++++++---------
 scripts/build-failed.sh  |  7 +------
 2 files changed, 10 insertions(+), 15 deletions(-)

(limited to 'scripts/build-failed.sh')

diff --git a/lib/jitterbug/Builder.pm b/lib/jitterbug/Builder.pm
index 0d24620..58da724 100644
--- a/lib/jitterbug/Builder.pm
+++ b/lib/jitterbug/Builder.pm
@@ -136,15 +136,15 @@ sub run_task {
         if ( !$result || ($result && $result !~ /PASS/ )) {
             # mail author of the commit
             $result = "FAIL";
-            my $message  = $desc->{'message'};
-            my $commiter = $desc->{'author'}{'email'};
-            my $output   = "Build failed";
-            my $sha      = $desc->{'id'};
-            my $on_failure =
-                $conf->{'jitterbug'}{'build_process'}{'on_failure'};
-            my $on_failure_email =
-                $conf->{'jitterbug'}{'build_process'}{'on_failure_email'};
-            my $failure_cmd = "$on_failure $commiter $message $output $sha $on_failure_email";
+            my $message          = $desc->{'message'};
+            my $commiter         = $desc->{'author'}{'email'};
+            my $output           = "Build failed";
+            my $sha              = $desc->{'id'};
+            my $on_failure       = $conf->{'jitterbug'}{'build_process'}{'on_failure'};
+            my $on_failure_email = $conf->{'jitterbug'}{'build_process'}{'on_failure_email'};
+
+            $message  =~ s/'/\\'/g; $commiter =~ s/'/\\'/g; $output =~ s/'/\\'/g;
+            my $failure_cmd = qq{$on_failure '$commiter' '$message' '$output' $sha $on_failure_email};
             debug("Running failure command: $failure_cmd");
             `$failure_cmd`;
         }
diff --git a/scripts/build-failed.sh b/scripts/build-failed.sh
index 644e35f..1be5cd2 100755
--- a/scripts/build-failed.sh
+++ b/scripts/build-failed.sh
@@ -4,9 +4,4 @@ OUTPUT=$3
 SHA=$4
 CC_EMAIL=$5
 
-echo "
-Message:
-$MESSAGE
-
-$OUTPUT
-" | mail -c "$CC_EMAIL" -s "[jitterbug] BUILD FAILED $SHA" $COMMITER
+echo "Message:\n$MESSAGE\nTest Output:\n$OUTPUT\n" | mail -c "$CC_EMAIL" -s "[jitterbug] BUILD FAILED $SHA" $COMMITER
-- 
cgit 1.4.1


From 490c240d5f70ca5c7fabd747ec6bfb7e218eeef7 Mon Sep 17 00:00:00 2001
From: "Jonathan \"Duke\" Leto" <jonathan@leto.net>
Date: Tue, 11 Jan 2011 15:38:50 -0500
Subject: Make build failure email more useful by including TAP output

---
 lib/jitterbug/Builder.pm |  4 ++--
 scripts/build-failed.sh  | 17 ++++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

(limited to 'scripts/build-failed.sh')

diff --git a/lib/jitterbug/Builder.pm b/lib/jitterbug/Builder.pm
index 58da724..376b98c 100644
--- a/lib/jitterbug/Builder.pm
+++ b/lib/jitterbug/Builder.pm
@@ -138,13 +138,13 @@ sub run_task {
             $result = "FAIL";
             my $message          = $desc->{'message'};
             my $commiter         = $desc->{'author'}{'email'};
-            my $output           = "Build failed";
+            my $output           = $lines;
             my $sha              = $desc->{'id'};
             my $on_failure       = $conf->{'jitterbug'}{'build_process'}{'on_failure'};
             my $on_failure_email = $conf->{'jitterbug'}{'build_process'}{'on_failure_email'};
 
             $message  =~ s/'/\\'/g; $commiter =~ s/'/\\'/g; $output =~ s/'/\\'/g;
-            my $failure_cmd = qq{$on_failure '$commiter' '$message' '$output' $sha $on_failure_email};
+            my $failure_cmd = sprintf("%s '%s' %s '%s' '%s' %s %s", $on_failure, $commiter, $task->project->name, $message, $output, $sha, $on_failure_email);
             debug("Running failure command: $failure_cmd");
             `$failure_cmd`;
         }
diff --git a/scripts/build-failed.sh b/scripts/build-failed.sh
index 1be5cd2..ebd098a 100755
--- a/scripts/build-failed.sh
+++ b/scripts/build-failed.sh
@@ -1,7 +1,14 @@
 COMMITER=$1
-MESSAGE=$2
-OUTPUT=$3
-SHA=$4
-CC_EMAIL=$5
+PROJECT=$2
+MESSAGE=$3
+OUTPUT=$4
+SHA=$5
+CC_EMAIL=$6
 
-echo "Message:\n$MESSAGE\nTest Output:\n$OUTPUT\n" | mail -c "$CC_EMAIL" -s "[jitterbug] BUILD FAILED $SHA" $COMMITER
+echo "
+Message:
+$MESSAGE
+
+Test Output:
+$OUTPUT
+" | mail -c "$CC_EMAIL" -s "[jitterbug] FAIL $PROJECT @ $SHA" $COMMITER
-- 
cgit 1.4.1