about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan "Duke" Leto <jonathan@leto.net>2011-02-15 14:18:37 -0800
committerJonathan "Duke" Leto <jonathan@leto.net>2011-02-15 14:18:37 -0800
commitb81fd244c274eab2f19aa5c8cda7edc133104044 (patch)
tree7e0e13801018a0be810e68ac1a70c93b312a4d7d
parentreturn empty list if project is not defined (diff)
downloadjitterbug-b81fd244c274eab2f19aa5c8cda7edc133104044.tar.gz
Only put the short commit message in email subjects
The full commit message will still be in the body of the email.
Diffstat (limited to '')
-rw-r--r--lib/jitterbug/Emailer.pm4
-rw-r--r--t/006_emailer.t4
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/jitterbug/Emailer.pm b/lib/jitterbug/Emailer.pm
index d93ec79..0d4d7da 100644
--- a/lib/jitterbug/Emailer.pm
+++ b/lib/jitterbug/Emailer.pm
@@ -58,6 +58,8 @@ sub run {
     $body =~ s/%%SHA1%%/$sha1/g;
     $body =~ s/%%SUMMARY%%/$summary/g;
 
+    my ($short_message) = split /\n/, $message;
+
 
     my $stuff = Email::Stuff->from($buildconf->{"on_${status}_from_email"})
                 # bug in Email::Stuff brakes chaining if $email is empty
@@ -65,7 +67,7 @@ sub run {
                 ->cc($buildconf->{"on_${status}_cc_email"})
                 ->text_body($body)
                 ->subject(
-                    $buildconf->{"on_${status}_subject_prefix"} . "$project @ $shortsha1 $message"
+                    $buildconf->{"on_${status}_subject_prefix"} . "$project @ $shortsha1 $short_message"
                   );
                 # Should we attach a build log for convenience?
                 # ->attach(io('dead_bunbun_faked.gif')->all,
diff --git a/t/006_emailer.t b/t/006_emailer.t
index 297644c..a13d5a4 100644
--- a/t/006_emailer.t
+++ b/t/006_emailer.t
@@ -23,7 +23,7 @@ sub setup {
     $project->mock('name', sub { 'ponie' });
 
     $commit->mock('sha256', sub { 'c0decafe' });
-    $commit->mock('content', sub { '{ "message" : "blargly blarg"  }' } );
+    $commit->mock('content', sub { '{ "message" : "blargly blarg\n\nLong message"  }' } );
 
     $task->mock('commit', sub { $commit });
     $task->mock('project', sub { $project });
@@ -106,6 +106,8 @@ Result: FAIL
 Commit Message:
 blargly blarg
 
+Long message
+
 TAP Output:
 Copying lib/Math/Primality/AKS.pm -> blib/lib/Math/Primality/AKS.pm
 Copying lib/Math/Primality/BigPolynomial.pm -> blib/lib/Math/Primality/BigPolynomial.pm