namespace pharext;
use Phar;
-use pharext\Cli\Args as CliArgs;
-use pharext\Cli\Command as CliCommand;
use pharext\Exception;
/**
*/
class Packager implements Command
{
- use CliCommand;
+ use Cli\Command;
/**
* Extension source directory
* 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],
]);
}
}
try {
- /* source needs to be evaluated before CliArgs validation,
- * so e.g. name and version can be overriden and CliArgs
+ /* source needs to be evaluated before Cli\Args validation,
+ * so e.g. name and version can be overriden and Cli\Args
* does not complain about missing arguments
*/
$this->loadSource();
*/
private function download($source) {
if ($this->args->git) {
- $task = new Task\GitClone($source);
+ $task = new Task\GitClone($source, $this->args->branch);
} else {
- $task = new Task\StreamFetch($source, function($bytes_pct) {
- $this->info(" %3d%% [%s>%s] \r%s",
- floor($bytes_pct*100),
- str_repeat("=", round(50*$bytes_pct)),
- str_repeat(" ", round(50*(1-$bytes_pct))),
- $bytes_pct == 1 ? "\n":""
- );
+ /* print newline only once */
+ $done = false;
+ $task = new Task\StreamFetch($source, function($bytes_pct) use(&$done) {
+ if (!$done) {
+ $this->info(" %3d%% [%s>%s] \r",
+ floor($bytes_pct*100),
+ str_repeat("=", round(50*$bytes_pct)),
+ str_repeat(" ", round(50*(1-$bytes_pct)))
+ );
+ if ($bytes_pct == 1) {
+ $done = true;
+ $this->info("\n");
+ }
+ }
});
}
$local = $task->run($this->verbosity());
* @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);
}
$this->source = new SourceDir\Pecl($source);
} elseif ($this->args["git"]) {
$this->source = new SourceDir\Git($source);
- } elseif (is_file("$source/parext_package.php")) {
+ } elseif (is_file("$source/pharext_package.php")) {
$this->source = include "$source/pharext_package.php";
} else {
$this->source = new SourceDir\Basic($source);
*/
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);