X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fpharext%2FPackager.php;h=23bcdc9999c52906cf6edcf0254789503c84500e;hb=686017f7a73f9dc9eba2c446db772824e843333b;hp=cd1d43681d2d9a1167615c170365175cc3c5c9b4;hpb=66d7a880cb37f809df6806e5dc62d191dc257d08;p=pharext%2Fpharext

diff --git a/src/pharext/Packager.php b/src/pharext/Packager.php
index cd1d436..23bcdc9 100644
--- a/src/pharext/Packager.php
+++ b/src/pharext/Packager.php
@@ -3,16 +3,13 @@
 namespace pharext;
 
 use Phar;
-use pharext\Cli\Args as CliArgs;
-use pharext\Cli\Command as CliCommand;
-use pharext\Exception;
 
 /**
  * The extension packaging command executed by bin/pharext
  */
 class Packager implements Command
 {
-	use CliCommand;
+	use Cli\Command;
 	
 	/**
 	 * Extension source directory
@@ -30,40 +27,42 @@ class Packager implements Command
 	 * Create the command
 	 */
 	public function __construct() {
-		$this->args = new CliArgs([
+		$this->args = new Cli\Args([
 			["h", "help", "Display this help",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
 			["v", "verbose", "More output",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
 			["q", "quiet", "Less output",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
 			["n", "name", "Extension name",
-				CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
+				Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG],
 			["r", "release", "Extension release version",
-				CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
+				Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG],
 			["s", "source", "Extension source directory",
-				CliArgs::REQUIRED|CliArgs::SINGLE|CliArgs::REQARG],
+				Cli\Args::REQUIRED|Cli\Args::SINGLE|Cli\Args::REQARG],
 			["g", "git", "Use `git ls-tree` to determine file list",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
+			["b", "branch", "Checkout this tag/branch",
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG],
 			["p", "pecl", "Use PECL package.xml to determine file list, name and release",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
 			["d", "dest", "Destination directory",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG,
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG,
 				"."],
 			["z", "gzip", "Create additional PHAR compressed with gzip",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
 			["Z", "bzip", "Create additional PHAR compressed with bzip",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
 			["S", "sign", "Sign the PHAR with a private key",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::REQARG],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::REQARG],
 			["E", "zend", "Mark as Zend Extension",
-				CliArgs::OPTIONAL|CliARgs::SINGLE|CliArgs::NOARG],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG],
 			[null, "signature", "Show pharext signature",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
 			[null, "license", "Show pharext license",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
 			[null, "version", "Show pharext version",
-				CliArgs::OPTIONAL|CliArgs::SINGLE|CliArgs::NOARG|CliArgs::HALT],
+				Cli\Args::OPTIONAL|Cli\Args::SINGLE|Cli\Args::NOARG|Cli\Args::HALT],
 		]);
 	}
 	
@@ -105,9 +104,9 @@ class Packager implements Command
 		}
 
 		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
+			/* source needs to be evaluated before Cli\Args validation, 
+			 * so Cli\Args does not complain about missing arguments,
+			 * which come from SourceDir::getPackageInfo()
 			 */
 			$this->loadSource();
 		} catch (\Exception $e) {
@@ -142,7 +141,7 @@ class Packager implements Command
 	 */
 	private function download($source) {
 		if ($this->args->git) {
-			$task = new Task\GitClone($source);
+			$task = new Task\GitClone($source, $this->args->branch);
 		} else {
 			/* print newline only once */
 			$done = false;
@@ -155,7 +154,7 @@ class Packager implements Command
 					);
 					if ($bytes_pct == 1) {
 						$done = true;
-						printf("\n");
+						$this->info("\n");
 					}
 				}
 			});
@@ -192,13 +191,19 @@ class Packager implements Command
 	 * @return string local source directory
 	 */
 	private function localize($source) {
-		if (!stream_is_local($source)) {
+		if (!stream_is_local($source) || ($this->args->git && isset($this->args->branch))) {
 			$source = $this->download($source);
 			$this->cleanup[] = new Task\Cleanup($source);
 		}
-		$source = realpath($source);
-		if (!is_dir($source)) {
-			$source = $this->extract($source);
+		if (!$real = realpath($source)) {
+			$error = "Cannot find source '$source'";
+			if ($this->args->git) {
+				$error .= "; did you forget to specify --branch for a remote git source?";
+			}
+			throw new Exception($error);
+		}
+		if (!is_dir($real)) {
+			$source = $this->extract($real);
 			$this->cleanup[] = new Task\Cleanup($source);
 			
 			if (!$this->args->git) {
@@ -231,7 +236,10 @@ class Packager implements Command
 			}
 
 			foreach ($this->source->getPackageInfo() as $key => $val) {
-				$this->args->$key = $val;
+				/* do not override command line arguments */
+				if (!isset($this->args->$key)) {
+					$this->args->$key = $val;
+				}
 			}
 		}
 	}
@@ -241,15 +249,13 @@ class Packager implements Command
 	 */
 	private function createPackage() {
 		try {
-			$meta = array_merge($this->metadata(), [
-				"date" => date("Y-m-d"),
+			$meta = array_merge(Metadata::all(), [
 				"name" => $this->args->name,
 				"release" => $this->args->release,
-				"license" => @file_get_contents(current(glob($this->source->getBaseDir()."/LICENSE*"))),
-				"stub" => "pharext_installer.php",
+				"license" => $this->source->getLicense(),
 				"type" => $this->args->zend ? "zend_extension" : "extension",
 			]);
-			$file = (new Task\PharBuild($this->source, $meta))->run($this->verbosity());
+			$file = (new Task\PharBuild($this->source, __DIR__."/../pharext_installer.php", $meta))->run($this->verbosity());
 		} catch (\Exception $e) {
 			$this->error("%s\n", $e->getMessage());
 			exit(self::EBUILD);