correctly bail out on non-existing INI file

[pharext/pharext] / src / pharext / Installer.php

diff --git a/src/pharext/Installer.php b/src/pharext/Installer.php
index 83a40ad9769d4babb16dfd063c27d10f3dd6d5f0..29fe271c6bec2e9588b0cef342ba2d8bbeb8901d 100644 (file)
--- a/src/pharext/Installer.php
+++ b/src/pharext/Installer.php
@@ -15,6 +15,12 @@ class Installer implements Command
 {
        use CliCommand;
        
+       /**
+        * Cleanups
+        * @var array
+        */
+       private $cleanup = [];
+       
        /**
         * Create the command
         */
@@ -53,22 +59,51 @@ class Installer implements Command
                ]);
        }
        
+       /**
+        * Perform cleaniup
+        */
+       function __destruct() {
+               foreach ($this->cleanup as $cleanup) {
+                       $cleanup->run();
+               }
+       }
+       
        private function extract(Phar $phar) {
-               $this->debug("Extracting %s ...\n", basename($phar->getPath()));
-               return (new Task\Extract($phar))->run($this->args->verbose);
+               $temp = (new Task\Extract($phar))->run($this->verbosity());
+               $this->cleanup[] = new Task\Cleanup($temp);
+               return $temp;
        }
-
+       
        private function hooks(SplObjectStorage $phars) {
-               $hooks = [];
+               $hook = [];
                foreach ($phars as $phar) {
-                       if (isset($phar["pharext_install.php"])) {
-                               $callable = include $phar["pharext_install.php"];
-                               if (is_callable($callable)) {
-                                       $hooks[] = $callable($this);
+                       if (isset($phar["pharext_package.php"])) {
+                               $sdir = include $phar["pharext_package.php"];
+                               if ($sdir instanceof SourceDir) {
+                                       $this->args->compile($sdir->getArgs());
+                                       $hook[] = $sdir;
                                }
                        }
                }
-               return $hooks;
+               return $hook;
+       }
+
+       private function load() {
+               $list = new SplObjectStorage();
+               $phar = new Phar(Phar::running(false));
+               $temp = $this->extract($phar);
+
+               foreach ($phar as $entry) {
+                       $dep_file = $entry->getBaseName();
+                       if (fnmatch("*.ext.phar*", $dep_file)) {
+                               $dep_phar = new Phar("$temp/$dep_file");
+                               $list[$dep_phar] = $this->extract($dep_phar);
+                       }
+               }
+               
+               /* the actual ext.phar at last */
+               $list[$phar] = $temp;
+               return $list;
        }
 
        /**
@@ -77,20 +112,8 @@ class Installer implements Command
         */
        public function run($argc, array $argv) {
                try {
-                       $list = new SplObjectStorage();
-                       $phar = new Phar(Phar::running(false));
-                       $temp = $this->extract($phar);
-
-                       foreach ($phar as $entry) {
-                               $dep_file = $entry->getBaseName();
-                               if (fnmatch("*.ext.phar*", $dep_file)) {
-                                       $dep_phar = new Phar("$temp/$dep_file");
-                                       $list[$dep_phar] = $this->extract($dep_phar);
-                               }
-                       }
-                       /* the actual ext.phar at last */
-                       $list[$phar] = $temp;
-
+                       /* load the phar(s) */
+                       $list = $this->load();
                        /* installer hooks */
                        $hook = $this->hooks($list);
                } catch (\Exception $e) {
@@ -141,10 +164,8 @@ class Installer implements Command
 
                try {
                        /* post process hooks */
-                       foreach ($hook as $callback) {
-                               if (is_callable($callback)) {
-                                       $callback($this);
-                               }
+                       foreach ($hook as $sdir) {
+                               $sdir->setArgs($this->args);
                        }
                } catch (\Exception $e) {
                        $this->error("%s\n", $e->getMessage());
@@ -157,7 +178,6 @@ class Installer implements Command
                                $this->info("Installing %s ...\n", basename($phar->getPath()));
                                $this->install($list[$phar]);
                                $this->activate($list[$phar]);
-                               $this->cleanup($list[$phar]);
                                $this->info("Successfully installed %s!\n", basename($phar->getPath()));
                        }
                } catch (\Exception $e) {
@@ -171,38 +191,26 @@ class Installer implements Command
         */
        private function install($temp) {
                // phpize
-               $this->info("Running phpize ...\n");
                $phpize = new Task\Phpize($temp, $this->args->prefix, $this->args->{"common-name"});
-               $phpize->run($this->args->verbose);
+               $phpize->run($this->verbosity());
 
                // configure
-               $this->info("Running configure ...\n");
                $configure = new Task\Configure($temp, $this->args->configure, $this->args->prefix, $this->args{"common-name"});
-               $configure->run($this->args->verbose);
+               $configure->run($this->verbosity());
 
                // make
-               $this->info("Running make ...\n");
                $make = new Task\Make($temp);
-               $make->run($this->args->verbose);
+               $make->run($this->verbosity());
 
                // install
-               $this->info("Running make install ...\n");
                $sudo = isset($this->args->sudo) ? $this->args->sudo : null;
                $install = new Task\Make($temp, ["install"], $sudo);
-               $install->run($this->args->verbose);
-       }
-
-       private function cleanup($temp) {
-               if (is_dir($temp)) {
-                       $this->rm($temp);
-               } elseif (file_exists($temp)) {
-                       unlink($temp);
-               }
+               $install->run($this->verbosity());
        }
 
        private function activate($temp) {
                if ($this->args->ini) {
-                       $files = [realpath($this->args->ini)];
+                       $files = [$this->args->ini];
                } else {
                        $files = array_filter(array_map("trim", explode(",", php_ini_scanned_files())));
                        $files[] = php_ini_loaded_file();
@@ -211,9 +219,8 @@ class Installer implements Command
                $sudo = isset($this->args->sudo) ? $this->args->sudo : null;
                $type = $this->metadata("type") ?: "extension";
                
-               $this->info("Running INI activation ...\n");
                $activate = new Task\Activate($temp, $files, $type, $this->args->prefix, $this->args{"common-name"}, $sudo);
-               if (!$activate->run($this->args->verbose)) {
+               if (!$activate->run($this->verbosity())) {
                        $this->info("Extension already activated ...\n");
                }
        }