support git clones and (PECL) package archives as sources
authorMichael Wallner <mike@php.net>
Sat, 21 Mar 2015 19:37:16 +0000 (20:37 +0100)
committerMichael Wallner <mike@php.net>
Sat, 21 Mar 2015 19:37:16 +0000 (20:37 +0100)
bin/pharext
src/pharext/Cli/Command.php
src/pharext/Installer.php
src/pharext/Packager.php
src/pharext/Tempfile.php

index 75084747467458d4e9934f105792dd0c8494cbdb..79478198dd95ae29458a0a89bd69ed145bd26e2d 100755 (executable)
Binary files a/bin/pharext and b/bin/pharext differ
index 0ec52fffea07b06b829ee4e3ccffd68a651c8a98..706cb850efd29c58510fc3d7916f43f4c7689fb4 100644 (file)
@@ -163,4 +163,74 @@ trait Command
                        $this->error(null);
                }
        }
+
+       /**
+        * Execute a program with escalated privileges handling interactive password prompt
+        * @param string $command
+        * @param string $output
+        * @return int
+        */
+       private function sudo($command, &$output) {
+               if (!($proc = proc_open($command, [STDIN,["pipe","w"],["pipe","w"]], $pipes))) {
+                       return -1;
+               }
+               $stdout = $pipes[1];
+               $passwd = 0;
+               while (!feof($stdout)) {
+                       $R = [$stdout]; $W = []; $E = [];
+                       if (!stream_select($R, $W, $E, null)) {
+                               continue;
+                       }
+                       $data = fread($stdout, 0x1000);
+                       /* only check a few times */
+                       if ($passwd++ < 10) {
+                               if (stristr($data, "password")) {
+                                       printf("\n%s", $data);
+                               }
+                       }
+                       $output .= $data;
+               }
+               return proc_close($proc);
+       }
+
+       /**
+        * Execute a system command
+        * @param string $name pretty name
+        * @param string $command command
+        * @param array $args command arguments
+        * @param bool $sudo whether the command may need escalated privileges
+        */
+       private function exec($name, $command, array $args = null, $sudo = false) {
+               $exec = escapeshellcmd($command);
+               if ($args) {
+                       $exec .= " ". implode(" ", array_map("escapeshellarg", (array) $args));
+               }
+
+               if ($this->args->verbose) {
+                       $this->info("Running %s ...\n", $exec);
+               } else {
+                       $this->info("Running %s ... ", $name);
+               }
+
+               if ($sudo && isset($this->args->sudo)) {
+                       $retval = $this->sudo(sprintf($this->args->sudo." 2>&1", $exec), $output);
+               } elseif ($this->args->verbose) {
+                       passthru($exec ." 2>&1", $retval);
+               } else {
+                       exec($exec ." 2>&1", $output, $retval);
+                       $output = implode("\n", $output);
+               }
+
+               if ($retval) {
+                       $this->error("Command %s failed with (%s)\n", $command, $retval);
+                       if (isset($output) && !$this->args->quiet) {
+                               printf("%s\n", $output);
+                       }
+                       exit(2);
+               }
+               if (!$this->args->verbose) {
+                       // we already have a bunch of output
+                       $this->info("OK\n");
+               }
+       }
 }
index 4caebc0de6f4b251004b9d5e931102f957a138b2..5e86f3189f4c74fa1d7825164ed6c50cf3b54714 100644 (file)
@@ -186,75 +186,6 @@ class Installer implements Command
                }
        }
 
-       /**
-        * Execute a program with escalated privileges handling interactive password prompt
-        * @param string $command
-        * @param string $output
-        * @return int
-        */
-       private function sudo($command, &$output) {
-               if (!($proc = proc_open($command, [STDIN,["pipe","w"],["pipe","w"]], $pipes))) {
-                       return -1;
-               }
-               $stdout = $pipes[1];
-               $passwd = 0;
-               while (!feof($stdout)) {
-                       $R = [$stdout]; $W = []; $E = [];
-                       if (!stream_select($R, $W, $E, null)) {
-                               continue;
-                       }
-                       $data = fread($stdout, 0x1000);
-                       /* only check a few times */
-                       if ($passwd++ < 10) {
-                               if (stristr($data, "password")) {
-                                       printf("\n%s", $data);
-                               }
-                       }
-                       $output .= $data;
-               }
-               return proc_close($proc);
-       }
-       /**
-        * Execute a system command
-        * @param string $name pretty name
-        * @param string $command command
-        * @param array $args command arguments
-        * @param bool $sudo whether the command may need escalated privileges
-        */
-       private function exec($name, $command, array $args = null, $sudo = false) {
-               $exec = escapeshellcmd($command);
-               if ($args) {
-                       $exec .= " ". implode(" ", array_map("escapeshellarg", (array) $args));
-               }
-
-               if ($this->args->verbose) {
-                       $this->info("Running %s ...\n", $exec);
-               } else {
-                       $this->info("Running %s ... ", $name);
-               }
-
-               if ($sudo && isset($this->args->sudo)) {
-                       $retval = $this->sudo(sprintf($this->args->sudo." 2>&1", $exec), $output);
-               } elseif ($this->args->verbose) {
-                       passthru($exec ." 2>&1", $retval);
-               } else {
-                       exec($exec ." 2>&1", $output, $retval);
-                       $output = implode("\n", $output);
-               }
-
-               if ($retval) {
-                       $this->error("Command %s failed with (%s)\n", $command, $retval);
-                       if (isset($output) && !$this->args->quiet) {
-                               printf("%s\n", $output);
-                       }
-                       exit(2);
-               }
-               if (!$this->args->verbose) {
-                       // we already have a bunch of output
-                       $this->info("OK\n");
-               }
-       }
-       
        /**
         * Construct a command from prefix common-name and suffix
         * @param type $suffix
index 4d432ed5bc7edbe81679667e6cd46f0c1ea49985..33aa72e1f4e839665b68b1d3346a54dd7a8d4b84 100644 (file)
@@ -3,6 +3,7 @@
 namespace pharext;
 
 use Phar;
+use PharData;
 use pharext\Cli\Args as CliArgs;
 use pharext\Cli\Command as CliCommand;
 
@@ -19,6 +20,12 @@ class Packager implements Command
         */
        private $source;
        
+       /**
+        * Cleanups
+        * @var array
+        */
+       private $cleanup = [];
+       
        /**
         * Create the command
         */
@@ -54,6 +61,19 @@ class Packager implements Command
                ]);
        }
        
+       /**
+        * Perform cleaniup
+        */
+       function __destruct() {
+               foreach ($this->cleanup as $cleanup) {
+                       if (is_dir($cleanup)) {
+                               $this->rm($cleanup);
+                       } else {
+                               unlink($cleanup);
+                       }
+               }
+       }
+       
        /**
         * @inheritdoc
         * @see \pharext\Command::run()
@@ -76,12 +96,13 @@ class Packager implements Command
 
                try {
                        if ($this->args["source"]) {
+                               $source = $this->localize($this->args["source"]);
                                if ($this->args["pecl"]) {
-                                       $this->source = new SourceDir\Pecl($this, $this->args["source"]);
+                                       $this->source = new SourceDir\Pecl($this, $source);
                                } elseif ($this->args["git"]) {
-                                       $this->source = new SourceDir\Git($this, $this->args["source"]);
+                                       $this->source = new SourceDir\Git($this, $source);
                                } else {
-                                       $this->source = new SourceDir\Pharext($this, $this->args["source"]);
+                                       $this->source = new SourceDir\Pharext($this, $source);
                                }
                        }
                } catch (\Exception $e) {
@@ -109,6 +130,11 @@ class Packager implements Command
                $this->createPackage();
        }
 
+       /**
+        * Dump program signature
+        * @param string $prog
+        * @return int exit code
+        */
        function signature($prog) {
                try {
                        $sig = (new Phar(Phar::running(false)))->getSignature();
@@ -121,6 +147,76 @@ class Packager implements Command
                }
        }
 
+       /**
+        * Download remote source
+        * @param string $source
+        * @return string local source
+        */
+       private function download($source) {
+               if ($this->args["git"]) {
+                       $local = $this->newtemp("gitclone");
+                       $this->exec("git clone", "git", ["clone", $source, $local]);
+                       $source = $local;
+               } else {
+                       $this->info("Fetching remote source %s ... ", $source);
+                       if (!$remote = fopen($source, "r")) {
+                               $this->error(null);
+                               exit(2);
+                       }
+                       $local = new Tempfile("remote");
+                       if (!stream_copy_to_stream($remote, $local->getStream())) {
+                               $this->error(null);
+                               exit(2);
+                       }
+                       $local->closeStream();
+                       $source = $local->getPathname();
+                       $this->info("OK\n");
+               }
+               
+               $this->cleanup[] = $local;
+               return $source;
+       }
+
+       /**
+        * Extract local archive
+        * @param stirng $source
+        * @return string extracted directory
+        */
+       private function extract($source) {
+               $dest = $this->newtemp("local");
+               $this->info("Extracting to %s ... ", $dest);
+               $archive = new PharData($source);
+               $archive->extractTo($dest);
+               $this->info("OK\n");
+               $this->cleanup[] = $dest;
+               return $dest;
+       }
+
+       /**
+        * Localize a possibly remote source
+        * @param string $source
+        * @return string local source directory
+        */
+       private function localize($source) {
+               if (!stream_is_local($source)) {
+                       $source = $this->download($source);
+               }
+               if (!is_dir($source)) {
+                       $source = $this->extract($source);
+                       if ($this->args["pecl"]) {
+                               $this->info("Sanitizing PECL dir ... ");
+                               $dirs = glob("$source/*", GLOB_ONLYDIR);
+                               $files = array_diff(glob("$source/*"), $dirs);
+                               $source = current($dirs);
+                               foreach ($files as $file) {
+                                       rename($file, "$source/" . basename($file));
+                               }
+                               $this->info("OK\n");
+                       }
+               }
+               return $source;
+       }
+
        /**
         * Traverses all pharext source files to bundle
         * @return Generator
@@ -133,7 +229,12 @@ class Packager implements Command
                        
                }
        }
-       
+
+       /**
+        * Ask for password on the console
+        * @param string $prompt
+        * @return string password
+        */
        private function askpass($prompt = "Password:") {
                system("stty -echo", $retval);
                if ($retval) {
index 13ac411af246ae2fe19e4d120a8bc2ab3ccfc14c..d31f45772d75f90057898edfc314e94c8524e53c 100644 (file)
@@ -27,7 +27,7 @@ class Tempfile extends \SplFileInfo
        function __destruct() {
                @unlink($this->getPathname());
        }
-
+       
        function closeStream() {
                fclose($this->handle);
        }