Changeset 1905 in ProjectBuilder

Timestamp:

Oct 9, 2014, 12:14:42 PM (11 years ago)

Author:

Bruno Cornec

Message:

• pb_conf_write is indeed working and tested now (git error)

Location:

devel/pb-modules

Files:

• lib/ProjectBuilder/Conf.pm (modified) (3 diffs)
• t/Conf.t (modified) (3 diffs)

devel/pb-modules/lib/ProjectBuilder/Conf.pm

@@ -29 +29 @@
  
 our @ISA = qw(Exporter);
-our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_write pb_conf_get pb_conf_get_if pb_conf_print pb_conf_get_all);
+our @EXPORT = qw(pb_conf_init pb_conf_add pb_conf_read pb_conf_read_if pb_conf_write pb_conf_get pb_conf_get_if pb_conf_print pb_conf_get_all pb_conf_cache);
 ($VERSION,$REVISION) = pb_version_init();
 
@@ -118 +118 @@
 open(CONF,$cf) || confess "Unable to open $cf";
 while(<CONF>) {
+    next if (/^#/);
     if (/^\s*([A-z0-9-_.]+)\s+([[A-z0-9-_.]+)\s*=\s*(.*)$/) {
         pb_log(3,"DEBUG: 1:$1 2:$2 3:$3\n");
@@ -233 +234 @@
 
 my $conffile = shift;
-my $h = $_;
-
-open(CONF,"> $conffile") || confess "Unbale to wirte into $conffile";
+my $h = shift;
+
+confess "No configuration file defined to write into !" if (not defined $conffile);
+confess "No hash defined to read from !" if (not defined $h);
+open(CONF,"> $conffile") || confess "Unable to write into $conffile";
 
 foreach my $p (keys %$h) {
-    foreach my $key ($p) {
-        print CONF "$p $key = $p->{$key}\n";
+    my $j = $h->{$p};
+    foreach my $k (keys %$j) {
+        print CONF "$p $k = $j->{$k}\n";
     }
 }

devel/pb-modules/t/Conf.t

@@ -6 +6 @@
 use ProjectBuilder::Base;
 use ProjectBuilder::Conf;
+use ProjectBuilder::Distribution;
 
 eval
@@ -28 +29 @@
 
 my $nt = 0;
-    is($path, $test->{$uri}[4], "pb_get_uri Test path $uri");
-    $nt++;
-}
 
 $ENV{'TMPDIR'} = "/tmp";
@@ -36 +34 @@
 
 pb_conf_init("test");
-my $cf = pb_distro_conffile();
-my $cnt = pb_get_content($cf);
+open(FILE,"> $ENV{'TMPDIR'}/conf.pb") || die "Unable to create $ENV{'TMPDIR'}/conf.pb";
+# should be in alphabetic order
+print FILE "truc mageia-4-x86_64 = la tete a toto\n";
+print FILE "yorro mageia-3-x86_64 = tartampion\n";
+print FILE "zz mageia-3-x86_64 = yy\n";
+close(FILE);
+my $cnt = pb_get_content("$ENV{'TMPDIR'}/conf.pb");
 
-my %h = pb_conf_cache($cf,\%h);
-pb_conf_write("$PBTMP/test.pb",\%h);
-my $content = pb_get_content("$PBTMP/test.pb");
+my %h;
+my $h = \%h;
+$h = pb_conf_cache("$ENV{'TMPDIR'}/conf.pb",$h);
+pb_conf_write("$ENV{'TMPDIR'}/test.pb",$h);
+my $content = pb_get_content("$ENV{'TMPDIR'}/test.pb");
 is($cnt, $content, "pb_conf_write Test");
 $nt++;
+unlink("$ENV{'TMPDIR'}/conf.pb");
+unlink("$ENV{'TMPDIR'}/test.pb");
 
 done_testing($nt);