X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fpharext%2FInstaller.php;h=83a40ad9769d4babb16dfd063c27d10f3dd6d5f0;hb=d829063e596c6fffc4c30fb30f6d462ac9ba2928;hp=7ff112a38c391ae65bd0d36b46a7d176d910c9e6;hpb=4aa1e062368f8ee8e792951d675a811dd97f8699;p=pharext%2Fpharext

diff --git a/src/pharext/Installer.php b/src/pharext/Installer.php
index 7ff112a..83a40ad 100644
--- a/src/pharext/Installer.php
+++ b/src/pharext/Installer.php
@@ -2,7 +2,11 @@
 
 namespace pharext;
 
+use pharext\Cli\Args as CliArgs;
+use pharext\Cli\Command as CliCommand;
+
 use Phar;
+use SplObjectStorage;
 
 /**
  * The extension install command executed by the extension phar
@@ -11,18 +15,6 @@ class Installer implements Command
 {
 	use CliCommand;
 	
-	/**
-	 * The temporary directory we should operate in
-	 * @var string
-	 */
-	private $tmp;
-
-	/**
-	 * The directory we came from
-	 * @var string
-	 */
-	private $cwd;
-
 	/**
 	 * Create the command
 	 */
@@ -43,15 +35,40 @@ class Installer implements Command
 				CliArgs::OPTIONAL|CliArgs::MULTI|CliArgs::REQARG],
 			["s", "sudo", "Installation might need increased privileges",
 				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::OPTARG,
-				"sudo -S %s"]
+				"sudo -S %s"],
+			["i", "ini", "Activate in this php.ini instead of loaded default php.ini",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG],
+			[null, "signature", "Show package signature",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+			[null, "license", "Show package license",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+			[null, "name", "Show package name",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+			[null, "date", "Show package release date",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+			[null, "release", "Show package release version",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+			[null, "version", "Show pharext version",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
 		]);
 	}
 	
-	/**
-	 * Cleanup temp directory
-	 */
-	public function __destruct() {
-		$this->cleanup();
+	private function extract(Phar $phar) {
+		$this->debug("Extracting %s ...\n", basename($phar->getPath()));
+		return (new Task\Extract($phar))->run($this->args->verbose);
+	}
+
+	private function hooks(SplObjectStorage $phars) {
+		$hooks = [];
+		foreach ($phars as $phar) {
+			if (isset($phar["pharext_install.php"])) {
+				$callable = include $phar["pharext_install.php"];
+				if (is_callable($callable)) {
+					$hooks[] = $callable($this);
+				}
+			}
+		}
+		return $hooks;
 	}
 
 	/**
@@ -59,208 +76,145 @@ class Installer implements Command
 	 * @see \pharext\Command::run()
 	 */
 	public function run($argc, array $argv) {
-		$this->cwd = getcwd();
-		$this->tmp = $this->tempname(basename(Phar::running(false)));
-
-		$phar = new Phar(Phar::running(false));
-		foreach ($phar as $entry) {
-			if (fnmatch("*.ext.phar*", $entry->getBaseName())) {
-				$temp = $this->newtemp($entry->getBaseName());
-				$phar->extractTo($temp, $entry->getFilename(), true);
-				$phars[$temp] = new Phar($temp."/".$entry->getFilename());
-			}
-		}
-		$phars[$this->tmp] = $phar;
+		try {
+			$list = new SplObjectStorage();
+			$phar = new Phar(Phar::running(false));
+			$temp = $this->extract($phar);
 
-		foreach ($phars as $phar) {
-			if (($hook = $phar["pharext_install.php"])) {
-				$callable = include $phar["pharext_install.php"];
-				if (is_callable($callable)) {
-					$recv[] = $callable($this);
+			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;
+
+			/* installer hooks */
+			$hook = $this->hooks($list);
+		} catch (\Exception $e) {
+			$this->error("%s\n", $e->getMessage());
+			exit(self::EEXTRACT);
 		}
-		
+
+		/* standard arg stuff */
 		$errs = [];
 		$prog = array_shift($argv);
 		foreach ($this->args->parse(--$argc, $argv) as $error) {
 			$errs[] = $error;
 		}
-		
+
 		if ($this->args["help"]) {
 			$this->header();
 			$this->help($prog);
 			exit;
 		}
-		
+		try {
+			foreach (["signature", "name", "date", "license", "release", "version"] as $opt) {
+				if ($this->args[$opt]) {
+					printf("%s\n", $this->metadata($opt));
+					exit;
+				}
+			}
+		} catch (\Exception $e) {
+			$this->error("%s\n", $e->getMessage());
+			exit(self::EARGS);
+		}
+
 		foreach ($this->args->validate() as $error) {
 			$errs[] = $error;
 		}
-		
+
 		if ($errs) {
 			if (!$this->args["quiet"]) {
 				$this->header();
 			}
 			foreach ($errs as $err) {
 				$this->error("%s\n", $err);
-			} 
+			}
 			if (!$this->args["quiet"]) {
 				$this->help($prog);
 			}
-			exit(1);
+			exit(self::EARGS);
 		}
-		
-		if (isset($recv)) {
-			foreach ($recv as $r) {
-				$r($this);
+
+		try {
+			/* post process hooks */
+			foreach ($hook as $callback) {
+				if (is_callable($callback)) {
+					$callback($this);
+				}
 			}
+		} catch (\Exception $e) {
+			$this->error("%s\n", $e->getMessage());
+			exit(self::EARGS);
 		}
-		foreach ($phars as $temp => $phar) {
-			$this->installPackage($phar, $temp);
-		}
-	}
 
-	/**
-	 * Create a new temp directory
-	 * @param string $prefix
-	 * @return string
-	 */
-	private function newtemp($prefix) {
-		$temp = $this->tempname($prefix);
-		if (!is_dir($temp)) {
-			if (!mkdir($temp, 0750, true)) {
-				$this->error(null);
-				exit(3);
+		/* install packages */
+		try {
+			foreach ($list as $phar) {
+				$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) {
+			$this->error("%s\n", $e->getMessage());
+			exit(self::EINSTALL);
 		}
-		return $temp;
 	}
 	
 	/**
-	 * Prepares, configures, builds and installs the extension
+	 * Phpize + trinity
 	 */
-	private function installPackage(Phar $phar, $temp) {
-		$this->info("Installing %s ... \n", basename($phar->getAlias()));
-		try {
-			$phar->extractTo($temp, null, true);
-		} catch (\Exception $e) {
-			$this->error("%s\n", $e->getMessage());
-			exit(3);
-		}
+	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);
 
-		if (!chdir($temp)) {
-			$this->error(null);
-			exit(4);
-		}
-
-		$this->exec("phpize", $this->php("ize"));
-		$this->exec("configure", "./configure --with-php-config=". $this->php("-config") . " ". 
-			implode(" ", (array) $this->args->configure));
-		$this->exec("make", $this->args->verbose ? "make -j3" : "make -sj3");
-		$this->exec("install", $this->args->verbose ? "make install" : "make -s install", true);
+		// 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);
 
-		$this->cleanup($temp);
+		// make
+		$this->info("Running make ...\n");
+		$make = new Task\Make($temp);
+		$make->run($this->args->verbose);
 
-		$this->info("Don't forget to activiate the extension in your php.ini!\n\n");
+		// 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);
 	}
 
-	/**
-	 * Perform any cleanups
-	 */
-	private function cleanup($temp = null) {
-		if (!isset($temp)) {
-			$temp = $this->tmp;
-		}
+	private function cleanup($temp) {
 		if (is_dir($temp)) {
-			chdir($this->cwd);
-			$this->info("Cleaning up %s ...\n", $temp);
 			$this->rm($temp);
+		} elseif (file_exists($temp)) {
+			unlink($temp);
 		}
 	}
 
-	/**
-	 * rm -r
-	 * @param string $dir
-	 */
-	private function rm($dir) {
-		foreach (scandir($dir) as $entry) {
-			if ($entry === "." || $entry === "..") {
-				continue;
-			} elseif (is_dir("$dir/$entry")) {
-				$this->rm("$dir/$entry");
-			} elseif (!unlink("$dir/$entry")) {
-				$this->error(null);
-			}
-		}
-		if (!rmdir($dir)) {
-			$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 full command
-	 * @param bool $sudo whether the command may need escalated privileges
-	 */
-	private function exec($name, $command, $sudo = false) {
-		$this->info("Running %s ...%s", $this->args->verbose ? $command : $name, $this->args->verbose ? "\n" : " ");
-		if ($sudo && isset($this->args->sudo)) {
-			$retval = $this->sudo(sprintf($this->args->sudo." 2>&1", $command), $output);
-		} elseif ($this->args->verbose) {
-			passthru($command ." 2>&1", $retval);
+	private function activate($temp) {
+		if ($this->args->ini) {
+			$files = [realpath($this->args->ini)];
 		} else {
-			exec($command ." 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);
+			$files = array_filter(array_map("trim", explode(",", php_ini_scanned_files())));
+			$files[] = php_ini_loaded_file();
 		}
-		$this->info("OK\n");
-	}
-	
-	/**
-	 * Construct a command from prefix common-name and suffix
-	 * @param type $suffix
-	 * @return string
-	 */
-	private function php($suffix) {
-		$cmd = $this->args["common-name"] . $suffix;
-		if (isset($this->args->prefix)) {
-			$cmd = $this->args->prefix . "/bin/" . $cmd;
+
+		$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)) {
+			$this->info("Extension already activated ...\n");
 		}
-		return $cmd;
 	}
 }