X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fpharext%2FPackager.php;h=5194951dbad5cd3ec28debb5d18f387017af0ad0;hb=34284101c2aa60ec1e824a54de543148aaa28b58;hp=a342e2f25d5c8795bc983f7194cf1bb4052e7a2e;hpb=80b9268e4f72fef35e2a87ff45dd64fc727933a4;p=pharext%2Fpharext

diff --git a/src/pharext/Packager.php b/src/pharext/Packager.php
index a342e2f..5194951 100644
--- a/src/pharext/Packager.php
+++ b/src/pharext/Packager.php
@@ -3,6 +3,8 @@
 namespace pharext;
 
 use Phar;
+use pharext\Cli\Args as CliArgs;
+use pharext\Cli\Command as CliCommand;
 
 /**
  * The extension packaging command executed by bin/pharext
@@ -17,6 +19,12 @@ class Packager implements Command
 	 */
 	private $source;
 	
+	/**
+	 * Cleanups
+	 * @var array
+	 */
+	private $cleanup = [];
+	
 	/**
 	 * Create the command
 	 */
@@ -34,9 +42,9 @@ class Packager implements Command
 				CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
 			["s", "source", "Extension source directory",
 				CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
-			["g", "git", "Use `git ls-files` instead of the standard ignore filter",
+			["g", "git", "Use `git ls-tree` to determine file list",
 				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
-			["p", "pecl", "Use PECL package.xml instead of the standard ignore filter",
+			["p", "pecl", "Use PECL package.xml to determine file list, name and release",
 				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
 			["d", "dest", "Destination directory",
 				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG,
@@ -45,9 +53,32 @@ class Packager implements Command
 				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
 			["Z", "bzip", "Create additional PHAR compressed with bzip",
 				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+			["S", "sign", "Sign the PHAR with a private key",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG],
+			["E", "zend", "Mark as Zend Extension",
+				CliArgs::OPTIONAL|CliARgs::SINGLE|CliArgs::NOARG],
+			[null, "signature", "Dump pharext signature",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+			[null, "license", "Show pharext license",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+			[null, "version", "Show pharext version",
+				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
 		]);
 	}
 	
+	/**
+	 * Perform cleaniup
+	 */
+	function __destruct() {
+		foreach ($this->cleanup as $cleanup) {
+			if (is_dir($cleanup)) {
+				$this->rm($cleanup);
+			} elseif (file_exists($cleanup)) {
+				unlink($cleanup);
+			}
+		}
+	}
+	
 	/**
 	 * @inheritdoc
 	 * @see \pharext\Command::run()
@@ -64,17 +95,31 @@ class Packager implements Command
 			$this->help($prog);
 			exit;
 		}
+		try {
+			foreach (["signature", "license", "version"] as $opt) {
+				if ($this->args[$opt]) {
+					printf("%s\n", $this->metadata($opt));
+					exit;
+				}
+			}
+		} catch (\Exception $e) {
+			$this->error("%s\n", $e->getMessage());
+			exit(2);
+		}
 
 		try {
+			/* source needs to be evaluated before CliArgs validation, 
+			 * so e.g. name and version can be overriden and CliArgs 
+			 * does not complain about missing arguments
+			 */
 			if ($this->args["source"]) {
+				$source = $this->localize($this->args["source"]);
 				if ($this->args["pecl"]) {
-					$this->source = new PeclSourceDir($this, $this->args["source"]);
+					$this->source = new SourceDir\Pecl($this, $source);
 				} elseif ($this->args["git"]) {
-					$this->source = new GitSourceDir($this, $this->args["source"]);
-				} elseif (realpath($this->args["source"]."/pharext_package.php")) {
-					$this->source = new PharextSourceDir($this, $this->args["source"]);
+					$this->source = new SourceDir\Git($this, $source);
 				} else {
-					$this->source = new FilteredSourceDir($this, $this->args["source"]);
+					$this->source = new SourceDir\Pharext($this, $source);
 				}
 			}
 		} catch (\Exception $e) {
@@ -103,79 +148,145 @@ class Packager implements Command
 	}
 	
 	/**
-	 * Traverses all pharext source files to bundle
-	 * @return Generator
+	 * Download remote source
+	 * @param string $source
+	 * @return string local source
+	 */
+	private function download($source) {
+		$this->info("Fetching remote source %s ...\n", $source);
+		
+		if ($this->args->git) {
+			$task = new Task\GitClone($source);
+		} else {
+			$task = new Task\StreamFetch($source, function($bytes_pct) {
+				$this->debug(" %3d%% [%s>%s] \r",
+					floor($bytes_pct*100),
+					str_repeat("=", round(50*$bytes_pct)),
+					str_repeat(" ", round(50*(1-$bytes_pct)))
+				);
+			});
+		}
+		$local = $task->run($this->args->verbose);
+		$this->debug("\n");
+
+		$this->cleanup[] = $local;
+		return $local;
+	}
+
+	/**
+	 * Extract local archive
+	 * @param stirng $source
+	 * @return string extracted directory
+	 */
+	private function extract($source) {
+		$this->debug("Extracting %s ...\n", $source);
+		
+		$task = new Task\Extract($source);
+		$dest = $task->run($this->args->verbose);
+		
+		$this->cleanup[] = $dest;
+		return $dest;
+	}
+
+	/**
+	 * Localize a possibly remote source
+	 * @param string $source
+	 * @return string local source directory
 	 */
-	private function bundle() {
-		foreach (scandir(__DIR__) as $entry) {
-			if (fnmatch("*.php", $entry)) {
-				yield "pharext/$entry" => __DIR__."/$entry";
+	private function localize($source) {
+		if (!stream_is_local($source)) {
+			$source = $this->download($source);
+			$this->cleanup[] = $source;
+		}
+		$source = realpath($source);
+		if (!is_dir($source)) {
+			$source = $this->extract($source);
+			$this->cleanup[] = $source;
+			
+			if ($this->args->pecl) {
+				$this->debug("Sanitizing PECL dir ...\n");
+				$source = (new Task\PeclFixup($source))->run($this->args->verbose);
 			}
 		}
+		return $source;
 	}
-	
+
 	/**
 	 * Creates the extension phar
 	 */
 	private function createPackage() {
-		$pkguniq = uniqid();
-		$pkgtemp = $this->tempname($pkguniq, "phar");
-		$pkgdesc = "{$this->args->name}-{$this->args->release}";
-	
-		$this->info("Creating phar %s ...%s", $pkgtemp, $this->args->verbose ? "\n" : " ");
 		try {
-			$package = new Phar($pkgtemp);
-			$package->startBuffering();
-			$package->buildFromIterator($this->source, $this->source->getBaseDir());
-			$package->buildFromIterator($this->bundle());
-			$package->addFile(__DIR__."/../pharext_installer.php", "pharext_installer.php");
-			$package->setDefaultStub("pharext_installer.php");
-			$package->setStub("#!/usr/bin/php -dphar.readonly=1\n".$package->getStub());
-			$package->stopBuffering();
-			
-			if (!chmod($pkgtemp, 0777)) {
-				$this->error(null);
-			} elseif ($this->args->verbose) {
-				$this->info("Created executable phar %s\n", $pkgtemp);
-			} else {
-				$this->info("OK\n");
+			$meta = array_merge($this->metadata(), [
+				"date" => date("Y-m-d"),
+				"name" => $this->args->name,
+				"release" => $this->args->release,
+				"license" => @file_get_contents(current(glob($this->source->getBaseDir()."/LICENSE*"))),
+				"stub" => "pharext_installer.php",
+				"type" => $this->args->zend ? "zend_extension" : "extension",
+			]);
+			$file = (new Task\PharBuild($this->source, $meta))->run();
+
+			if ($this->args->sign) {
+				$this->info("Using private key to sign phar ...\n");
+				$pass = (new Task\Askpass)->run($this->args->verbose);
+				$sign = new Task\PharSign($file, $this->args->sign, $pass);
+				$pkey = $sign->run($this->args->verbose);
 			}
-			if ($this->args->gzip) {
-				$this->info("Compressing with gzip ... ");
-				try {
-					$package->compress(Phar::GZ)
-						->setDefaultStub("pharext_installer.php");
-					$this->info("OK\n");
-				} catch (\Exception $e) {
-					$this->error("%s\n", $e->getMessage());
+
+		} catch (\Exception $e) {
+			$this->error("%s\n", $e->getMessage());
+			exit(4);
+		}
+
+		if ($this->args->gzip) {
+			try {
+				$gzip = (new Task\PharCompress($file, Phar::GZ))->run();
+				$move = new Task\PharRename($gzip, $this->args->dest, $this->args->name ."-". $this->args->release);
+				$name = $move->run($this->args->verbose);
+
+				$this->info("Created gzipped phar %s\n", $name);
+
+				if ($this->args->sign) {
+					$sign = new Task\PharSign($name, $this->args->sign, $pass);
+					$sign->run($this->args->verbose)->exportPublicKey($name.".pubkey");
 				}
+
+			} catch (\Exception $e) {
+				$this->warn("%s\n", $e->getMessage());
 			}
-			if ($this->args->bzip) {
-				$this->info("Compressing with bzip ... ");
-				try {
-					$package->compress(Phar::BZ2)
-						->setDefaultStub("pharext_installer.php");
-					$this->info("OK\n");
-				} catch (\Exception $e) {
-					$this->error("%s\n", $e->getMessage());
+		}
+		
+		if ($this->args->bzip) {
+			try {
+				$bzip = (new Task\PharCompress($file, Phar::BZ2))->run();
+				$move = new Task\PharRename($bzip, $this->args->dest, $this->args->name ."-". $this->args->release);
+				$name = $move->run($this->args->verbose);
+
+				$this->info("Created bzipped phar %s\n", $name);
+
+				if ($this->args->sign) {
+					$sign = new Task\PharSign($name, $this->args->sign, $pass);
+					$sign->run($this->args->verbose)->exportPublicKey($name.".pubkey");
 				}
+
+			} catch (\Exception $e) {
+				$this->warn("%s\n", $e->getMessage());
 			}
-			
-			unset($package);
+		}
+
+		try {
+			$move = new Task\PharRename($file, $this->args->dest, $this->args->name ."-". $this->args->release);
+			$name = $move->run($this->args->verbose);
+
+			$this->info("Created executable phar %s\n", $name);
+
+			if (isset($pkey)) {
+				$pkey->exportPublicKey($name.".pubkey");
+			}
+
 		} catch (\Exception $e) {
 			$this->error("%s\n", $e->getMessage());
 			exit(4);
 		}
-
-		foreach (glob($pkgtemp."*") as $pkgtemp) {
-			$pkgfile = str_replace($pkguniq, "{$pkgdesc}.ext", $pkgtemp);
-			$pkgname = $this->args->dest ."/". basename($pkgfile);
-			$this->info("Finalizing %s ... ", $pkgname);
-			if (!rename($pkgtemp, $pkgname)) {
-				$this->error(null);
-				exit(5);
-			}
-			$this->info("OK\n");
-		} 
 	}
 }