Merge branch 'refactor' into 'master'

Refactor See merge request !1

Merge branch 'refactor' into 'master'
Refactor See merge request !1
Athos
2 parents c76b6f4c 6b89b456
Showing 2 changed files with 60 additions and 49 deletions Show diff stats
lib/CoprStatus.pm
t/app.t
@@ -7,55 +7,49 @@ use LWP::UserAgent;
 $ENV{'PERL_LWP_SSL_VERIFY_HOSTNAME'} = 0;
+# hash with repos data
+our $info = {};
+
 sub copr_monitor_url {
   my ( $user, $repo ) = @_;
   return "http://copr.fedoraproject.org/api/coprs/$user/$repo/monitor/";
 }
+sub git_url {
+  my ( $domain, $spec_path, $branch, $package ) = @_;
+
+  $spec_path =~ s/<branch>/$branch/;
+  $spec_path =~ s/<package>/$package/g;
+
+  return "$domain/$spec_path";
+}
+
 sub copr_info {
+  my ( $user, $repo, $branch ) = @_;
+
   my $ua = LWP::UserAgent->new;
   $ua->timeout(300);
   $ua->env_proxy;
   $ua->ssl_opts(SSL_verify_mode => 0x00);
-  my $result_v4 = $ua->get(copr_monitor_url("softwarepublico", "v4"));
-  my $result_v5 = $ua->get(copr_monitor_url("softwarepublico", "v5"));
+  my $result = $ua->get(copr_monitor_url($user, $repo));
   my $json = JSON->new->allow_nonref;
-  my $dec_result_v4 = $json->decode($result_v4->decoded_content);
-  my $dec_result_v5 = $json->decode($result_v5->decoded_content);
-  my $info = {};
-
-  foreach(@{$dec_result_v4->{'packages'}}) {
-    my $package = $_->{'pkg_name'};
-    my $status = $_->{'results'}{'epel-7-x86_64'}{'status'};
-    my $version = $_->{'results'}{'epel-7-x86_64'}{'pkg_version'};
-    $info->{$package}->{'v4_version'} = $version if $status eq "succeeded";
-  }
+  my $dec_result = $json->decode($result->decoded_content);
-  foreach(@{$dec_result_v5->{'packages'}}) {
+  foreach(@{$dec_result->{'packages'}}) {
     my $package = $_->{'pkg_name'};
     my $status = $_->{'results'}{'epel-7-x86_64'}{'status'};
     my $version = $_->{'results'}{'epel-7-x86_64'}{'pkg_version'};
-    $info->{$package}->{'v5_version'} = $version if $status eq "succeeded";
-  }
-
-  foreach my $key (keys %{$info}) {
-    my $spec = $ua->get("https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/raw/master/src/pkg-rpm/$key/$key.spec");
-    my $version = $1 if $spec->decoded_content =~ /^Version:\s*([^\s]+)\s*$/m;
-    if($version =~ /%\{version\}/) {
-      $version = $1 if $spec->decoded_content =~ /define version\s*([^\s]+)\s*$/m;
-    }
-
-    my $release = 'no_release';
-    $release = $1 if $spec->decoded_content =~ /^Release:\s*([^\s]+)\s*$/m;
-    $version = "$version-$release";
-    $info->{$key}->{'git_version_master'} = $version;
+    $info->{$package}->{$repo."_version"} = $version if $status eq "succeeded";
   }
-  foreach my $key (keys %{$info}) {
-    my $spec = $ua->get("https://softwarepublico.gov.br/gitlab/softwarepublico/softwarepublico/raw/stable-4.x/src/pkg-rpm/$key/$key.spec");
+  foreach my $package (keys %{$info}) {
+    my $git_url = git_url('http://softwarepublico.gov.br',
+                          'gitlab/softwarepublico/softwarepublico/raw/<branch>/src/pkg-rpm/<package>/<package>.spec',
+                          $branch, $package);
+    my $spec = $ua->get($git_url);
     my $version = $1 if $spec->decoded_content =~ /^Version:\s*([^\s]+)\s*$/m;
     if($version =~ /%\{version\}/) {
       $version = $1 if $spec->decoded_content =~ /define version\s*([^\s]+)\s*$/m;
@@ -64,21 +58,21 @@ sub copr_info {
     my $release = 'no_release';
     $release = $1 if $spec->decoded_content =~ /^Release:\s*([^\s]+)\s*$/m;
     $version = "$version-$release";
-    $info->{$key}->{'git_version_stable_4'} = $version;
+    $info->{$package}->{'git_version_'.$branch} = $version;
   }
-  return $info;
 }
 sub compare_versions {
-  my $info = copr_info();
+  copr_info('softwarepublico', 'v4', 'stable-4.x');
+  copr_info('softwarepublico', 'v5', 'master');
   my $match = {};
-  foreach my $key (keys %{$info}) {
-    if($info->{$key}->{'v5_version'} eq $info->{$key}->{git_version_master}) {
-      $match->{$key} = 1;
+  foreach my $package (keys %{$info}) {
+    if($info->{$package}->{'v5_version'} eq $info->{$package}->{git_version_master}) {
+      $match->{$package} = 1;
     }
     else {
-      $match->{$key} = 0;
+      $match->{$package} = 0;
     }
   }
@@ -86,19 +80,20 @@ sub compare_versions {
 }
 sub info2html {
-  my $info = copr_info();
+  copr_info('softwarepublico', 'v4', 'stable-4.x');
+  copr_info('softwarepublico', 'v5', 'master');
   my $table_entries="";
-  foreach my $key (keys %{$info}) {
+  foreach my $package (keys %{$info}) {
     my $fill_v4_row;
     my $fill_v5_row;
-    if($info->{$key}->{'v4_version'} eq $info->{$key}->{git_version_stable_4}) {
+    if($info->{$package}->{'v4_version'} eq $info->{$package}->{'git_version_stable-4.x'}) {
       $fill_v4_row = "success";
     }
     else {
       $fill_v4_row = "danger";
     }
-    if($info->{$key}->{'v5_version'} eq $info->{$key}->{git_version_master}) {
+    if($info->{$package}->{'v5_version'} eq $info->{$package}->{git_version_master}) {
       $fill_v5_row = "success";
     }
     else {
@@ -106,11 +101,11 @@ sub info2html {
     }
     $table_entries .= "<tr>
-    <td><b>$key</b></td>
-    <td>$info->{$key}->{'git_version_stable_4'}</td>
-    <td class=\"$fill_v4_row\">$info->{$key}->{'v4_version'}</td>
-    <td>$info->{$key}->{'git_version_master'}</td>
-    <td class=\"$fill_v5_row\">$info->{$key}->{'v5_version'}</td>
+    <td><b>$package</b></td>
+    <td>$info->{$package}->{'git_version_stable-4.x'}</td>
+    <td class=\"$fill_v4_row\">$info->{$package}->{'v4_version'}</td>
+    <td>$info->{$package}->{'git_version_master'}</td>
+    <td class=\"$fill_v5_row\">$info->{$package}->{'v5_version'}</td>
     </tr>";
   }
@@ -147,7 +142,8 @@ sub serve_html {
 };
 sub serve_json {
-  my $info = copr_info();
+  copr_info('softwarepublico', 'v4', 'stable-4.x');
+  copr_info('softwarepublico', 'v5', 'master');
   my $json = JSON->new->allow_nonref;
   my $json_info = $json->encode($info);
   return [
@@ -4,7 +4,11 @@ use Test::More;
 BEGIN { use_ok('CoprStatus'); }
-my $info = CoprStatus::copr_info();
+CoprStatus::copr_info('softwarepubico', 'v4', 'stable-4.x');
+CoprStatus::copr_info('softwarepubico', 'v5', 'master');
+
+my $info = $CoprStatus::info;
+
 ok(ref($info), 'HASH');
 foreach my $key (keys %{$info}) {
   ok(ref($info->{$key}), 'HASH');
@@ -24,10 +28,21 @@ foreach my $key (keys %{$match}) {
 my $table = CoprStatus::info2html();
 like($table, qr/danger|success/m);
-my $html = CoprStatus::build_html();
+
+my $data = {
+  title => "SPB Copr Status",
+  table_entries => $table
+};
+
+my $template = Text::Template->new(
+  TYPE => 'FILE',
+  SOURCE => 'template.html.tt'
+);
+
+my $html = CoprStatus::build_html($data, $template);
 like($html, qr/SPB Copr Status/m);
-my $monitor_url = copr_monitor_url("foo", "bar");
+my $monitor_url = CoprStatus::copr_monitor_url("foo", "bar");
 my $test_url =  "http://copr.fedoraproject.org/api/coprs/foo/bar/monitor/";
 is($monitor_url, $test_url);