Changeset 1374

Timestamp:

12/22/11 04:14:40 (17 months ago)

Author:

bruno

Message:

• Start to add CPAN upload support to solve #101 - Needs to be tested now with an official version

Location:

devel

Files:

• pb-modules/etc/pb.conf (modified) (1 diff)
• pb-modules/etc/pb.conf.pod (modified) (1 diff)
• pb/bin/pb (modified) (10 diffs)

devel/pb-modules/etc/pb.conf

@@ -551 +551 @@
 ossha fedora-9 = sha1
 ossha fedora-10 = sha1
+
+#
+# CPAN upload info (info from cpanupload)
+#
+cpanpause default = pause.perl.org
+cpandir default = incoming
+cpansubdir default =
+cpanurl default = http://pause.perl.org/pause/authenquery
+#cpanuser default = XXX
+#cpanpasswd default = YYY

devel/pb-modules/etc/pb.conf.pod

@@ -22 +22 @@
 
 =over 4
+
+=item B<cpandir>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause directory to upload new modules
+ Conffile: pb
+ Example: cpandir default = incoming
+
+=item B<cpanpasswd>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause user's password
+ Conffile: home
+ Example: cpanpasswd default = mycomplicatedpwd
+
+=item B<cpanpause>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause site to upload new modules
+ Conffile: pb
+ Example: cpanpause default = pause.perl.org
+
+=item B<cpansubdir>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause subdirectory in the user's area to upload into
+ Conffile: pb
+ Example: cpansubdir default = mydir
+
+=item B<cpanurl>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause URL to activate the upload mecanism
+ Conffile: pb
+ Example: cpanurl default = http://pause.perl.org/pause/authenquery
+
+=item B<cpanuser>
+
+ Nature: Optional
+ Key: project (as defined in the -p option or PBPROJ environment variable)
+ Value: CPAN Pause user
+ Conffile: home
+ Example: cpanuser default = XXX
 
 =item B<defpkgdir>

devel/pb/bin/pb

@@ -1556 +1556 @@
 sub pb_build2ssh {
     pb_send2target("Sources");
+    pb_send2target("CPAN");
 }
 
@@ -1607 +1608 @@
         $dir = "websshdir";
         $port = "websshport";
+    } elsif ($cmt eq "CPAN") {
+        $host = "cpanpause";
+        $login = "";
+        $dir = "cpandir";
+        $port = "";
     }
     my $cmd = "";
     my $src = "";
+    my $cpanpkg = 0;
     my $pbos;
 
@@ -1642 +1649 @@
                 $src = "$src $ENV{'PBDESTDIR'}/$pbpkg-$pbver.tar.gz"
             }
+
+            # Do we have one perl package
+            my @nametype = pb_conf_get_if("namingtype");
+            my $type = $nametype[0]->{$pbpkg};
+            if ((defined $type) && ($type eq "perl")) {
+                $cpanpkg = 1;
+            }
         }
         # Adds conf file for availability of conf elements
         pb_conf_add("$ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb");
+    }
+    my ($rbsconf,$testver,$delivery) = pb_conf_get_if($conf,"testver","delivery");
+    if ($cmt =~ /CPAN/) {
+        # Do not deliver on Pause if this is a test version
+        return if ($testver =~ /true/);
+        # Do not deliver on Pause if this is not a perl package
+        return if ($cpanpkg == 0);
     }
 
@@ -1653 +1674 @@
     } elsif ($cmt =~ /(V[EM]|RM)test/) {
         $src="$src $ENV{'PBROOTDIR'}/$ENV{'PBPROJ'}.pb $ENV{'PBDESTDIR'}/$ENV{'PBPROJVER'}-$ENV{'PBPROJTAG'}.pb $ENV{'PBETC'} $ENV{'PBDESTDIR'}/pbrc $ENV{'PBDESTDIR'}/pbscript.$$ $ENV{'PBDESTDIR'}/pbtest";
-    } elsif (($cmt eq "Announce") || ($cmt eq "Web")) {
+    } elsif (($cmt eq "Announce") || ($cmt eq "Web") || ($cmt eq "CPAN")) {
         $src="$src $ENV{'PBTMP'}/pbscript";
     } elsif ($cmt eq "Packages") {
@@ -1663 +1684 @@
         $src = "$src $ENV{'PBBUILDDIR'}/pbscript.$$";
     }
-    if (($cmt eq "Sources") || ($cmt eq "Packages")) {
+    if (($cmt eq "Sources") || ($cmt eq "Packages") || ($cmt eq "CPAN")) {
         my ($pbpackager) = pb_conf_get("pbpackager");
         $ENV{'PBPACKAGER'} = $pbpackager->{$ENV{'PBPROJ'}};
@@ -1683 +1704 @@
     my ($sshhost,$sshlogin,$sshdir,$sshport) = pb_conf_get($host,$login,$dir,$port);
     # Not mandatory...
-    my ($rbsconf,$testver,$delivery) = pb_conf_get_if($conf,"testver","delivery");
     $delivery->{$ENV{'PBPROJ'}} = "" if (not defined $delivery->{$ENV{'PBPROJ'}});
     my ($vtmout,$vepath);
@@ -1719 +1739 @@
     if (($cmt eq "Sources") || ($cmt =~ /(V[EM]|RM)Script/)) {
         $tdir = "$remdir/$delivery->{$ENV{'PBPROJ'}}/src";
+    } elsif ($cmt eq "CPAN") {
+        $tdir = "$remdir";
     } elsif ($cmt =~ /(V[EM]|RM)(build|test)/) {
         $tdir = $remdir."/$ENV{'PBPROJ'}/delivery";
@@ -1938 +1960 @@
     }
 
-    # ssh communication if not VE
+    # ssh communication if not VE or CPAN
     # should use a hash instead...
     my ($shcmd,$cpcmd,$cptarget,$cp2target);
-    if ($cmt !~ /^VE/) {
-        my $keyfile = pb_ssh_get(0);
-        $shcmd = "ssh -i $keyfile -q -o UserKnownHostsFile=/dev/null -p $nport $mac";
-        $cpcmd = "scp -i $keyfile -p -o UserKnownHostsFile=/dev/null -P $nport";
-        $cptarget = "$mac:$tdir";
-        if ($cmt =~ /^(V|R)Mbuild/) {
-            $cp2target = "$mac:$bdir";
-        }
-    } else {
+    if ($cmt =~ /^VE/) {
         my $tp = $vepath->{$ENV{'PBPROJ'}};
         my $tpdir = "$tp/$pbos->{'name'}/$pbos->{'version'}/$pbos->{'arch'}";
@@ -1974 +1988 @@
         }
         pb_log(2,"On VE using $cptarget as target dir to copy to\n");
-    }
-
+    } elsif ($cmt =~ /^CPAN/) {
+        my $ftpput = ps_check_req("ncftpput",1);
+        my $ftpget = ps_check_req("wget",1);
+        my ($cpanuser,$cpanpasswd) = pb_conf_get("cpanuser","cpanpasswd");
+        my ($cpansubdir) = pb_conf_get_if("cpansubdir");
+        $shcmd = "$ftpget --post-data \'HIDDENNAME=".$cpanuser;
+        $shcmd .= "&user=".$cpanuser;
+        $shcmd .= "&password=".$cpanpasswd;
+        $shcmd .= "&SUBMIT_pause99_add_uri_upload=\"Upload the checked files\"";
+        $shcmd .= "&pause99_add_uri_subdirtext=".$cpansubdir if (defined $cpansubdir);
+        foreach my $s (split(/ /,$src)) {
+            $shcmd .= "&pause99_add_uri_upload=".basename($s);
+        }
+        $shcmd .= "'";
+        $cpcmd = "$ftpput $host $dir";
+        $cptarget = "CPAN";
+    } else {
+        my $keyfile = pb_ssh_get(0);
+        my $sshcmd = ps_check_req("ssh",1);
+        my $scpcmd = ps_check_req("scp",1);
+        $shcmd = "$sshcmd -i $keyfile -q -o UserKnownHostsFile=/dev/null -p $nport $mac";
+        $cpcmd = "$scpcmd -i $keyfile -p -o UserKnownHostsFile=/dev/null -P $nport";
+        $cptarget = "$mac:$tdir";
+        if ($cmt =~ /^(V|R)Mbuild/) {
+            $cp2target = "$mac:$bdir";
+        }
+    }
+    
     my $logres = "";
     # Do not touch when just announcing
-    if ($cmt ne "Announce") {
+    if (($cmt ne "Announce") && ($cmt ne "CPAN")) {
         pb_system("$shcmd \"mkdir -p $tdir ; cd $tdir ; echo \'for i in $basesrc; do if [ -f \$i ]; then rm -f \$i; fi; done\ ; $cmd' | bash\"","Preparing $tdir on $cptarget");
     } else {
@@ -1998 +2038 @@
     }
 
-    pb_system("$shcmd \"echo \'cd $tdir ; if [ -x $pbscript ]; then ./$pbscript; fi ; rm -f ./$pbscript\' | bash\"","Executing pbscript on $cptarget if needed","verbose");
+    # It's already ready for CPAN
+    if ($cmt !~ /^CPAN/) {
+        $shcmd .= "\"echo \'cd $tdir ; if [ -x $pbscript ]; then ./$pbscript; fi ; rm -f ./$pbscript\' | bash\"";
+    }
+    pb_system("$shcmd","Executing pbscript on $cptarget if needed","verbose");
     if ($cmt =~ /^(V[EM]|RM)build/) {
         # Get back info on pkg produced, compute their name and get them from the VM/RM