Changeset 473 in ProjectBuilder

Timestamp:

Jun 4, 2008, 3:04:36 AM (16 years ago)

Author:

Bruno Cornec

Message:

Working announce action for pb

Location:

devel

Files:

• pb-modules/lib/ProjectBuilder/Base.pm (modified) (2 diffs)
• pb/bin/pb (modified) (6 diffs)
• pb/lib/ProjectBuilder/Changelog.pm (modified) (2 diffs)
• pb/lib/ProjectBuilder/Filter.pm (modified) (1 diff)

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

@@ -126 +126 @@
 The first parameter is the shell command to call.
 The second parameter is the message to print on screen. If none is given, then the command is printed.
+The third parameter print the result of the command after correct execution if value is verbose. If value is noredir, it avoids redirecting outputs (e.g. for vi).
 This function returns the result the return value of the system command.
 
@@ -137 +138 @@
 my $cmt=shift || $cmd;
 my $verbose=shift || undef;
+my $redir = "";
 
 pb_log(0,"$cmt... ");
 pb_log(1,"Executing $cmd\n");
-system("$cmd 2>&1 > $ENV{'PBTMP'}/system.log");
+$redir = "2>&1 > $ENV{'PBTMP'}/system.log" if ((! defined $verbose) || ($verbose ne "noredir"));
+system("$cmd $redir");
 my $res = $?;
 if ($res == -1) {
     pb_log(0,"failed to execute ($cmd): $!\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
 } elsif ($res & 127) {
     pb_log(0, "child ($cmd) died with signal ".($? & 127).", ".($? & 128) ? 'with' : 'without'." coredump\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
 } elsif ($res == 0) {
     pb_log(0,"OK\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log") if (defined $verbose);
+    pb_display_file("$ENV{'PBTMP'}/system.log") if ((defined $verbose) && (-f "$ENV{'PBTMP'}/system.log"));
 } else {
     pb_log(0, "child ($cmd) exited with value ".($? >> 8)."\n");
-    pb_display_file("$ENV{'PBTMP'}/system.log");
+    pb_display_file("$ENV{'PBTMP'}/system.log") if (-f "$ENV{'PBTMP'}/system.log");
 }
 return($res);

devel/pb/bin/pb

@@ -27 +27 @@
 use ProjectBuilder::Env;
 use ProjectBuilder::Filter;
+use ProjectBuilder::Changelog;
+
+use DBI;
 
 # Global variables
@@ -1712 +1715 @@
 sub pb_announce {
 
-    die "-V Version parameter needed" if ((not defined $newver) || ($newver eq ""));
-
-    my ($pbrepo) = pb_conf_get("pbrepo");
+    # Get all required parameters
+    my ($pbpackager,$pbrepo,$pbml) = pb_conf_get("pbpackager","pbrepo","pbml");
     my ($pkgv, $pkgt, $testver) = pb_conf_get_if("pkgver","pkgtag","testver");
     my $pkg = pb_cms_get_pkg($defpkgdir,$extpkgdir);
@@ -1721 +1723 @@
     my $first = 0;
 
+    # Command to find packages on repo
     my $findstr = "find . ";
+    # Generated announce files
+    my @files;
 
     foreach my $pbpkg (@pkgs) {
@@ -1740 +1745 @@
 
         $findstr .= "-name \'$pbpkg-$pbver-$pbtag\.*.rpm\' -o -name \'$pbpkg"."_$pbver*\.deb\' -o -name \'$pbpkg-$pbver\.ebuild\' ";
+
+        my $chglog;
+
+        # Get project info on log file and generate tmp files used later on
+        pb_cms_init($pbinit);
+        $chglog = "$ENV{'PBROOTDIR'}/$pbpkg/pbcl";
+        $chglog = "$ENV{'PBROOTDIR'}/pbcl" if (! -f $chglog);
+        $chglog = undef if (! -f $chglog);
+
+        open(OUT,"> $ENV{'PBTMP'}/$pbpkg.ann") || die "Unable to create $ENV{'PBTMP'}/$pbpkg.ann: $!";
+        pb_changelog("announce",$pbpkg,$pbver,"N/A","N/A","N/A",\*OUT,"yes",$chglog);
+        close(OUT);
+        push(@files,"$ENV{'PBTMP'}/$pbpkg.ann");
     }
     $findstr .= " | grep -Ev \'src.rpm\'";
@@ -1754 +1772 @@
 
     # Prepare a template of announce
-    open(ANN,"> $ENV{'PBTMP'}/pbannounce") || die "Unable to create $ENV{'PBTMP'}/pbannounce: $!";
+    open(ANN,"> $ENV{'PBTMP'}/announce.html") || die "Unable to create $ENV{'PBTMP'}/announce.html: $!";
     print ANN << "EOF";
-Project $ENV{'PBPROJ'} version $newver is now available</p>
-
-<p>The project team is happy to announce the availability of a newest version of $ENV{'PBPROJ'} $newver. Enjoy it as usual!</p>
+Project $ENV{'PBPROJ'} version $ENV{'PBPROJVER'} is now available</p>
+
+<p>The project team is happy to announce the availability of a newest version of $ENV{'PBPROJ'} $ENV{'PBPROJVER'}. Enjoy it as usual!</p>
 <p>
 Now available at <a href="$pbrepo->{$ENV{'PBPROJ'}}">$pbrepo->{$ENV{'PBPROJ'}}</a>
@@ -1765 +1783 @@
 EOF
     open(LOG,"$ENV{'PBTMP'}/system.log") || die "Unable to read $ENV{'PBTMP'}/system.log: $!";
+    my $col = 2;
+    my $i = 1;
+    print ANN << 'EOF';
+<TABLE WIDTH="700" CELLPADDING="0" CELLSPACING="0" BORDER="0">
+<TR>
+EOF
     while (<LOG>) {
-        print ANN $_;
+        print ANN "<TD>$_</TD>";
+        $i++;
+        if ($i > $col) {
+            print ANN "</TR>\n<TR>";
+            $i = 1;
+        }
     }
     close(LOG);
-
+    print ANN << "EOF";
+</TR>
+</TABLE>
+</p>
+
+<p>As usual source packages are also available in the same directory.</p>
+
+<p>
+Changes are :
+</p>
+<p>
+EOF
+    # Get each package changelog content
+    foreach my $f (sort(@files)) {
+        open(IN,"$f") || die "Unable to read $f:$!";
+        while (<IN>) {
+            print ANN $_;
+        }
+        close(IN);
+        print ANN "</p><p>\n";
+    }
+    print ANN "</p>\n";
     close(ANN);
-    pb_display_file("$ENV{'PBTMP'}/pbannounce");
+
+    # Allow for modification
+    pb_system("vi $ENV{'PBTMP'}/announce.html","Allowing modification of the announce","noredir");
+
+    # Store it in DB for external usage (Web pages generation)
+    my $db = "$ENV{'PBCONFDIR'}/announces3.sql";
+
+    my $precmd = "";
+    if (! -f $db) {
+        $precmd = "CREATE TABLE announces (id INTEGER PRIMARY KEY AUTOINCREMENT, date DATE, announce VARCHAR[65535])";
+    }
+
+    my $dbh = DBI->connect("dbi:SQLite:dbname=$db","","",
+                        { RaiseError => 1, AutoCommit => 1 })
+                        || die "Unable to connect to $db";
+
+    if ($precmd ne "") {
+        my $sth = $dbh->prepare(qq{$precmd})
+                    || die "Unable to create table into $db";
+        $sth->execute();
+    }
+
+    # To read whole file
+    local $/;
+    open(ANN,"$ENV{'PBTMP'}/announce.html") || die "Unable to read $ENV{'PBTMP'}/announce.html: $!";
+    my $announce = <ANN>;
+    close(ANN);
+    
+    pb_log(2,"INSERT INTO announces VALUES (NULL, $pbdate, $announce)");
+    my $sth = $dbh->prepare(qq{INSERT INTO announces VALUES (NULL,?,?)})
+                    || die "Unable to insert into $db";
+    $sth->execute($pbdate, $announce);
+    $dbh->disconnect;
+
+    # Then deliver it on the Web
+    # $TOOLHOME/livwww www
+
+    # Mail it to project's ML
+    open(ML,"| w3m -dump -T text/html > $ENV{'PBTMP'}/announce.txt") || die "Unable to create $ENV{'PBTMP'}/announce.txt: $!";
+    print ML << 'EOF';
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/x html1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr" xml:lang="en" lang="en">
+  <head>
+  </head>
+  <body>
+  <p>
+EOF
+    open(ANN,"$ENV{'PBTMP'}/announce.html") || die "Unable to read $ENV{'PBTMP'}/announce.html: $!";
+    while(<ANN>) {
+        print ML $_;
+    }
+    print ML << 'EOF';
+</body>
+</html>
+EOF
+    close(ML);
+
+    pb_system("export EMAIL=\'$pbpackager->{$ENV{'PBPROJ'}}\' ; mutt -s \"ANNOUNCE: Project $ENV{'PBPROJ'} version $ENV{'PBPROJVER'} is now available\" $pbml->{$ENV{'PBPROJ'}} < $ENV{'PBTMP'}/announce.txt","Mailing announce to $pbml->{$ENV{'PBPROJ'}}");
 }
 

devel/pb/lib/ProjectBuilder/Changelog.pm

@@ -133 +133 @@
 $tmp = <INPUT>;
 if ($dtype eq "announce") {
-    print $OUTPUT $tmp;
+    chomp($tmp);
+    print $OUTPUT "$tmp<br>\n";
 }
 $tmp = <INPUT>;
 if ($dtype eq "announce") {
-    print $OUTPUT $tmp;
+    chomp($tmp);
+    print $OUTPUT "$tmp<br>\n";
 }
 
@@ -180 +182 @@
             print $OUTPUT "$tmp";
         } else {
-            print $OUTPUT "$tmp";
+            chomp($tmp);
+            print $OUTPUT "$tmp<br>\n";
         }
         last if (eof(INPUT));

devel/pb/lib/ProjectBuilder/Filter.pm

@@ -166 +166 @@
 pb_log(2,"DEBUG: From $f to $destfile\n");
 pb_mkdir_p(dirname($destfile)) if (! -d dirname($destfile));
-open(DEST,"> $destfile") || die "Unable to create $destfile";
+open(DEST,"> $destfile") || die "Unable to create $destfile: $!";
 open(FILE,"$f") || die "Unable to open $f: $!";
 while (<FILE>) {