From 10c6f10181e75139992ba92b7185fe9a50b889b2 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Sun, 29 Mar 2015 10:22:53 +0200
Subject: [PATCH] basic source dirs && general tarball fixup

---
 bin/pharext                     | Bin 67468 -> 68659 bytes
 src/pharext/Packager.php        |   4 ++-
 src/pharext/SourceDir/Basic.php |  51 ++++++++++++++++++++++++++++++++
 src/pharext/Task/PeclFixup.php  |   5 +++-
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 src/pharext/SourceDir/Basic.php

diff --git a/bin/pharext b/bin/pharext
index 539504e897e1036c493df128fe5651d608594bf6..e8bf5a63c41c3f48a26fa321ef5af86572b0efef 100755
GIT binary patch
delta 876
zcmXw%ZAep57{@o=l--;!_>yi`XLt9`UD<pq4H1P#WD*s<LWRlodbVAh+c@`bC}#E{
z`qT^bRD=n>U>JcV4E$su23q?N7)TT)<d-0N(N7VAba&1=AI|UmAD-v`JUpD+_bjQ$
zmiaD+wbE`f@o>tqY;H}JI47+I?F)M^oTxIHo;;g64RNsy)=+7#5rl8ZM_J*jqwI7s
zoy_W4*I^p}>XJJB$YjbGWw`PEYWITKM32+B<6)WLLB0N5EI|}}R3-HRSyPp|csTw#
zmz8CBd@Fb!9K1w5kMRd7ukoz+9N$FsCf`U|;clfo>t_0vo8>QN^_H9Eivp{^DAX5^
zTUfIU@n3xmdISf&6pE?Qvd}`gBOIb^5}83rY@m8fY^HoKvH^ERwhX_=PvhNL-tn;b
zqK7s9$>OPfHM9LCE<q2gn!iIPA>$6IdTRZCOO6%ch=!r)fmlcv;}tZzDJf-r_=<xM
z6E4_Zt*+?OF_HBcIT8vH9Fle1#wCoh?YB;-dBYcSN<`K)L>-U{qccvpG+9&}Cu-8j
zMM7NG!)=`HQI5F`8rJqe$1De>Q<Y{Lto4?|%_%Yay1rnCKU1Yyb>K`M+zk{!_jJAy
zS(=k_M>tloF;fIfD;}_?^Q{?gAB?1{pdqb;WmSTA=|(%jdV)leKvcDjgWa^`RfEXu
z5|pqS>GOA}n(-C9l7xmin{nJjDvtEAIpKw2QTwziwLDSSK5DZWC0OZ4?MNm>9_k^u
zFQH(s5L6>r^PylOs_1Gg>J^9&3CXPC|L#fT@t|OIK-QJ8mygRzzZ}A~b%O&D-iLZ+
z4M*hx!z(FC#&&EYKBSWbHr|HFjH|@p<LB}`HUZ54a-_<?T&b;IACC;@HK%uePp<60
UeB;xP=bO{{ImTb_44e%718iC)+yDRo

delta 480
zcmdlygQcgRWrL>_>q8y}2F1yKQim8VHVaBGU}a`rDmHnGf&rL*uAl>^#T50xw7VjN
zUk2qbS2PEUKUCBdcrVYu0Mr`_qP@Oe51JgPqzRU+RWb(Co0ar<Knh}+7#M;%I~jor
zL?$yTi-IL3l?}nPud*eW?u7F9Dnm4XRyG7{eht)o^2O|{V9hQn5X~_v5a;!(=nLqw
zK%4=htNed#oqR?`3vA*~6*Dkxq-p}DGgXbi^gLCFUoWbfg87_knqZsC85kH8j(8rQ
z{6RrPC?qwvASJU%uOOpfD<jx~$th~OVD(efbiwKqfG*>(@hbqU4@)g7&dkpPsdoUH
z0}9j6Y7j@NsDt%w4pCp8EvQnGky)&3mspezBnwiLb2jr#He=e{Fm*fE=3k5XY$w+}
zl;cUxFU>2_P)W<oNiCkP$i^tUdEdiGEtwn7x3W(wHZ6Ru)9$KZ6Op!-@xeo&8yMW3
Ge4PMUXOR#9

diff --git a/src/pharext/Packager.php b/src/pharext/Packager.php
index f5ccfb8..8b7ad22 100644
--- a/src/pharext/Packager.php
+++ b/src/pharext/Packager.php
@@ -187,7 +187,7 @@ class Packager implements Command
 			$source = $this->extract($source);
 			$this->cleanup[] = new Task\Cleanup($source);
 			
-			if ($this->args->pecl) {
+			if (!$this->args->git) {
 				$source = (new Task\PeclFixup($source))->run($this->verbosity());
 			}
 		}
@@ -208,6 +208,8 @@ class Packager implements Command
 				$this->source = new SourceDir\Git($source);
 			} elseif (is_file("$source/parext_package.php")) {
 				$this->source = include "$source/pharext_package.php";
+			} else {
+				$this->source = new SourceDir\Basic($source);
 			}
 
 			if (!$this->source instanceof SourceDir) {
diff --git a/src/pharext/SourceDir/Basic.php b/src/pharext/SourceDir/Basic.php
new file mode 100644
index 0000000..5d44941
--- /dev/null
+++ b/src/pharext/SourceDir/Basic.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace pharext\SourceDir;
+
+use pharext\Cli\Args;
+use pharext\SourceDir;
+
+use FilesystemIterator;
+use IteratorAggregate;
+use RecursiveDirectoryIterator;
+use RecursiveIteratorIterator;
+
+
+class Basic implements IteratorAggregate, SourceDir
+{
+	private $path;
+	
+	public function __construct($path) {
+		$this->path = $path;
+	}
+	
+	public function getBaseDir() {
+		return $this->path;
+	}
+	
+	public function getPackageInfo() {
+		return [];
+	}
+	
+	public function getArgs() {
+		return [];
+	}
+	
+	public function setArgs(Args $args) {
+	}
+	
+	public function getIterator() {
+		$rdi = new RecursiveDirectoryIterator($this->path,
+				FilesystemIterator::CURRENT_AS_SELF | // needed for 5.5
+				FilesystemIterator::KEY_AS_PATHNAME |
+				FilesystemIterator::SKIP_DOTS);
+		$rii = new RecursiveIteratorIterator($rdi,
+				RecursiveIteratorIterator::CHILD_FIRST);
+		return $rii;
+		foreach ($rii as $path => $child) {
+			if (!$child->isDir()) {
+				#yield $path;
+			}
+		}
+	}
+}
diff --git a/src/pharext/Task/PeclFixup.php b/src/pharext/Task/PeclFixup.php
index b237771..33eb889 100644
--- a/src/pharext/Task/PeclFixup.php
+++ b/src/pharext/Task/PeclFixup.php
@@ -33,8 +33,11 @@ class PeclFixup implements Task
 		}
 		$dirs = glob("{$this->source}/*", GLOB_ONLYDIR);
 		$files = array_diff(glob("{$this->source}/*"), $dirs);
+		$check = array_reduce($files, function($r, $v) {
+			return $v && fnmatch("package*.xml", basename($v));
+		}, true);
 
-		if (count($dirs) !== 1 || !count($files)) {
+		if (count($dirs) !== 1 || !$check) {
 			throw new Exception("Does not look like an extracted PECL dir: {$this->source}");
 		}
 
-- 
2.30.2