add row for git stable-4.x branch

Now the v4 repo is compared with the git stable-4.x branch instead of master.

add row for git stable-4.x branch
Now the v4 repo is compared with the git stable-4.x branch instead of master.
Athos
1 parent 290cd879
Showing 3 changed files with 29 additions and 8 deletions Show diff stats
lib/CoprStatus.pm
t/app.t
template.html.tt
@@ -45,7 +45,19 @@ sub copr_info {
     my $release = $1 if $spec->decoded_content =~ /^Release:\s*([^\s]+)\s*$/m;
     $version = "$version-$release";
-    $info->{$key}->{'git_version'} = $version;
+    $info->{$key}->{'git_version_master'} = $version;
+  }
+
+  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");
+    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 = $1 if $spec->decoded_content =~ /^Release:\s*([^\s]+)\s*$/m;
+    $version = "$version-$release";
+    $info->{$key}->{'git_version_stable_4'} = $version;
   }
   return $info;
@@ -55,7 +67,7 @@ sub compare_versions {
   my $info = copr_info();
   my $match = {};
   foreach my $key (keys %{$info}) {
-    if($info->{$key}->{'v5_version'} eq $info->{$key}->{git_version}) {
+    if($info->{$key}->{'v5_version'} eq $info->{$key}->{git_version_master}) {
       $match->{$key} = 1;
     }
     else {
@@ -72,14 +84,14 @@ sub info2html {
   foreach my $key (keys %{$info}) {
     my $fill_v4_row;
     my $fill_v5_row;
-    if($info->{$key}->{'v4_version'} eq $info->{$key}->{git_version}) {
+    if($info->{$key}->{'v4_version'} eq $info->{$key}->{git_version_stable_4}) {
       $fill_v4_row = "success";
     }
     else {
       $fill_v4_row = "danger";
     }
-    if($info->{$key}->{'v5_version'} eq $info->{$key}->{git_version}) {
+    if($info->{$key}->{'v5_version'} eq $info->{$key}->{git_version_master}) {
       $fill_v5_row = "success";
     }
     else {
@@ -88,8 +100,9 @@ sub info2html {
     $table_entries .= "<tr>
     <td><b>$key</b></td>
-    <td>$info->{$key}->{'git_version'}</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>
     </tr>";
   }
@@ -8,12 +8,12 @@ my $info = CoprStatus::copr_info();
 ok(ref($info), 'HASH');
 foreach my $key (keys %{$info}) {
   ok(ref($info->{$key}), 'HASH');
-  ok($info->{$key}->{'git_version'});
+  ok($info->{$key}->{'git_version_master'});
   ok($info->{$key}->{'v4_version'});
   ok($info->{$key}->{'v5_version'});
   like($info->{$key}->{'v4_version'}, qr/[[:ascii:]]+-[[:ascii:]]+/);
   like($info->{$key}->{'v5_version'}, qr/[[:ascii:]]+-[[:ascii:]]+/);
-  like($info->{$key}->{'git_version'}, qr/[[:ascii:]]+-[[:ascii:]]+/);
+  like($info->{$key}->{'git_version_master'}, qr/[[:ascii:]]+-[[:ascii:]]+/);
 }
 my $match = CoprStatus::compare_versions;
@@ -47,9 +47,17 @@
         <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 table-responsive">
           <table class="table table-striped">
             <tr>
+              <th></th>
+              <th>Release 4</th>
+              <th></th>
+              <th>Release 5</th>
+              <th></th>
+            </tr>
+            <tr>
               <th>PACKAGE</th>
-              <th>git</th>
+              <th>git:stable-4.x</th>
               <th>softwarepublico/v4</th>
+              <th>git:master</th>
               <th>softwarepublico/v5</th>
             </tr>
               {$table_entries}
	@@ -8,12 +8,12 @@ my $info = CoprStatus::copr_info();		@@ -8,12 +8,12 @@ my $info = CoprStatus::copr_info();
8	ok(ref($info), 'HASH');	8	ok(ref($info), 'HASH');
9	foreach my $key (keys %{$info}) {	9	foreach my $key (keys %{$info}) {
10	ok(ref($info->{$key}), 'HASH');	10	ok(ref($info->{$key}), 'HASH');
11	- ok($info->{$key}->{'git_version'});	11	+ ok($info->{$key}->{'git_version_master'});
12	ok($info->{$key}->{'v4_version'});	12	ok($info->{$key}->{'v4_version'});
13	ok($info->{$key}->{'v5_version'});	13	ok($info->{$key}->{'v5_version'});
14	like($info->{$key}->{'v4_version'}, qr/[[:ascii:]]+-[[:ascii:]]+/);	14	like($info->{$key}->{'v4_version'}, qr/[[:ascii:]]+-[[:ascii:]]+/);
15	like($info->{$key}->{'v5_version'}, qr/[[:ascii:]]+-[[:ascii:]]+/);	15	like($info->{$key}->{'v5_version'}, qr/[[:ascii:]]+-[[:ascii:]]+/);
16	- like($info->{$key}->{'git_version'}, qr/[[:ascii:]]+-[[:ascii:]]+/);	16	+ like($info->{$key}->{'git_version_master'}, qr/[[:ascii:]]+-[[:ascii:]]+/);
17	}	17	}
18		18
19	my $match = CoprStatus::compare_versions;	19	my $match = CoprStatus::compare_versions;