X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fpharext%2FPackager.php;h=d3e4000a3f45c505829b336c8528f8a40e531553;hb=8b991a8b633610f7309d76f15b388bffd073d1f7;hp=33aa72e1f4e839665b68b1d3346a54dd7a8d4b84;hpb=b3b7f2dddc97f6f6c2ca83f6a708fb09ae2ed64c;p=pharext%2Fpharext

diff --git a/src/pharext/Packager.php b/src/pharext/Packager.php
index 33aa72e..d3e4000 100644
--- a/src/pharext/Packager.php
+++ b/src/pharext/Packager.php
@@ -95,6 +95,10 @@ 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
+			 */
 			if ($this->args["source"]) {
 				$source = $this->localize($this->args["source"]);
 				if ($this->args["pecl"]) {
@@ -115,7 +119,10 @@ class Packager implements Command
 		
 		if ($errs) {
 			if (!$this->args["quiet"]) {
-				$this->header();
+				if (!headers_sent()) {
+					/* only display header, if we didn't generate any output yet */
+					$this->header();
+				}
 			}
 			foreach ($errs as $err) {
 				$this->error("%s\n", $err);
@@ -153,13 +160,36 @@ class Packager implements Command
 	 * @return string local source
 	 */
 	private function download($source) {
+		$this->info("Fetching remote source %s ... ", $source);
 		if ($this->args["git"]) {
-			$local = $this->newtemp("gitclone");
-			$this->exec("git clone", "git", ["clone", $source, $local]);
-			$source = $local;
+			$local = new Tempdir("gitclone");
+			$cmd = new ExecCmd("git", $this->args->verbose);
+			$cmd->run(["clone", $source, $local]);
+			if (!$this->args->verbose) {
+				$this->info("OK\n");
+			}
 		} else {
-			$this->info("Fetching remote source %s ... ", $source);
-			if (!$remote = fopen($source, "r")) {
+			$context = stream_context_create([],["notification" => function($notification, $severity, $message, $code, $bytes_cur, $bytes_max) {
+				switch ($notification) {
+					case STREAM_NOTIFY_CONNECT:
+						$this->debug("\n");
+						break;
+					case STREAM_NOTIFY_PROGRESS:
+						if ($bytes_max) {
+							$bytes_pct = $bytes_cur/$bytes_max;
+							$this->debug("\r %3d%% [%s>%s] ",
+								$bytes_pct*100,
+								str_repeat("=", round(70*$bytes_pct)), 
+								str_repeat(" ", round(70*(1-$bytes_pct)))
+							);
+						}
+						break;
+					case STREAM_NOTIFY_COMPLETED:
+						/* this is not generated, why? */
+						break;
+				}
+			}]);
+			if (!$remote = fopen($source, "r", false, $context)) {
 				$this->error(null);
 				exit(2);
 			}
@@ -169,12 +199,11 @@ class Packager implements Command
 				exit(2);
 			}
 			$local->closeStream();
-			$source = $local->getPathname();
 			$this->info("OK\n");
 		}
 		
 		$this->cleanup[] = $local;
-		return $source;
+		return $local;
 	}
 
 	/**
@@ -183,11 +212,11 @@ class Packager implements Command
 	 * @return string extracted directory
 	 */
 	private function extract($source) {
-		$dest = $this->newtemp("local");
-		$this->info("Extracting to %s ... ", $dest);
+		$dest = new Tempdir("local");
+		$this->debug("Extracting %s to %s ... ", $source, $dest);
 		$archive = new PharData($source);
 		$archive->extractTo($dest);
-		$this->info("OK\n");
+		$this->debug("OK\n");
 		$this->cleanup[] = $dest;
 		return $dest;
 	}
@@ -204,14 +233,14 @@ class Packager implements Command
 		if (!is_dir($source)) {
 			$source = $this->extract($source);
 			if ($this->args["pecl"]) {
-				$this->info("Sanitizing PECL dir ... ");
+				$this->debug("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");
+				$this->debug("OK\n");
 			}
 		}
 		return $source;
@@ -254,7 +283,7 @@ class Packager implements Command
 	 */
 	private function createPackage() {
 		$pkguniq = uniqid();
-		$pkgtemp = $this->tempname($pkguniq, "phar");
+		$pkgtemp = sprintf("%s/%s.phar", sys_get_temp_dir(), $pkguniq);
 		$pkgdesc = "{$this->args->name}-{$this->args->release}";
 	
 		$this->info("Creating phar %s ...%s", $pkgtemp, $this->args->verbose ? "\n" : " ");
@@ -278,7 +307,7 @@ class Packager implements Command
 			if (!chmod($pkgtemp, 0777)) {
 				$this->error(null);
 			} elseif ($this->args->verbose) {
-				$this->info("Created executable phar %s\n", $pkgtemp);
+				$this->debug("Created executable phar %s\n", $pkgtemp);
 			} else {
 				$this->info("OK\n");
 			}