Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Pull out code processing into its own sub
  • Loading branch information
MasterDuke17 committed Jul 14, 2016
1 parent d5a9296 commit 77d06e2
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 34 deletions.
17 changes: 17 additions & 0 deletions Perl6IRCBotable.pm
Expand Up @@ -105,6 +105,23 @@ sub process_url {
return (1, $body);
}

sub process_code {
my ($self, $code) = @_;

if ($code =~ m{ ^https?:// }x ) {
my ($succeeded, $response) = $self->process_url($code);
if ($succeeded) {
$code = $response;
} else {
return (0, $response);
}
} else {
$code =~ s//\n/g;
}

return (1, $code);
}

sub upload_output {
my ($self, $output) = @_;

Expand Down
20 changes: 8 additions & 12 deletions benchable.pl
Expand Up @@ -32,21 +32,17 @@ package Benchable;
sub process_message {
my ($self, $message, $body) = @_;

my $response = '';
my $msg_response = '';

if ($body =~ /^ \s* (\S+) \s+ (.+) /xu) {
my @commits = split(',', $1);
my $code = $2;

if ($code =~ m{ ^https?:// }x ) {
my ($succeeded, $response) = $self->process_url($code);
if ($succeeded) {
$code = $response;
} else {
return $response;
}
my ($succeeded, $code_response) = $self->process_code($code);
if ($succeeded) {
$code = $code_response;
} else {
$code =~ s//\n/g;
return $code_response;
}

my $filename = $self->write_code($code);
Expand All @@ -56,7 +52,7 @@ sub process_message {
# convert to real ids so we can look up the builds
my $full_commit = $self->to_full_commit($commit);
unless (defined $full_commit) {
$response .= "Cannot find revision:$commit ";
$msg_response .= "Cannot find revision:$commit ";
next;
}

Expand All @@ -72,12 +68,12 @@ sub process_message {
chdir $old_dir;
}

$response .= join(' ', map { "$_=$times{$_}" } @commits);
$msg_response .= join(' ', map { "$_=$times{$_}" } @commits);
} else {
return help();
}

return $response;
return $msg_response;
}

sub help {
Expand Down
12 changes: 4 additions & 8 deletions bisectable.pl
Expand Up @@ -51,15 +51,11 @@ sub process_message {
my $bad = $2 // $3 // 'HEAD';
my $code = $5;

if ($code =~ m{ ^https?:// }x ) {
my ($succeeded, $response) = $self->process_url($code);
if ($succeeded) {
$code = $response;
} else {
return $response;
}
my ($succeeded, $code_response) = $self->process_code($code);
if ($succeeded) {
$code = $code_response;
} else {
$code =~ s//\n/g;
return $code_response;
}

# convert to real ids so we can look up the builds
Expand Down
24 changes: 10 additions & 14 deletions committable.pl
Expand Up @@ -31,21 +31,17 @@ package Committable;
sub process_message {
my ($self, $message, $body) = @_;

my $response = '';
my $msg_response = '';

if ($body =~ /^ \s* (\S+) \s+ (.+) /xu) {
my @commits = split(',', $1);
my $code = $2;

if ($code =~ m{ ^https?:// }x ) {
my ($succeeded, $response) = $self->process_url($code);
if ($succeeded) {
$code = $response;
} else {
return $response;
}
my ($succeeded, $code_response) = $self->process_code($code);
if ($succeeded) {
$code = $code_response;
} else {
$code =~ s//\n/g;
return $code_response;
}

my $filename = $self->write_code($code);
Expand All @@ -54,7 +50,7 @@ sub process_message {
# convert to real ids so we can look up the builds
my $full_commit = $self->to_full_commit($commit);
unless (defined $full_commit) {
$response .= "Cannot find revision:$commit ";
$msg_response .= "Cannot find revision:$commit ";
next;
}

Expand All @@ -64,14 +60,14 @@ sub process_message {
chdir $old_dir;
$out =~ s/\n//g if (defined $out);

$response .= "$commit: " . ($out // '') . " ";
$response .= " exit code = $exit" if ($exit != 0);
$msg_response .= "$commit: " . ($out // '') . " ";
$msg_response .= " exit code = $exit" if ($exit != 0);
}
} else {
$response = help();
$msg_response = help();
}

return $response;
return $msg_response;
}

sub help {
Expand Down

0 comments on commit 77d06e2

Please sign in to comment.