From b3a31c9d5ac670a7e04602bb8e7e4e3018535e35 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Tue, 11 Jan 2011 16:39:51 -0500 Subject: Make failure email more customizable, start new jitterbug::Emailer in perl --- t/005_builder.t | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) (limited to 't') diff --git a/t/005_builder.t b/t/005_builder.t index 15795d6..84e13ef 100644 --- a/t/005_builder.t +++ b/t/005_builder.t @@ -1,7 +1,7 @@ use strict; use warnings; -use Test::Most tests => 7; +use Test::Most tests => 9; use Data::Dumper; use jitterbug::Builder; @@ -30,13 +30,45 @@ use jitterbug::Builder; my $b = jitterbug::Builder->new(); isa_ok($b, 'jitterbug::Builder'); is($b->{'configfile'}, 't/data/test.yml'); - #warn Dumper [ $b ]; is($b->run, 0, '->run returns 0 in cron mode'); cmp_deeply($b->{'conf'}, { - 'configfile' => 't/data/test.yml', - 'cron' => 1, - 'sleep' => undef + 'engines' => { + 'xslate' => { + 'type' => 'text', + 'path' => '/', + 'cache' => '0' + } + }, + 'plugins' => { + 'DBIC' => { + 'schema' => { + 'connect_info' => [ + 'dbi:SQLite:dbname=jitterbug.db' + ], + 'pckg' => 'jitterbug::Schema', + 'skip_automake' => '1' + } + } + }, + 'jitterbug' => { + 'build_process' => { + 'on_failure' => './scripts/build-failed.sh', + 'builder' => './scripts/capsule.sh' + }, + 'builder' => {}, + 'reports' => { + 'dir' => '/tmp/jitterbug' + }, + 'build' => { + 'dir' => '/tmp/build' + } + }, + 'template' => 'xslate', + 'appname' => 'jitterbug', + 'layout' => 'main', + 'logger' => 'file', + 'builds_per_feed' => '5' }); -- cgit 1.4.1 From 4bb424bf9937a0dc7b29cda40657631607ffdeaa Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 12 Jan 2011 11:46:49 -0500 Subject: Add some tests for jitterbug::Emailer --- lib/jitterbug/Emailer.pm | 6 ++++-- t/006_emailer.t | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 t/006_emailer.t (limited to 't') diff --git a/lib/jitterbug/Emailer.pm b/lib/jitterbug/Emailer.pm index 97ec640..95bda0d 100644 --- a/lib/jitterbug/Emailer.pm +++ b/lib/jitterbug/Emailer.pm @@ -17,15 +17,17 @@ sub new { sub run { my $self = shift; - my $buildconf = $conf->{'jitterbug'}{'build_process'}; + my $task = $self->{'task'}; + my $buildconf = $self->{'conf'}->{'jitterbug'}{'build_process'}; my $project = $task->project->name; + my $tap_output = $self->{'tap_output'}; my $sha1 = $task->commit->sha256; my $body = <from($buildconf->{'on_failure_from_email') + Email::Stuff->from($buildconf->{'on_failure_from_email'}) ->to($buildconf->{'on_failure_to_email'}) ->cc($buildconf->{'on_failure_cc_email'}) ->text_body($body) diff --git a/t/006_emailer.t b/t/006_emailer.t new file mode 100644 index 0000000..cc343d1 --- /dev/null +++ b/t/006_emailer.t @@ -0,0 +1,17 @@ +use strict; +use warnings; +use Test::Most tests => 3; +use Data::Dumper; + +use_ok "jitterbug::Emailer"; + +{ + my $conf = { foo => 'bar' }; + my $task = {}; + my $tap = "1..1\nok 1\n"; + my $e = jitterbug::Emailer->new($conf, $task, $tap); + + isa_ok($e,'jitterbug::Emailer'); + can_ok($e,qw/new run/); + +} -- cgit 1.4.1 From c16d34fa7b67ad1e5db7a098e74c5f711e222403 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 12 Jan 2011 13:31:51 -0500 Subject: Fix some bugs in jitterbug::Emailer and add mocked test data --- lib/jitterbug/Emailer.pm | 6 ++++-- t/006_emailer.t | 16 ++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) (limited to 't') diff --git a/lib/jitterbug/Emailer.pm b/lib/jitterbug/Emailer.pm index 95bda0d..648c72f 100644 --- a/lib/jitterbug/Emailer.pm +++ b/lib/jitterbug/Emailer.pm @@ -21,14 +21,16 @@ sub run { my $buildconf = $self->{'conf'}->{'jitterbug'}{'build_process'}; my $project = $task->project->name; my $tap_output = $self->{'tap_output'}; - my $sha1 = $task->commit->sha256; + my $desc = JSON::decode_json( $task->commit->content ); + my $email = $desc->{'author'}{'email'}; + my $body = <from($buildconf->{'on_failure_from_email'}) - ->to($buildconf->{'on_failure_to_email'}) + ->to($email) ->cc($buildconf->{'on_failure_cc_email'}) ->text_body($body) ->subject( diff --git a/t/006_emailer.t b/t/006_emailer.t index cc343d1..2df25f1 100644 --- a/t/006_emailer.t +++ b/t/006_emailer.t @@ -2,12 +2,24 @@ use strict; use warnings; use Test::Most tests => 3; use Data::Dumper; +use Test::MockObject; use_ok "jitterbug::Emailer"; { - my $conf = { foo => 'bar' }; - my $task = {}; + my $conf = { jitterbug => { build_process => 'bar'} }; + my $commit = Test::MockObject->new; + my $project = Test::MockObject->new; + my $task = Test::MockObject->new; + + $project->mock('name', sub { 'ponie' }); + + $commit->mock('sha256', sub { 'c0decafe' }); + $commit->mock('content', sub { 'this should be JSON' } ); + + $task->mock('commit', sub { $commit }); + $task->mock('project', sub { $project }); + my $tap = "1..1\nok 1\n"; my $e = jitterbug::Emailer->new($conf, $task, $tap); -- cgit 1.4.1 From b2fe2456e476962c19cceb74b1d17fb0f22c3c3e Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 12 Jan 2011 10:56:48 -0800 Subject: More tests for jitterbug::Emailer --- lib/jitterbug/Emailer.pm | 26 +++++++++++++++----------- t/006_emailer.t | 25 +++++++++++++++++++------ 2 files changed, 34 insertions(+), 17 deletions(-) (limited to 't') diff --git a/lib/jitterbug/Emailer.pm b/lib/jitterbug/Emailer.pm index 648c72f..4bf2e51 100644 --- a/lib/jitterbug/Emailer.pm +++ b/lib/jitterbug/Emailer.pm @@ -3,6 +3,7 @@ package jitterbug::Emailer; use strict; use warnings; use Email::Stuff; +use JSON; sub new { my $self = bless {} => shift; @@ -16,30 +17,33 @@ sub new { } sub run { - my $self = shift; - my $task = $self->{'task'}; - my $buildconf = $self->{'conf'}->{'jitterbug'}{'build_process'}; - my $project = $task->project->name; + my $self = shift; + my $task = $self->{'task'}; + my $buildconf = $self->{'conf'}->{'jitterbug'}{'build_process'}; + my $project = $task->project->name; my $tap_output = $self->{'tap_output'}; - my $sha1 = $task->commit->sha256; - my $desc = JSON::decode_json( $task->commit->content ); - my $email = $desc->{'author'}{'email'}; + my $sha1 = $task->commit->sha256; + my $desc = JSON::decode_json( $task->commit->content ); + my $email = $desc->{'author'}{'email'}; my $body = <from($buildconf->{'on_failure_from_email'}) - ->to($email) + my $stuff = Email::Stuff->from($buildconf->{'on_failure_from_email'}) + # bug in Email::Stuff brakes chaining if $email is empty + ->to($email || " ") ->cc($buildconf->{'on_failure_cc_email'}) ->text_body($body) ->subject( $buildconf->{'on_failure_subject_prefix'} . "$project @ $sha1" - ) + ); # Should we attach a build log for convenience? # ->attach(io('dead_bunbun_faked.gif')->all, # filename => 'dead_bunbun_proof.gif') - ->send; + $self->{'last_email_sent'} = $stuff; + + $stuff->send; return $self; } diff --git a/t/006_emailer.t b/t/006_emailer.t index 2df25f1..0dce025 100644 --- a/t/006_emailer.t +++ b/t/006_emailer.t @@ -1,29 +1,42 @@ use strict; use warnings; -use Test::Most tests => 3; +use Test::Most tests => 5; use Data::Dumper; use Test::MockObject; use_ok "jitterbug::Emailer"; { - my $conf = { jitterbug => { build_process => 'bar'} }; - my $commit = Test::MockObject->new; + my $buildconf = { + on_failure_from_email => 'bob@example.com', + on_failure_cc_email => 'steve@apple.com', + on_failure_subject_prefix => 'BLARG', + }; + + my $conf = { jitterbug => { build_process => $buildconf } }; + my $commit = Test::MockObject->new; my $project = Test::MockObject->new; - my $task = Test::MockObject->new; + my $task = Test::MockObject->new; $project->mock('name', sub { 'ponie' }); $commit->mock('sha256', sub { 'c0decafe' }); - $commit->mock('content', sub { 'this should be JSON' } ); + $commit->mock('content', sub { '{ }' } ); $task->mock('commit', sub { $commit }); $task->mock('project', sub { $project }); - my $tap = "1..1\nok 1\n"; + my $tap = "THIS IS TAP"; my $e = jitterbug::Emailer->new($conf, $task, $tap); isa_ok($e,'jitterbug::Emailer'); can_ok($e,qw/new run/); + $e->run; + my $email = $e->{'last_email_sent'}{'email'}; + like($email->body, qr/THIS IS TAP/, 'email body looks right'); + + my $header = $email->{'header'}; + isa_ok($header, 'Email::MIME::Header'); + } -- cgit 1.4.1 From ebc5a1d5adff8d041295b78a429a29ffb6b42d58 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 12 Jan 2011 11:40:22 -0800 Subject: More jitterbug::Emailer tests --- t/006_emailer.t | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/006_emailer.t b/t/006_emailer.t index 0dce025..feffd38 100644 --- a/t/006_emailer.t +++ b/t/006_emailer.t @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::Most tests => 5; +use Test::Most tests => 8; use Data::Dumper; use Test::MockObject; @@ -10,7 +10,7 @@ use_ok "jitterbug::Emailer"; my $buildconf = { on_failure_from_email => 'bob@example.com', on_failure_cc_email => 'steve@apple.com', - on_failure_subject_prefix => 'BLARG', + on_failure_subject_prefix => 'BLARG ', }; my $conf = { jitterbug => { build_process => $buildconf } }; @@ -39,4 +39,8 @@ use_ok "jitterbug::Emailer"; my $header = $email->{'header'}; isa_ok($header, 'Email::MIME::Header'); + is($header->header_raw('cc'), 'steve@apple.com', 'cc header'); + is($header->header_raw('subject'), 'BLARG ponie @ c0decafe', 'subject header'); + is($header->header_raw('from'), 'bob@example.com', 'from header'); + } -- cgit 1.4.1 From dddeaba05015d4040ab1aeb502a81e291e9c56a4 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Tue, 18 Jan 2011 15:30:02 -0500 Subject: Refactor jitterbug::Emailer to get rid of some warnings and improve tests --- lib/jitterbug/Emailer.pm | 31 ++++++++++++++++++------------ t/006_emailer.t | 50 +++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 15 deletions(-) (limited to 't') diff --git a/lib/jitterbug/Emailer.pm b/lib/jitterbug/Emailer.pm index ab9bedb..60837d6 100644 --- a/lib/jitterbug/Emailer.pm +++ b/lib/jitterbug/Emailer.pm @@ -16,12 +16,29 @@ sub new { return $self; } +sub _make_body { + my ($header, $message, $tap, $footer) = @_; + + no warnings 'uninitialized'; + return <{'task'}; my $buildconf = $self->{'conf'}->{'jitterbug'}{'build_process'}; my $project = $task->project->name; - my $tap_output = $self->{'tap_output'}; + my $tap = $self->{'tap_output'}; my $sha1 = $task->commit->sha256; my $shortsha1 = substr($sha1, 0, 8); my $desc = JSON::decode_json( $task->commit->content ); @@ -29,18 +46,8 @@ sub run { my $message = $desc->{'message'}; my $header = $buildconf->{'on_failure_header'}; my $footer = $buildconf->{'on_failure_footer'}; + my $body = _make_body($header,$message, $tap, $footer); - my $body = < 'bob@example.com', on_failure_cc_email => 'steve@apple.com', @@ -21,11 +21,15 @@ use_ok "jitterbug::Emailer"; $project->mock('name', sub { 'ponie' }); $commit->mock('sha256', sub { 'c0decafe' }); - $commit->mock('content', sub { '{ }' } ); + $commit->mock('content', sub { '{ "message" : "blargly blarg" }' } ); $task->mock('commit', sub { $commit }); $task->mock('project', sub { $project }); + return ($conf, $commit, $project, $task); +} +{ + my ($conf, $commit, $project, $task) = setup(); my $tap = "THIS IS TAP"; my $e = jitterbug::Emailer->new($conf, $task, $tap); @@ -40,7 +44,47 @@ use_ok "jitterbug::Emailer"; isa_ok($header, 'Email::MIME::Header'); is($header->header_raw('cc'), 'steve@apple.com', 'cc header'); - is($header->header_raw('subject'), 'BLARG ponie @ c0decafe', 'subject header'); + like($header->header_raw('subject'), qr/BLARG ponie @ c0decafe blargly blarg/, 'subject header'); is($header->header_raw('from'), 'bob@example.com', 'from header'); +} + +{ + my $tap = < blib/lib/Math/Primality/AKS.pm +Copying lib/Math/Primality/BigPolynomial.pm -> blib/lib/Math/Primality/BigPolynomial.pm +Copying lib/Math/Primality.pm -> blib/lib/Math/Primality.pm +Copying bin/primes.pl -> blib/script/primes.pl +Copying bin/strong_psuedoprimes.pl -> blib/script/strong_psuedoprimes.pl +# Testing Math::Primality 0.0401, Perl 5.010001, /usr/bin/perl +t/00-load.t ...................... +1..1 +ok 1 - use Math::Primality; +ok +# Failed test '-1 is not prime' +# at t/is_prime.t line 16. +# Looks like you failed 1 test of 573. +t/is_prime.t ..................... +1..6 +ok 1 - is_prime should handle Math::GMPz objects, three is prime +ok 2 - 2 is prime +ok 3 - 1 is not prime +ok 4 - 0 is not prime +not ok 5 - -1 is not prime +ok 6 - blarg +t/boilerplate.t .................. +1..3 +ok 1 - README contains no boilerplate text +ok 2 - Changes contains no boilerplate text +ok 3 - lib/Math/Primality.pm contains no boilerplate text +ok +Test Summary Report +------------------- +t/is_prime.t (Wstat: 256 Tests: 573 Failed: 1) +Failed test: 5 +Non-zero exit status: 1 +Failed 1/11 test programs. 1/2498 subtests failed. +Files=11, Tests=2498, 3 wallclock secs ( 0.20 usr 0.04 sys + 2.99 cusr 0.18 csys = 3.41 CPU) +Result: FAIL +TAP } -- cgit 1.4.1 From ec1d053822687ebd35f319c9d47dd15e201e09dd Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Tue, 18 Jan 2011 17:34:41 -0500 Subject: Add ability to use test failure summary in failure email template --- lib/jitterbug/Emailer.pm | 11 +++++--- t/006_emailer.t | 65 +++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 4 deletions(-) (limited to 't') diff --git a/lib/jitterbug/Emailer.pm b/lib/jitterbug/Emailer.pm index 60837d6..7a8ed9e 100644 --- a/lib/jitterbug/Emailer.pm +++ b/lib/jitterbug/Emailer.pm @@ -22,13 +22,11 @@ sub _make_body { no warnings 'uninitialized'; return <{'on_failure_header'}; my $footer = $buildconf->{'on_failure_footer'}; my $body = _make_body($header,$message, $tap, $footer); + my $summary; - # Expand placeholders in our on_failure header and footer + if ( $tap =~ m/^(Test Summary Report.*)/ms ) { + $summary = $1; + } + + # Expand placeholders in our failure email $body =~ s/%%PROJECT%%/$project/g; $body =~ s/%%SHA1%%/$sha1/g; + $body =~ s/%%SUMMARY%%/$summary/g; + my $stuff = Email::Stuff->from($buildconf->{'on_failure_from_email'}) # bug in Email::Stuff brakes chaining if $email is empty diff --git a/t/006_emailer.t b/t/006_emailer.t index 9cdd14a..4c6a972 100644 --- a/t/006_emailer.t +++ b/t/006_emailer.t @@ -1,6 +1,6 @@ use strict; use warnings; -use Test::Most tests => 8; +use Test::Most tests => 9; use Data::Dumper; use Test::MockObject; @@ -11,6 +11,8 @@ sub setup { on_failure_from_email => 'bob@example.com', on_failure_cc_email => 'steve@apple.com', on_failure_subject_prefix => 'BLARG ', + on_failure_header => "Summary:\n%%SUMMARY%%", + on_failure_footer => "FOOT", }; my $conf = { jitterbug => { build_process => $buildconf } }; @@ -49,6 +51,7 @@ sub setup { } { + my ($conf, $commit, $project, $task) = setup(); my $tap = < blib/lib/Math/Primality/AKS.pm Copying lib/Math/Primality/BigPolynomial.pm -> blib/lib/Math/Primality/BigPolynomial.pm @@ -86,5 +89,65 @@ Failed 1/11 test programs. 1/2498 subtests failed. Files=11, Tests=2498, 3 wallclock secs ( 0.20 usr 0.04 sys + 2.99 cusr 0.18 csys = 3.41 CPU) Result: FAIL TAP + my $e = jitterbug::Emailer->new($conf, $task, $tap); + $e->run; + my $email = $e->{'last_email_sent'}{'email'}; + my $body = < blib/lib/Math/Primality/AKS.pm +Copying lib/Math/Primality/BigPolynomial.pm -> blib/lib/Math/Primality/BigPolynomial.pm +Copying lib/Math/Primality.pm -> blib/lib/Math/Primality.pm +Copying bin/primes.pl -> blib/script/primes.pl +Copying bin/strong_psuedoprimes.pl -> blib/script/strong_psuedoprimes.pl +# Testing Math::Primality 0.0401, Perl 5.010001, /usr/bin/perl +t/00-load.t ...................... +1..1 +ok 1 - use Math::Primality; +ok +# Failed test '-1 is not prime' +# at t/is_prime.t line 16. +# Looks like you failed 1 test of 573. +t/is_prime.t ..................... +1..6 +ok 1 - is_prime should handle Math::GMPz objects, three is prime +ok 2 - 2 is prime +ok 3 - 1 is not prime +ok 4 - 0 is not prime +not ok 5 - -1 is not prime +ok 6 - blarg +t/boilerplate.t .................. +1..3 +ok 1 - README contains no boilerplate text +ok 2 - Changes contains no boilerplate text +ok 3 - lib/Math/Primality.pm contains no boilerplate text +ok +Test Summary Report +------------------- +t/is_prime.t (Wstat: 256 Tests: 573 Failed: 1) +Failed test: 5 +Non-zero exit status: 1 +Failed 1/11 test programs. 1/2498 subtests failed. +Files=11, Tests=2498, 3 wallclock secs ( 0.20 usr 0.04 sys + 2.99 cusr 0.18 csys = 3.41 CPU) +Result: FAIL + +FOOT +EMAIL + + my $ebody = $email->body; + $ebody =~ s/\r\n/\n/g; + eq_or_diff($ebody, $body, 'email body has failure summary'); } -- cgit 1.4.1 From 266d5cca294a0a689e0c48753cea24b5ae001175 Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 19 Jan 2011 09:27:49 -0800 Subject: Try not to ire the SpamCop Elder Gods --- t/006_emailer.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/006_emailer.t b/t/006_emailer.t index 4c6a972..c5e090e 100644 --- a/t/006_emailer.t +++ b/t/006_emailer.t @@ -9,7 +9,7 @@ use_ok "jitterbug::Emailer"; sub setup { my $buildconf = { on_failure_from_email => 'bob@example.com', - on_failure_cc_email => 'steve@apple.com', + on_failure_cc_email => 'steve@example.com', on_failure_subject_prefix => 'BLARG ', on_failure_header => "Summary:\n%%SUMMARY%%", on_failure_footer => "FOOT", -- cgit 1.4.1 From 952325b718086602b836a165dfa4f5e72e5bed9e Mon Sep 17 00:00:00 2001 From: "Jonathan \"Duke\" Leto" Date: Wed, 19 Jan 2011 09:28:26 -0800 Subject: Fix a jitterbug::Emailer test --- t/006_emailer.t | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't') diff --git a/t/006_emailer.t b/t/006_emailer.t index c5e090e..44dd328 100644 --- a/t/006_emailer.t +++ b/t/006_emailer.t @@ -45,7 +45,7 @@ sub setup { my $header = $email->{'header'}; isa_ok($header, 'Email::MIME::Header'); - is($header->header_raw('cc'), 'steve@apple.com', 'cc header'); + is($header->header_raw('cc'), 'steve@example.com', 'cc header'); like($header->header_raw('subject'), qr/BLARG ponie @ c0decafe blargly blarg/, 'subject header'); is($header->header_raw('from'), 'bob@example.com', 'from header'); } -- cgit 1.4.1