X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpharext%2FPackager.php;h=33aa72e1f4e839665b68b1d3346a54dd7a8d4b84;hb=b3b7f2dddc97f6f6c2ca83f6a708fb09ae2ed64c;hp=4d432ed5bc7edbe81679667e6cd46f0c1ea49985;hpb=13b5b8aa4efa126f7e34943b42011f43e09bbde9;p=pharext%2Fpharext

diff --git a/src/pharext/Packager.php b/src/pharext/Packager.php
index 4d432ed..33aa72e 100644
--- a/src/pharext/Packager.php
+++ b/src/pharext/Packager.php
@@ -3,6 +3,7 @@
 namespace pharext;
 
 use Phar;
+use PharData;
 use pharext\Cli\Args as CliArgs;
 use pharext\Cli\Command as CliCommand;
 
@@ -19,6 +20,12 @@ class Packager implements Command
 	 */
 	private $source;
 	
+	/**
+	 * Cleanups
+	 * @var array
+	 */
+	private $cleanup = [];
+	
 	/**
 	 * Create the command
 	 */
@@ -54,6 +61,19 @@ class Packager implements Command
 		]);
 	}
 	
+	/**
+	 * Perform cleaniup
+	 */
+	function __destruct() {
+		foreach ($this->cleanup as $cleanup) {
+			if (is_dir($cleanup)) {
+				$this->rm($cleanup);
+			} else {
+				unlink($cleanup);
+			}
+		}
+	}
+	
 	/**
 	 * @inheritdoc
 	 * @see \pharext\Command::run()
@@ -76,12 +96,13 @@ class Packager implements Command
 
 		try {
 			if ($this->args["source"]) {
+				$source = $this->localize($this->args["source"]);
 				if ($this->args["pecl"]) {
-					$this->source = new SourceDir\Pecl($this, $this->args["source"]);
+					$this->source = new SourceDir\Pecl($this, $source);
 				} elseif ($this->args["git"]) {
-					$this->source = new SourceDir\Git($this, $this->args["source"]);
+					$this->source = new SourceDir\Git($this, $source);
 				} else {
-					$this->source = new SourceDir\Pharext($this, $this->args["source"]);
+					$this->source = new SourceDir\Pharext($this, $source);
 				}
 			}
 		} catch (\Exception $e) {
@@ -109,6 +130,11 @@ class Packager implements Command
 		$this->createPackage();
 	}
 
+	/**
+	 * Dump program signature
+	 * @param string $prog
+	 * @return int exit code
+	 */
 	function signature($prog) {
 		try {
 			$sig = (new Phar(Phar::running(false)))->getSignature();
@@ -121,6 +147,76 @@ class Packager implements Command
 		}
 	}
 
+	/**
+	 * Download remote source
+	 * @param string $source
+	 * @return string local source
+	 */
+	private function download($source) {
+		if ($this->args["git"]) {
+			$local = $this->newtemp("gitclone");
+			$this->exec("git clone", "git", ["clone", $source, $local]);
+			$source = $local;
+		} else {
+			$this->info("Fetching remote source %s ... ", $source);
+			if (!$remote = fopen($source, "r")) {
+				$this->error(null);
+				exit(2);
+			}
+			$local = new Tempfile("remote");
+			if (!stream_copy_to_stream($remote, $local->getStream())) {
+				$this->error(null);
+				exit(2);
+			}
+			$local->closeStream();
+			$source = $local->getPathname();
+			$this->info("OK\n");
+		}
+		
+		$this->cleanup[] = $local;
+		return $source;
+	}
+
+	/**
+	 * Extract local archive
+	 * @param stirng $source
+	 * @return string extracted directory
+	 */
+	private function extract($source) {
+		$dest = $this->newtemp("local");
+		$this->info("Extracting to %s ... ", $dest);
+		$archive = new PharData($source);
+		$archive->extractTo($dest);
+		$this->info("OK\n");
+		$this->cleanup[] = $dest;
+		return $dest;
+	}
+
+	/**
+	 * Localize a possibly remote source
+	 * @param string $source
+	 * @return string local source directory
+	 */
+	private function localize($source) {
+		if (!stream_is_local($source)) {
+			$source = $this->download($source);
+		}
+		if (!is_dir($source)) {
+			$source = $this->extract($source);
+			if ($this->args["pecl"]) {
+				$this->info("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");
+			}
+		}
+		return $source;
+	}
+
 	/**
 	 * Traverses all pharext source files to bundle
 	 * @return Generator
@@ -133,7 +229,12 @@ class Packager implements Command
 			
 		}
 	}
-	
+
+	/**
+	 * Ask for password on the console
+	 * @param string $prompt
+	 * @return string password
+	 */
 	private function askpass($prompt = "Password:") {
 		system("stty -echo", $retval);
 		if ($retval) {