From c7648df9859c7a5dca52897d7ff27fd35492a12c Mon Sep 17 00:00:00 2001 From: Athos Ribeiro Date: Thu, 28 Jan 2016 15:39:49 -0200 Subject: [PATCH] move hardcoded urls to config file --- config.yaml | 2 ++ lib/CoprStatus.pm | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/config.yaml b/config.yaml index 587e938..635f40b 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,7 @@ User: softwarepublico UpdateRate: 600 +GitDomain: http://softwarepublico.gov.br +GitSpecPath: gitlab/softwarepublico/softwarepublico/raw//src/pkg-rpm//.spec Repositories: - v4 - v5 diff --git a/lib/CoprStatus.pm b/lib/CoprStatus.pm index 476ce28..4c57fca 100644 --- a/lib/CoprStatus.pm +++ b/lib/CoprStatus.pm @@ -41,11 +41,11 @@ sub download_specs { my $dec_result = $json->decode($result); foreach(@{$dec_result->{'packages'}}) { my $package = $_->{'pkg_name'}; - my $git_url = git_url('http://softwarepublico.gov.br', - 'gitlab/softwarepublico/softwarepublico/raw//src/pkg-rpm//.spec', + my $git_url = git_url($config->{GitDomain}, + $config->{GitSpecPath}, $branch, $package); `mkdir -p data/git/$branch`; - my $spec_filename = 'data/git/'.$branch.'/'.$package.'.spec'; + my $spec_filename = "data/git/$branch/$package.spec"; $ua->mirror( $git_url, $spec_filename ); } } @@ -138,28 +138,28 @@ sub info2html { update_info(); my $table_entries=""; foreach my $package (keys %{$info}) { - my $fill_v4_row; - my $fill_v5_row; + my $fill_stable_row; + my $fill_dev_row; if($info->{$package}->{'copr'}->{${$config->{Repositories}}[0]} eq $info->{$package}->{'git'}->{${$config->{Branches}}[0]}) { - $fill_v4_row = "success"; + $fill_stable_row = "success"; } else { - $fill_v4_row = "danger"; + $fill_stable_row = "danger"; } if($info->{$package}->{'copr'}->{${$config->{Repositories}}[1]} eq $info->{$package}->{'git'}->{${$config->{Branches}}[1]}) { - $fill_v5_row = "success"; + $fill_dev_row = "success"; } else { - $fill_v5_row = "danger"; + $fill_dev_row = "danger"; } $table_entries .= " $package $info->{$package}->{'git'}->{${$config->{Branches}}[0]} - $info->{$package}->{'copr'}->{${$config->{Repositories}}[0]} + $info->{$package}->{'copr'}->{${$config->{Repositories}}[0]} $info->{$package}->{'git'}->{${$config->{Branches}}[1]} - $info->{$package}->{'copr'}->{${$config->{Repositories}}[1]} + $info->{$package}->{'copr'}->{${$config->{Repositories}}[1]} "; } -- libgit2 0.21.2