ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Factor a getResponsibleAuthors helper out of the HipChatNotification

Browse source 
Signed-off-by: Shea Levy <shea@shealevy.com>
This commit is contained in:
Shea Levy 2013-10-07 09:44:51 -04:00
parent 20f1bf215a
commit 7913701d54
2 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/lib/Hydra/Helper/CatalystUtils.pm
View file

@ -27,6 +27,7 @@ our @EXPORT = qw(
parseJobsetName parseJobsetName
showJobName showJobName
showStatus showStatus
getResponsibleAuthors
); );
@ -250,4 +251,40 @@ sub showStatus {
} }
# Determine who broke/fixed the build.
sub getResponsibleAuthors {
my ($build, $plugins) = @_;
my $prevBuild = getPreviousBuild($build);
my $nrCommits = 0;
my %authors;
if ($prevBuild) {
foreach my $curInput ($build->buildinputs_builds) {
next unless ($curInput->type eq "git" || $curInput->type eq "hg");
my $prevInput = $prevBuild->buildinputs_builds->find({ name => $curInput->name });
next unless defined $prevInput;
next if $curInput->type ne $prevInput->type;
next if $curInput->uri ne $prevInput->uri;
next if $curInput->revision eq $prevInput->revision;
my @commits;
foreach my $plugin (@{$plugins}) {
push @commits, @{$plugin->getCommits($curInput->type, $curInput->uri, $prevInput->revision, $curInput->revision)};
}
foreach my $commit (@commits) {
#print STDERR "$commit->{revision} by $commit->{author}\n";
$authors{$commit->{author}} = $commit->{email};
$nrCommits++;
}
}
}
return (\%authors, $nrCommits);
}
1; 1;

30
src/lib/Hydra/Plugin/HipChatNotification.pm
View file

@ -40,31 +40,7 @@ sub buildFinished {
# Determine who broke/fixed the build. # Determine who broke/fixed the build.
my $prevBuild = getPreviousBuild($build); my $prevBuild = getPreviousBuild($build);
my $nrCommits = 0; my ($authors, $nrCommits) = getResponsibleAuthors($build, $self->{plugins});
my %authors;
if ($prevBuild) {
foreach my $curInput ($build->buildinputs_builds) {
next unless ($curInput->type eq "git" || $curInput->type eq "hg");
my $prevInput = $prevBuild->buildinputs_builds->find({ name => $curInput->name });
next unless defined $prevInput;
next if $curInput->type ne $prevInput->type;
next if $curInput->uri ne $prevInput->uri;
next if $curInput->revision eq $prevInput->revision;
my @commits;
foreach my $plugin (@{$self->{plugins}}) {
push @commits, @{$plugin->getCommits($curInput->type, $curInput->uri, $prevInput->revision, $curInput->revision)};
}
foreach my $commit (@commits) {
#print STDERR "$commit->{revision} by $commit->{author}\n";
$authors{$commit->{author}} = $commit->{email};
$nrCommits++;
}
}
}
# Send a message to each room. # Send a message to each room.
foreach my $roomId (keys %rooms) { foreach my $roomId (keys %rooms) {
@ -84,9 +60,9 @@ sub buildFinished {
$msg .= " (and ${\scalar @deps} others)" if scalar @deps > 0; $msg .= " (and ${\scalar @deps} others)" if scalar @deps > 0;
$msg .= ": <a href='$baseurl/build/${\$build->id}'>" . showStatus($build) . "</a>"; $msg .= ": <a href='$baseurl/build/${\$build->id}'>" . showStatus($build) . "</a>";
if (scalar keys %authors > 0) { if (scalar keys %{$authors} > 0) {
# FIXME: HTML escaping # FIXME: HTML escaping
my @x = map { "<a href='mailto:$authors{$_}'>$_</a>" } (sort keys %authors); my @x = map { "<a href='mailto:$authors->{$_}'>$_</a>" } (sort keys %{$authors});
$msg .= ", likely due to "; $msg .= ", likely due to ";
$msg .= "$nrCommits commits by " if $nrCommits > 1; $msg .= "$nrCommits commits by " if $nrCommits > 1;
$msg .= join(" or ", scalar @x > 1 ? join(", ", @x[0..scalar @x - 2]) : (), $x[-1]); $msg .= join(" or ", scalar @x > 1 ? join(", ", @x[0..scalar @x - 2]) : (), $x[-1]);