WebSVN – Applications.gtt – Diff – /trunk/bibliotheque/pear/PEAR/Command/Package.php

  * PEAR_Command_Package (package, package-validate, cvsdiff, cvstag, package-dependencies,
  * sign, makerpm, convert commands)
+ *
  * PHP versions 4 and 5
+ *
- * LICENSE: This source file is subject to version 3.0 of the PHP license
- * that is available through the world-wide-web at the following URI:
- * http://www.php.net/license/3_0.txt.  If you did not receive a copy of
- * the PHP License and are unable to obtain it through the web, please
- * send a note to license@php.net so we can mail you a copy immediately.
- *
  * @category   pear
  * @package    PEAR
  * @author     Stig Bakken <ssb@php.net>
  * @author     Martin Jansen <mj@php.net>
  * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
+ * @copyright  1997-2009 The Authors
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    CVS: $Id: Package.php,v 1.122 2006/06/07 23:38:14 pajoye Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
  * @category   pear
  * @package    PEAR
  * @author     Stig Bakken <ssb@php.net>
  * @author     Martin Jansen <mj@php.net>
  * @author     Greg Beaver <cellog@php.net>
- * @copyright  1997-2006 The PHP Group
+ * @copyright  1997-2009 The Authors
- * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    Release: 1.5.1
+ * @version    Release: @package_version@
  * @link       http://pear.php.net/package/PEAR
  * @since      Class available since Release 0.1
  */
 class PEAR_Command_Package extends PEAR_Command_Common
-{
-    // {{{ properties
+{
     var $commands = array(
         'package' => array(
             'summary' => 'Build Package',
             'function' => 'doPackage',
 command will compare the current code with the last checked-in code.
 Using the -r or -R option you may compare the current code with that
 of a specific release.
 ',
             ),
+         'svntag' => array(
+             'summary' => 'Set SVN Release Tag',
+             'function' => 'doSvnTag',
+             'shortcut' => 'sv',
+             'options' => array(
+                 'quiet' => array(
+                     'shortopt' => 'q',
+                     'doc' => 'Be quiet',
+                     ),
+                 'slide' => array(
+                     'shortopt' => 'F',
+                     'doc' => 'Move (slide) tag if it exists',
+                     ),
+                 'delete' => array(
+                     'shortopt' => 'd',
+                     'doc' => 'Remove tag',
+                     ),
+                 'dry-run' => array(
+                     'shortopt' => 'n',
+                     'doc' => 'Don\'t do anything, just pretend',
+                     ),
+                 ),
+             'doc' => '<package.xml> [files...]
+ Sets a SVN tag on all files in a package.  Use this command after you have
+ packaged a distribution tarball with the "package" command to tag what
+ revisions of what files were in that release.  If need to fix something
+ after running svntag once, but before the tarball is released to the public,
+ use the "slide" option to move the release tag.
+ to include files (such as a second package.xml, or tests not included in the
+ release), pass them as additional parameters.
+ ',
+             ),
         'cvstag' => array(
             'summary' => 'Set CVS Release Tag',
             'function' => 'doCvsTag',
             'shortcut' => 'ct',
             'options' => array(
         'package-dependencies' => array(
             'summary' => 'Show package dependencies',
             'function' => 'doPackageDependencies',
             'shortcut' => 'pd',
             'options' => array(),
-            'doc' => '
+            'doc' => '<package-file> or <package.xml> or <install-package-name>
-List all dependencies the package has.'
+List all dependencies the package has.
+Can take a tgz / tar file, package.xml or a package name of an installed package.'
             ),
         'sign' => array(
             'summary' => 'Sign a package distribution file',
             'function' => 'doSign',
             'shortcut' => 'si',
-            'options' => array(),
+            'options' => array(
+                'verbose' => array(
+                    'shortopt' => 'v',
+                    'doc' => 'Display GnuPG output',
+                    ),
+            ),
             'doc' => '<package-file>
 Signs a package distribution (.tar or .tgz) file with GnuPG.',
             ),
         'makerpm' => array(
             'summary' => 'Builds an RPM spec file from a PEAR package',
             ),
         );
-    var $output;
-    // }}}
-    // {{{ constructor
+    var $output;
     /**
      * PEAR_Command_Package constructor.
+     *
      * @access public
      */
-    function PEAR_Command_Package(&$ui, &$config)
+    function __construct(&$ui, &$config)
+    {
-        parent::PEAR_Command_Common($ui, $config);
-    }
-    // }}}
         parent::__construct($ui, $config);
     // {{{ _displayValidationResults()
     function _displayValidationResults($err, $warn, $strict = false)
+    {
         foreach ($err as $e) {
             $this->output .= "Error: $e\n";
+        }
         foreach ($warn as $w) {
             $this->output .= "Warning: $w\n";
         }
         $this->output .= sprintf('Validation: %d error(s), %d warning(s)'."\n",
                                        sizeof($err), sizeof($warn));
-        if ($strict && sizeof($err) > 0) {
+        if ($strict && count($err) > 0) {
             $this->output .= "Fix these errors and try again.";
             return false;
-        }
         return true;
         return true;
+    }
     // }}}
     function &getPackager()
     {
         if (!class_exists('PEAR_Packager')) {
             require_once 'PEAR/Packager.php';
         }
-        $a = &new PEAR_Packager;
+        $a = new PEAR_Packager;
         return $a;
+    }
-    function &getPackageFile($config, $debug = false, $tmpdir = null)
+    function &getPackageFile($config, $debug = false)
+    {
         if (!class_exists('PEAR_Common')) {
             require_once 'PEAR/Common.php';
+        }
-        if (!class_exists('PEAR/PackageFile.php')) {
+        if (!class_exists('PEAR_PackageFile')) {
             require_once 'PEAR/PackageFile.php';
+        }
-        $a = &new PEAR_PackageFile($config, $debug, $tmpdir);
+        $a = new PEAR_PackageFile($config, $debug);
-        $common = new PEAR_Common;
-        $common->ui = $this->ui;
+        $common = new PEAR_Common;
-        $a->setLogger($common);
+        $common->ui = $this->ui;
-        return $a;
+        $a->setLogger($common);
         return $a;
     // {{{ doPackage()
-    function doPackage($command, $options, $params)
-    {
+    function doPackage($command, $options, $params)
-        $this->output = '';
         $pkginfofile = isset($params[0]) ? $params[0] : 'package.xml';
+        $this->output = '';
-        $pkg2 = isset($params[1]) ? $params[1] : null;
+        $pkginfofile = isset($params[0]) ? $params[0] : 'package.xml';
-        if (!$pkg2 && !isset($params[0])) {
+        $pkg2 = isset($params[1]) ? $params[1] : null;
-            if (file_exists('package2.xml')) {
+        if (!$pkg2 && !isset($params[0]) && file_exists('package2.xml')) {
-                $pkg2 = 'package2.xml';
+            $pkg2 = 'package2.xml';
+        }
+        $packager = &$this->getPackager();
-        $packager = &$this->getPackager();
+        $compress = empty($options['nocompress']) ? true : false;
-        $compress = empty($options['nocompress']) ? true : false;
+        $result   = $packager->package($pkginfofile, $compress, $pkg2);
-        $result = $packager->package($pkginfofile, $compress, $pkg2);
+        if (PEAR::isError($result)) {
-        if (PEAR::isError($result)) {
+            return $this->raiseError($result);
+        }
             return $this->raiseError($result);
         // Don't want output, only the package file name just created
-        // Don't want output, only the package file name just created
+        if (isset($options['showname'])) {
+            $this->output = $result;
         if (isset($options['showname'])) {
             $this->output = $result;
-        }
-        if ($this->output) {
-            $this->ui->outputData($this->output, $command);
         if ($this->output) {
-        return true;
+            $this->ui->outputData($this->output, $command);
+        }
-    // }}}
+        return true;
     // {{{ doPackageValidate()
     function doPackageValidate($command, $options, $params)
     function doPackageValidate($command, $options, $params)
         $this->output = '';
-        $this->output = '';
+        if (count($params) < 1) {
-        if (sizeof($params) < 1) {
+            $params[0] = 'package.xml';
             $params[0] = "package.xml";
         $obj = &$this->getPackageFile($this->config, $this->_debug);
         $obj->rawReturn();
         PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
         $info = $obj->fromTgzFile($params[0], PEAR_VALIDATE_NORMAL);
         if (PEAR::isError($info)) {
             $info = $obj->fromPackageFile($params[0], PEAR_VALIDATE_NORMAL);
         } else {
+            $archive = $info->getArchiveFile();
-            $archive = $info->getArchiveFile();
+            $tar = new Archive_Tar($archive);
-            $tar = &new Archive_Tar($archive);
+            $tar->extract(dirname($info->getPackageFile()));
-            $tar->extract(dirname($info->getPackageFile()));
+            $info->setPackageFile(dirname($info->getPackageFile()) . DIRECTORY_SEPARATOR .
-            $info->setPackageFile(dirname($info->getPackageFile()) . DIRECTORY_SEPARATOR .
+                $info->getPackage() . '-' . $info->getVersion() . DIRECTORY_SEPARATOR .
+                basename($info->getPackageFile()));
                 $info->getPackage() . '-' . $info->getVersion() . DIRECTORY_SEPARATOR .
                 basename($info->getPackageFile()));
         PEAR::staticPopErrorHandling();
-        PEAR::staticPopErrorHandling();
+        if (PEAR::isError($info)) {
-        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
             return $this->raiseError($info);
         $valid = false;
         if ($info->getPackagexmlVersion() == '2.0') {
-            if ($valid = $info->validate(PEAR_VALIDATE_NORMAL)) {
+            if ($valid = $info->validate(PEAR_VALIDATE_NORMAL)) {
                 $info->flattenFileList();
                 $valid = $info->validate(PEAR_VALIDATE_PACKAGING);
             }
         } else {
             $valid = $info->validate(PEAR_VALIDATE_PACKAGING);
+        }
         $err = array();
-        $warn = array();
+        $err = $warn = array();
-        if (!$valid) {
+        if ($errors = $info->getValidationWarnings()) {
-            foreach ($info->getValidationWarnings() as $error) {
+            foreach ($errors as $error) {
+                if ($error['level'] == 'warning') {
-                if ($error['level'] == 'warning') {
+                    $warn[] = $error['message'];
-                    $warn[] = $error['message'];
+                } else {
-                } else {
+                    $err[] = $error['message'];
                     $err[] = $error['message'];
+            }
+        }
+        $this->_displayValidationResults($err, $warn);
+        $this->ui->outputData($this->output, $command);
+        return true;
+    }
+    function doSvnTag($command, $options, $params)
+    {
+        $this->output = '';
+        $_cmd = $command;
+        if (count($params) < 1) {
+            $help = $this->getHelp($command);
+            return $this->raiseError("$command: missing parameter: $help[0]");
+        }
+        $packageFile = realpath($params[0]);
+        $dir = dirname($packageFile);
+        $dir = substr($dir, strrpos($dir, DIRECTORY_SEPARATOR) + 1);
+        $obj  = &$this->getPackageFile($this->config, $this->_debug);
+        $info = $obj->fromAnyFile($packageFile, PEAR_VALIDATE_NORMAL);
+        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
+        }
+        $err = $warn = array();
+        if (!$info->validate()) {
+            foreach ($info->getValidationWarnings() as $error) {
+                if ($error['level'] == 'warning') {
+                    $warn[] = $error['message'];
+                } else {
+                    $err[] = $error['message'];
+                }
+            }
+        }
+        if (!$this->_displayValidationResults($err, $warn, true)) {
+            $this->ui->outputData($this->output, $command);
+            return $this->raiseError('SVN tag failed');
+        }
+        $version    = $info->getVersion();
+        $package    = $info->getName();
+        $svntag     = "$package-$version";
+        if (isset($options['delete'])) {
+            return $this->_svnRemoveTag($version, $package, $svntag, $packageFile, $options);
+        }
+        $path = $this->_svnFindPath($packageFile);
+        // Check if there are any modified files
+        $fp = popen('svn st --xml ' . dirname($packageFile), "r");
+        $out = '';
+        while ($line = fgets($fp, 1024)) {
+            $out .= rtrim($line)."\n";
+        }
+        pclose($fp);
+        if (!isset($options['quiet']) && strpos($out, 'item="modified"')) {
+            $params = array(array(
+                'name' => 'modified',
+                'type' => 'yesno',
+                'default' => 'no',
+                'prompt' => 'You have files in your SVN checkout (' . $path['from']  . ') that have been modified but not committed, do you still want to tag ' . $version . '?',
+            ));
+            $answers = $this->ui->confirmDialog($params);
-                }
+            if (!in_array($answers['modified'], array('y', 'yes', 'on', '1'))) {
+                return true;
+            }
+        }
+        if (isset($options['slide'])) {
-            }
+            $this->_svnRemoveTag($version, $package, $svntag, $packageFile, $options);
+        }
+        // Check if tag already exists
+        $releaseTag = $path['local']['base'] . 'tags' . DIRECTORY_SEPARATOR . $svntag;
+        $existsCommand = 'svn ls ' . $path['base'] . 'tags/';
+        $fp = popen($existsCommand, "r");
+        $out = '';
+        while ($line = fgets($fp, 1024)) {
+            $out .= rtrim($line)."\n";
+        }
+        pclose($fp);
+        if (in_array($svntag . DIRECTORY_SEPARATOR, explode("\n", $out))) {
+            $this->ui->outputData($this->output, $command);
+            return $this->raiseError('SVN tag ' . $svntag . ' for ' . $package . ' already exists.');
+        } elseif (file_exists($path['local']['base'] . 'tags') === false) {
+            return $this->raiseError('Can not locate the tags directory at ' . $path['local']['base'] . 'tags');
+        } elseif (is_writeable($path['local']['base'] . 'tags') === false) {
+            return $this->raiseError('Can not write to the tag directory at ' . $path['local']['base'] . 'tags');
+        } else {
+            $makeCommand = 'svn mkdir ' . $releaseTag;
+            $this->output .= "+ $makeCommand\n";
+            if (empty($options['dry-run'])) {
+                // We need to create the tag dir.
+                $fp = popen($makeCommand, "r");
+                $out = '';
+                while ($line = fgets($fp, 1024)) {
+                    $out .= rtrim($line)."\n";
+                }
+                pclose($fp);
+                $this->output .= "$out\n";
+            }
+        }
+        $command = 'svn';
+        if (isset($options['quiet'])) {
+            $command .= ' -q';
+        }
+        $command .= ' copy --parents ';
+        $dir   = dirname($packageFile);
+        $dir   = substr($dir, strrpos($dir, DIRECTORY_SEPARATOR) + 1);
+        $files = array_keys($info->getFilelist());
+        if (!in_array(basename($packageFile), $files)) {
+            $files[] = basename($packageFile);
+        }
+        array_shift($params);
+        if (count($params)) {
+            // add in additional files to be tagged (package files and such)
+            $files = array_merge($files, $params);
+        }
+        $commands = array();
+        foreach ($files as $file) {
+            if (!file_exists($file)) {
+                $file = $dir . DIRECTORY_SEPARATOR . $file;
+            }
+            $commands[] = $command . ' ' . escapeshellarg($file) . ' ' .
+                          escapeshellarg($releaseTag . DIRECTORY_SEPARATOR . $file);
+        }
+        $this->output .= implode("\n", $commands) . "\n";
+        if (empty($options['dry-run'])) {
+            foreach ($commands as $command) {
+                $fp = popen($command, "r");
+                while ($line = fgets($fp, 1024)) {
+                    $this->output .= rtrim($line)."\n";
+                }
+                pclose($fp);
+            }
+        }
+        $command = 'svn ci -m "Tagging the ' . $version  . ' release" ' . $releaseTag . "\n";
+        $this->output .= "+ $command\n";
+        if (empty($options['dry-run'])) {
+            $fp = popen($command, "r");
+            while ($line = fgets($fp, 1024)) {
+                $this->output .= rtrim($line)."\n";
+            }
+            pclose($fp);
+        }
+        $this->ui->outputData($this->output, $_cmd);
+        return true;
+    }
+    function _svnFindPath($file)
+    {
+        $xml = '';
+        $command = "svn info --xml $file";
+        $fp = popen($command, "r");
+        while ($line = fgets($fp, 1024)) {
+            $xml .= rtrim($line)."\n";
+        }
+        pclose($fp);
+        $url_tag = strpos($xml, '<url>');
+        $url = substr($xml, $url_tag + 5, strpos($xml, '</url>', $url_tag + 5) - ($url_tag + 5));
+        $path = array();
+        $path['from'] = substr($url, 0, strrpos($url, '/'));
+        $path['base'] = substr($path['from'], 0, strrpos($path['from'], '/') + 1);
+        // Figure out the local paths - see http://pear.php.net/bugs/17463
+        $pos = strpos($file, DIRECTORY_SEPARATOR . 'trunk' . DIRECTORY_SEPARATOR);
+        if ($pos === false) {
+            $pos = strpos($file, DIRECTORY_SEPARATOR . 'branches' . DIRECTORY_SEPARATOR);
+        }
+        $path['local']['base'] = substr($file, 0, $pos + 1);
+        return $path;
+    }
+    function _svnRemoveTag($version, $package, $tag, $packageFile, $options)
+    {
+        $command = 'svn';
+        if (isset($options['quiet'])) {
+            $command .= ' -q';
+        }
+        $command .= ' remove';
+        $command .= ' -m "Removing tag for the ' . $version  . ' release."';
+        $path = $this->_svnFindPath($packageFile);
+        $command .= ' ' . $path['base'] . 'tags/' . $tag;
+        if ($this->config->get('verbose') > 1) {
+            $this->output .= "+ $command\n";
+        }
+        $this->output .= "+ $command\n";
+        if (empty($options['dry-run'])) {
+            $fp = popen($command, "r");
+            while ($line = fgets($fp, 1024)) {
                 $this->output .= rtrim($line)."\n";
         $this->_displayValidationResults($err, $warn);
-        $this->ui->outputData($this->output, $command);
+            pclose($fp);
         return true;
-    }
         $this->ui->outputData($this->output, $command);
-    // }}}
+        return true;
     // {{{ doCvsTag()
+    function doCvsTag($command, $options, $params)
+    {
-    function doCvsTag($command, $options, $params)
+        $this->output = '';
         $_cmd = $command;
-        $this->output = '';
+        if (count($params) < 1) {
-        $_cmd = $command;
+            $help = $this->getHelp($command);
+            return $this->raiseError("$command: missing parameter: $help[0]");
         if (sizeof($params) < 1) {
             $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
+        $packageFile = realpath($params[0]);
         $obj  = &$this->getPackageFile($this->config, $this->_debug);
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
+        $info = $obj->fromAnyFile($packageFile, PEAR_VALIDATE_NORMAL);
-        $info = $obj->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
+        if (PEAR::isError($info)) {
-        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
             return $this->raiseError($info);
         $err = $warn = array();
+        if (!$info->validate()) {
-        if (!$info->validate()) {
+            foreach ($info->getValidationWarnings() as $error) {
-            foreach ($info->getValidationWarnings() as $error) {
+                if ($error['level'] == 'warning') {
-                if ($error['level'] == 'warning') {
+                    $warn[] = $error['message'];
-                    $warn[] = $error['message'];
+                } else {
+                    $err[] = $error['message'];
-                } else {
+                }
                     $err[] = $error['message'];
-                }
+        }
-            }
-        }
+        if (!$this->_displayValidationResults($err, $warn, true)) {
-        if (!$this->_displayValidationResults($err, $warn, true)) {
+            $this->ui->outputData($this->output, $command);
-            $this->ui->outputData($this->output, $command);
+            return $this->raiseError('CVS tag failed');
             return $this->raiseError('CVS tag failed');
         $version    = $info->getVersion();
-        $version = $info->getVersion();
+        $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $version);
-        $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $version);
+        $cvstag     = "RELEASE_$cvsversion";
+        $files      = array_keys($info->getFilelist());
-        $cvstag = "RELEASE_$cvsversion";
+        $command = 'cvs';
-        $files = array_keys($info->getFilelist());
+        if (isset($options['quiet'])) {
-        $command = "cvs";
+            $command .= ' -q';
         if (isset($options['quiet'])) {
-            $command .= ' -q';
+        if (isset($options['reallyquiet'])) {
             $command .= ' -Q';
         if (isset($options['reallyquiet'])) {
-            $command .= ' -Q';
+        $command .= ' tag';
         if (isset($options['slide'])) {
-        $command .= ' tag';
+            $command .= ' -F';
         if (isset($options['slide'])) {
             $command .= ' -F';
         if (isset($options['delete'])) {
+            $command .= ' -d';
+        }
-        if (isset($options['delete'])) {
+        $command .= ' ' . $cvstag . ' ' . escapeshellarg($params[0]);
+        array_shift($params);
+        if (count($params)) {
+            // add in additional files to be tagged
-            $command .= ' -d';
+            $files = array_merge($files, $params);
+        }
-        $command .= ' ' . $cvstag . ' ' . escapeshellarg($params[0]);
+        $dir = dirname($packageFile);
-        array_shift($params);
+        $dir = substr($dir, strrpos($dir, '/') + 1);
-        if (count($params)) {
+        foreach ($files as $file) {
+            if (!file_exists($file)) {
-            // add in additional files to be tagged
+                $file = $dir . DIRECTORY_SEPARATOR . $file;
             $files = array_merge($files, $params);
             $command .= ' ' . escapeshellarg($file);
         foreach ($files as $file) {
             $command .= ' ' . escapeshellarg($file);
         if ($this->config->get('verbose') > 1) {
-        if ($this->config->get('verbose') > 1) {
+            $this->output .= "+ $command\n";
             $this->output .= "+ $command\n";
         $this->output .= "+ $command\n";
-        $this->output .= "+ $command\n";
+        if (empty($options['dry-run'])) {
-        if (empty($options['dry-run'])) {
+            $fp = popen($command, "r");
-            $fp = popen($command, "r");
-            while ($line = fgets($fp, 1024)) {
-                $this->output .= rtrim($line)."\n";
             while ($line = fgets($fp, 1024)) {
-            pclose($fp);
+                $this->output .= rtrim($line)."\n";
+            }
-        $this->ui->outputData($this->output, $_cmd);
+            pclose($fp);
         return true;
         $this->ui->outputData($this->output, $_cmd);
+        return true;
+    }
-    // }}}
-    // {{{ doCvsDiff()
+    function doCvsDiff($command, $options, $params)
+    {
-    function doCvsDiff($command, $options, $params)
+        $this->output = '';
         if (sizeof($params) < 1) {
+            $help = $this->getHelp($command);
-        $this->output = '';
+            return $this->raiseError("$command: missing parameter: $help[0]");
         if (sizeof($params) < 1) {
             $help = $this->getHelp($command);
-            return $this->raiseError("$command: missing parameter: $help[0]");
+        $file = realpath($params[0]);
         $obj  = &$this->getPackageFile($this->config, $this->_debug);
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
+        $info = $obj->fromAnyFile($file, PEAR_VALIDATE_NORMAL);
-        $info = $obj->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
+        if (PEAR::isError($info)) {
-        if (PEAR::isError($info)) {
+            return $this->raiseError($info);
             return $this->raiseError($info);
+        $err = $warn = array();
-        $err = $warn = array();
+        if (!$info->validate()) {
-        if (!$info->validate()) {
+            foreach ($info->getValidationWarnings() as $error) {
-            foreach ($info->getValidationWarnings() as $error) {
+                if ($error['level'] == 'warning') {
-                if ($error['level'] == 'warning') {
+                    $warn[] = $error['message'];
+                } else {
-                    $warn[] = $error['message'];
+                    $err[] = $error['message'];
                 } else {
                     $err[] = $error['message'];
+        }
         if (!$this->_displayValidationResults($err, $warn, true)) {
-        if (!$this->_displayValidationResults($err, $warn, true)) {
+            $this->ui->outputData($this->output, $command);
+            return $this->raiseError('CVS diff failed');
             $this->ui->outputData($this->output, $command);
             return $this->raiseError('CVS diff failed');
         $info1 = $info->getFilelist();
-        $info1 = $info->getFilelist();
+        $files = $info1;
+        $cmd = "cvs";
-        $files = $info1;
+        if (isset($options['quiet'])) {
-        $cmd = "cvs";
+            $cmd .= ' -q';
-        if (isset($options['quiet'])) {
+            unset($options['quiet']);
             $cmd .= ' -q';
             unset($options['quiet']);
         if (isset($options['reallyquiet'])) {
+            $cmd .= ' -Q';
-        if (isset($options['reallyquiet'])) {
+            unset($options['reallyquiet']);
             $cmd .= ' -Q';
             unset($options['reallyquiet']);
         if (isset($options['release'])) {
-        if (isset($options['release'])) {
+            $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $options['release']);
+            $cvstag = "RELEASE_$cvsversion";
-            $cvsversion = preg_replace('/[^a-z0-9]/i', '_', $options['release']);
+            $options['revision'] = $cvstag;
-            $cvstag = "RELEASE_$cvsversion";
+            unset($options['release']);
             $options['revision'] = $cvstag;
             unset($options['release']);
         $execute = true;
             $cmd .= $short ? " -$short" : " --$option";
             if ($arg && $optarg) {
                 $cmd .= ($short ? '' : '=') . escapeshellarg($optarg);
+            }
+        }
         foreach ($files as $file) {
             $cmd .= ' ' . escapeshellarg($file['name']);
+        }
         if ($this->config->get('verbose') > 1) {
             $this->output .= "+ $cmd\n";
+        }
         if ($execute) {
             $fp = popen($cmd, "r");
             while ($line = fgets($fp, 1024)) {
                 $this->output .= rtrim($line)."\n";
+            }
             pclose($fp);
+        }
         $this->ui->outputData($this->output, $command);
         return true;
+    }
-    // }}}
-    // {{{ doPackageDependencies()
     function doPackageDependencies($command, $options, $params)
+    {
         // $params[0] -> the PEAR package to list its information
-        if (sizeof($params) != 1) {
+        if (count($params) !== 1) {
             return $this->raiseError("bad parameter(s), try \"help $command\"");
+        }
+        $obj = &$this->getPackageFile($this->config, $this->_debug);
-        $obj = &$this->getPackageFile($this->config, $this->_debug);
+        if (is_file($params[0]) || strpos($params[0], '.xml') > 0) {
+           $info = $obj->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
+        } else {
+            $reg  = $this->config->getRegistry();
+            $info = $obj->fromArray($reg->packageInfo($params[0]));
+        }
         $info = $obj->fromAnyFile($params[0], PEAR_VALIDATE_NORMAL);
         if (PEAR::isError($info)) {
             return $this->raiseError($info);
+        }
         $deps = $info->getDeps();
         if (is_array($deps)) {
             if ($info->getPackagexmlVersion() == '1.0') {
                 $data = array(
                             $req = 'Yes';
+                        }
                     } else {
                         $req = 'Yes';
+                    }
                     if (isset($this->_deps_rel_trans[$d['rel']])) {
                         $rel = $this->_deps_rel_trans[$d['rel']];
                     } else {
                         $rel = $d['rel'];
+                    }
                         'border' => true,
                         'headline' => array("Required?", "Type", "Name", 'Versioning', 'Group'),
                         );
                     foreach ($deps as $type => $subd) {
                         $req = ($type == 'required') ? 'Yes' : 'No';
-                        if ($type == 'group') {
+                        if ($type == 'group' && isset($subd['attribs']['name'])) {
                             $group = $subd['attribs']['name'];
                         } else {
                             $group = '';
+                        }
                         if (!isset($subd[0])) {
                             $subd = array($subd);
+                        }
                         foreach ($subd as $groupa) {
                             foreach ($groupa as $deptype => $depinfo) {
                                 if ($deptype == 'attribs') {
                                     continue;
+                                }
                                 if ($deptype == 'pearinstaller') {
                                     $deptype = 'pear Installer';
+                                }
                                 if (!isset($depinfo[0])) {
                                     $depinfo = array($depinfo);
+                                }
                                 foreach ($depinfo as $inf) {
                                     $name = '';
                                     if (isset($inf['channel'])) {
                                         $alias = $reg->channelAlias($inf['channel']);
                                         if (!$alias) {
                                             $alias = '(channel?) ' .$inf['channel'];
+                                        }
                                         $name = $alias . '/';
+                                    }
                                     if (isset($inf['name'])) {
                                         $name .= $inf['name'];
                                     } elseif (isset($inf['pattern'])) {
                                         $name .= $inf['pattern'];
                                     } else {
                                         $name .= '';
+                                    }
                                     if (isset($inf['uri'])) {
                                         $name .= ' [' . $inf['uri'] .  ']';
+                                    }
                                     if (isset($inf['conflicts'])) {
                                         $ver = 'conflicts';
                                     } else {
                                         $ver = $d->_getExtraString($inf);
+                                    }
                                     $data['data'][] = array($req, ucfirst($deptype), $name,
                                         $ver, $group);
+                                }
+                            }
+                        }
         // Fallback
         $this->ui->outputData("This package does not have any dependencies.", $command);
-    }
-    // }}}
     // {{{ doSign()
-    function doSign($command, $options, $params)
-    {
-        require_once 'System.php';
+    function doSign($command, $options, $params)
         require_once 'Archive/Tar.php';
         // should move most of this code into PEAR_Packager
         // so it'll be easy to implement "pear package --sign"
-        if (sizeof($params) != 1) {
+        if (count($params) !== 1) {
+            return $this->raiseError("bad parameter(s), try \"help $command\"");
+        }
+        require_once 'System.php';
-            return $this->raiseError("bad parameter(s), try \"help $command\"");
+        require_once 'Archive/Tar.php';
         if (!file_exists($params[0])) {
+            return $this->raiseError("file does not exist: $params[0]");
             return $this->raiseError("file does not exist: $params[0]");
         $obj = $this->getPackageFile($this->config, $this->_debug);
         $info = $obj->fromTgzFile($params[0], PEAR_VALIDATE_NORMAL);
         if (PEAR::isError($info)) {
+            return $this->raiseError($info);
             return $this->raiseError($info);
-        }
+        $tar = new Archive_Tar($params[0]);
-        $tar = new Archive_Tar($params[0]);
-        $tmpdir = System::mktemp('-d pearsign');
+        $tmpdir = $this->config->get('temp_dir');
-        if (!$tar->extractList('package2.xml package.sig', $tmpdir)) {
+        $tmpdir = System::mktemp(' -t "' . $tmpdir . '" -d pearsign');
-            if (!$tar->extractList('package.xml package.sig', $tmpdir)) {
-                return $this->raiseError("failed to extract tar file");
+        if (!$tar->extractList('package2.xml package.xml package.sig', $tmpdir)) {
+            return $this->raiseError("failed to extract tar file");
+        }
         if (file_exists("$tmpdir/package.sig")) {
+            return $this->raiseError("package already signed");
             return $this->raiseError("package already signed");
         $packagexml = 'package.xml';
         if (file_exists("$tmpdir/package2.xml")) {
+            $packagexml = 'package2.xml';
             $packagexml = 'package2.xml';
         if (file_exists("$tmpdir/package.sig")) {
+            unlink("$tmpdir/package.sig");
+        }
+        if (!file_exists("$tmpdir/$packagexml")) {
+            return $this->raiseError("Extracted file $tmpdir/$packagexml not found.");
             unlink("$tmpdir/package.sig");
         $input = $this->ui->userDialog($command,
+                                       array('GnuPG Passphrase'),
+                                       array('password'));
+        if (!isset($input[0])) {
+            //use empty passphrase
+            $input[0] = '';
+        }
-                                       array('GnuPG Passphrase'),
-                                       array('password'));
+        $devnull = (isset($options['verbose'])) ? '' : ' 2>/dev/null';
-        $gpg = popen("gpg --batch --passphrase-fd 0 --armor --detach-sign --output $tmpdir/package.sig $tmpdir/$packagexml 2>/dev/null", "w");
+        $gpg = popen("gpg --batch --passphrase-fd 0 --armor --detach-sign --output $tmpdir/package.sig $tmpdir/$packagexml" . $devnull, "w");
         if (!$gpg) {
+            return $this->raiseError("gpg command failed");
             return $this->raiseError("gpg command failed");
         fwrite($gpg, "$input[0]\n");
         if (pclose($gpg) || !file_exists("$tmpdir/package.sig")) {
+            return $this->raiseError("gpg sign failed");
-            return $this->raiseError("gpg sign failed");
+        }
+        if (!$tar->addModify("$tmpdir/package.sig", '', $tmpdir)) {
+            return $this->raiseError('failed adding signature to file');
+        }
-        $tar->addModify("$tmpdir/package.sig", '', $tmpdir);
+        $this->ui->outputData("Package signed.", $command);
-        return true;
-    }
         return true;
     // }}}
     /**
      * For unit testing purposes
      */
     function &getInstaller(&$ui)
+    {
         if (!class_exists('PEAR_Installer')) {
             require_once 'PEAR/Installer.php';
+        }
-        $a = &new PEAR_Installer($ui);
+        $a = new PEAR_Installer($ui);
         return $a;
+    }
     /**
      * For unit testing purposes
             if ($fp = @fopen('PEAR/Command/Packaging.php', 'r', true)) {
                 fclose($fp);
                 include_once 'PEAR/Command/Packaging.php';
+            }
+        }
         if (class_exists('PEAR_Command_Packaging')) {
-            $a = &new PEAR_Command_Packaging($ui, $config);
+            $a = new PEAR_Command_Packaging($ui, $config);
         } else {
             $a = null;
+        }
         return $a;
+    }
-    // {{{ doMakeRPM()
     function doMakeRPM($command, $options, $params)
+    {
         $packaging_cmd = $this->getCommandPackaging($this->ui, $this->config);
         if ($packaging_cmd !== null) {
             $this->ui->outputData('PEAR_Command_Packaging is installed; using '.
                 'newer "make-rpm-spec" command instead');
             return $packaging_cmd->run('make-rpm-spec', $options, $params);
-        } else {
-            $this->ui->outputData('WARNING: "pear makerpm" is no longer available; an '.
-              'improved version is available via "pear make-rpm-spec", which '.
-              'is available by installing PEAR_Command_Packaging');
+        }
+        $this->ui->outputData('WARNING: "pear makerpm" is no longer available; an '.
+          'improved version is available via "pear make-rpm-spec", which '.
+          'is available by installing PEAR_Command_Packaging');
         return true;
+    }
     function doConvert($command, $options, $params)
     {
-        $packagexml = isset($params[0]) ? $params[0] : 'package.xml';
+        $packagexml    = isset($params[0]) ? $params[0] : 'package.xml';
         $newpackagexml = isset($params[1]) ? $params[1] : dirname($packagexml) .
             DIRECTORY_SEPARATOR . 'package2.xml';
         $pkg = &$this->getPackageFile($this->config, $this->_debug);
         PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
         $pf = $pkg->fromPackageFile($packagexml, PEAR_VALIDATE_NORMAL);
         PEAR::staticPopErrorHandling();
-        if (!PEAR::isError($pf)) {
-            if (is_a($pf, 'PEAR_PackageFile_v2')) {
-                $this->ui->outputData($packagexml . ' is already a package.xml version 2.0');
-                return true;
-            }
-            $gen = &$pf->getDefaultGenerator();
-            $newpf = &$gen->toV2();
-            $newpf->setPackagefile($newpackagexml);
-            $gen = &$newpf->getDefaultGenerator();
-            PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
-            $state = (isset($options['flat']) ? PEAR_VALIDATE_PACKAGING : PEAR_VALIDATE_NORMAL);
-            $saved = $gen->toPackageFile(dirname($newpackagexml), $state,
-                basename($newpackagexml));
-            PEAR::staticPopErrorHandling();
-            if (PEAR::isError($saved)) {
-                if (is_array($saved->getUserInfo())) {
-                    foreach ($saved->getUserInfo() as $warning) {
-                        $this->ui->outputData($warning['message']);
-                    }
-                }
-                $this->ui->outputData($saved->getMessage());
-                return true;
-            }
-            $this->ui->outputData('Wrote new version 2.0 package.xml to "' . $saved . '"');
-            return true;
-        } else {
+        if (PEAR::isError($pf)) {
             if (is_array($pf->getUserInfo())) {
                 foreach ($pf->getUserInfo() as $warning) {
                     $this->ui->outputData($warning['message']);
+                }
+            }
             return $this->raiseError($pf);
-        }
+        }
+        if (is_a($pf, 'PEAR_PackageFile_v2')) {
-    }
+            $this->ui->outputData($packagexml . ' is already a package.xml version 2.0');
+            return true;
+        }
+        $gen   = &$pf->getDefaultGenerator();
+        $newpf = &$gen->toV2();
+        $newpf->setPackagefile($newpackagexml);
+        $gen = &$newpf->getDefaultGenerator();
+        PEAR::staticPushErrorHandling(PEAR_ERROR_RETURN);
+        $state = (isset($options['flat']) ? PEAR_VALIDATE_PACKAGING : PEAR_VALIDATE_NORMAL);
+        $saved = $gen->toPackageFile(dirname($newpackagexml), $state, basename($newpackagexml));
+        PEAR::staticPopErrorHandling();
+        if (PEAR::isError($saved)) {
+            if (is_array($saved->getUserInfo())) {
+                foreach ($saved->getUserInfo() as $warning) {
+                    $this->ui->outputData($warning['message']);
+                }
+            }
+            $this->ui->outputData($saved->getMessage());
+            return true;
+        }
-    // }}}
+        $this->ui->outputData('Wrote new version 2.0 package.xml to "' . $saved . '"');

Subversion Repositories Applications.gtt

(root)/trunk/bibliotheque/pear/PEAR/Command/Package.php – Rev 94 → 187