Add config.yaml

Now, repositories informations come from the config.yaml file.

Add config.yaml
Now, repositories informations come from the config.yaml file.
Athos
1 parent 05eeb3ec
Showing 4 changed files with 23 additions and 12 deletions Show diff stats
README.md
config.yaml
lib/CoprStatus.pm
t/app.t
@@ -25,6 +25,7 @@ installed:
 * Plack
 * LWP::UserAgent
 * JSON
+* YAML:XS
 * Text::Template
 * LWP::Protocol::https
  
@@ -0,0 +1,7 @@
+User: softwarepublico
+Repositories:
+  - v4
+  - v5
+Branches:
+  - stable-4.1
+  - master
@@ -2,6 +2,7 @@ package CoprStatus;
 use strict;
 use warnings;
 use JSON;
+use YAML::XS 'LoadFile';
 use Text::Template;
 use LWP::UserAgent;
 use LWP::Simple;
@@ -10,6 +11,7 @@ $ENV{&#39;PERL_LWP_SSL_VERIFY_HOSTNAME&#39;} = 0;
  
 # hash with repos data
 our $info = {};
+my $config = LoadFile('config.yaml');
  
 sub copr_monitor_url {
   my ( $user, $repo ) = @_;
@@ -62,15 +64,19 @@ sub get_copr_versions {
  
 }
  
-sub copr_info {
-  my ( $user, $repo, $branch ) = @_;
-  get_copr_versions($user, $repo);
-  get_specs($branch);
+sub update_info {
+  my $user = $config->{User};
+  foreach my $repo (@{$config->{Repositories}}) {
+    get_copr_versions($user, $repo);
+  }
+
+  foreach my $branch (@{$config->{Branches}}) {
+    get_specs($branch);
+  }
 }
  
 sub compare_versions {
-  copr_info('softwarepublico', 'v4', 'stable-4.1');
-  copr_info('softwarepublico', 'v5', 'master');
+  update_info();
   my $match = {};
   foreach my $package (keys %{$info}) {
     if($info->{$package}->{'v5_version'} eq $info->{$package}->{git_version_master}) {
@@ -85,8 +91,7 @@ sub compare_versions {
 }
  
 sub info2html {
-  copr_info('softwarepublico', 'v4', 'stable-4.1');
-  copr_info('softwarepublico', 'v5', 'master');
+  update_info();
   my $table_entries="";
   foreach my $package (keys %{$info}) {
     my $fill_v4_row;
@@ -147,8 +152,7 @@ sub serve_html {
 };
  
 sub serve_json {
-  copr_info('softwarepublico', 'v4', 'stable-4.1');
-  copr_info('softwarepublico', 'v5', 'master');
+  update_info();
   my $json = JSON->new->allow_nonref;
   my $json_info = $json->encode($info);
   return [
@@ -4,8 +4,7 @@ use Test::More;
  
 BEGIN { use_ok('CoprStatus'); }
  
-CoprStatus::copr_info('softwarepublico', 'v4', 'stable-4.1');
-CoprStatus::copr_info('softwarepublico', 'v5', 'master');
+CoprStatus::update_info();
  
 my $info = $CoprStatus::info;
...	...	@@ -25,6 +25,7 @@ installed:
25	25	* Plack
26	26	* LWP::UserAgent
27	27	* JSON
	28	+* YAML:XS
28	29	* Text::Template
29	30	* LWP::Protocol::https
30	31
...	...
...	...	@@ -0,0 +1,7 @@
	1	+User: softwarepublico
	2	+Repositories:
	3	+ - v4
	4	+ - v5
	5	+Branches:
	6	+ - stable-4.1
	7	+ - master
...	...
...	...	@@ -2,6 +2,7 @@ package CoprStatus;
2	2	use strict;
3	3	use warnings;
4	4	use JSON;
	5	+use YAML::XS 'LoadFile';
5	6	use Text::Template;
6	7	use LWP::UserAgent;
7	8	use LWP::Simple;
...	...	@@ -10,6 +11,7 @@ $ENV{'PERL_LWP_SSL_VERIFY_HOSTNAME'} = 0;
10	11
11	12	# hash with repos data
12	13	our $info = {};
	14	+my $config = LoadFile('config.yaml');
13	15
14	16	sub copr_monitor_url {
15	17	my ( $user, $repo ) = @_;
...	...	@@ -62,15 +64,19 @@ sub get_copr_versions {
62	64
63	65	}
64	66
65		-sub copr_info {
66		- my ( $user, $repo, $branch ) = @_;
67		- get_copr_versions($user, $repo);
68		- get_specs($branch);
	67	+sub update_info {
	68	+ my $user = $config->{User};
	69	+ foreach my $repo (@{$config->{Repositories}}) {
	70	+ get_copr_versions($user, $repo);
	71	+ }
	72	+
	73	+ foreach my $branch (@{$config->{Branches}}) {
	74	+ get_specs($branch);
	75	+ }
69	76	}
70	77
71	78	sub compare_versions {
72		- copr_info('softwarepublico', 'v4', 'stable-4.1');
73		- copr_info('softwarepublico', 'v5', 'master');
	79	+ update_info();
74	80	my $match = {};
75	81	foreach my $package (keys %{$info}) {
76	82	if($info->{$package}->{'v5_version'} eq $info->{$package}->{git_version_master}) {
...	...	@@ -85,8 +91,7 @@ sub compare_versions {
85	91	}
86	92
87	93	sub info2html {
88		- copr_info('softwarepublico', 'v4', 'stable-4.1');
89		- copr_info('softwarepublico', 'v5', 'master');
	94	+ update_info();
90	95	my $table_entries="";
91	96	foreach my $package (keys %{$info}) {
92	97	my $fill_v4_row;
...	...	@@ -147,8 +152,7 @@ sub serve_html {
147	152	};
148	153
149	154	sub serve_json {
150		- copr_info('softwarepublico', 'v4', 'stable-4.1');
151		- copr_info('softwarepublico', 'v5', 'master');
	155	+ update_info();
152	156	my $json = JSON->new->allow_nonref;
153	157	my $json_info = $json->encode($info);
154	158	return [
...	...
...	...	@@ -4,8 +4,7 @@ use Test::More;
4	4
5	5	BEGIN { use_ok('CoprStatus'); }
6	6
7		-CoprStatus::copr_info('softwarepublico', 'v4', 'stable-4.1');
8		-CoprStatus::copr_info('softwarepublico', 'v5', 'master');
	7	+CoprStatus::update_info();
9	8
10	9	my $info = $CoprStatus::info;
11	10
...	...