Added support for the **/xyz format in the properties file.

See issue #69.
Compiled new phar file with that functionality.

Author: Slavey Karadzhov

README.md

@@ -275,6 +275,11 @@ Notice about delimiters: Choose your delimiter wisely.
 * A delimiter should not be special character that is removed silently by your shell.
 * A delimiter should not be one of the characters that are already in the data.
 
+Deployment properties syntax
+============================
+In the `deployment.properties` file one can specify the files that will become part of the
+application or part of the deployment scripts.
+
 Feedback
 ========
 For questions and feedback write to slavey (at) zend DOT com.

bin/zs-client.phar

@@ -305,7 +305,7 @@ public function pack($sourceFolder, $destinationFolder=".", $fileName=null, arra
         $includeMap = array();
         if ($type == self::TYPE_LIBRARY) {
             // Include all files and folders for the library
-           $properties['appdir.includes'] = array_diff(scandir($sourceFolder), array('.','..','deployment.properties'));
+            $properties['appdir.includes'] = array_diff(scandir($sourceFolder), array('.','..','deployment.properties'));
             $appDir = '';
         }
         $includeMap['appdir'] = $this->getAppPaths($appDir, $properties['appdir.includes']);
@@ -325,8 +325,22 @@ public function pack($sourceFolder, $destinationFolder=".", $fileName=null, arra
                 $excludes = $properties[$type.'.excludes'];
             }
 
+            $excludedEndings = array();
+            foreach ($excludes as $exclude) {
+                $exclude = trim($exclude);
+                $exclude = rtrim($exclude, '/'); # no trailing slashes
+                if (strlen($exclude) == 0) {
+                    continue;
+                }
+                // We support **/<something> syntax. It means all entries ending with <something>
+                // will be excluded from the list of files
+                if (preg_match("/^\*\*\/(.*?)$/", $exclude, $matches)) {
+                    $excludedEndings[$matches[1]] = strlen($matches[1]);
+                }
+            }
+
             foreach ($paths as $localPath => $zpkPath) {
-                $this->addPathToZpk($zpk, $sourceFolder, $localPath, $zpkPath, $excludes);
+                $this->addPathToZpk($zpk, $sourceFolder, $localPath, $zpkPath, $excludes, $excludedEndings);
             }
         }
 
@@ -445,12 +459,17 @@ protected function fixZipPath($path)
      * @param string     $directory
      * @param string     $baseDir
      */
-    protected function addPathToZpk($zpk, $sourceFolder, $localPath, $zpkPath, $excludes = array())
+    protected function addPathToZpk($zpk, $sourceFolder, $localPath, $zpkPath, $excludes = array(), $excludedEndings=array())
     {
         $localPath = $this->normalizePath($localPath);
         if (in_array($localPath, $excludes)) {
             return;
         }
+        foreach ($excludedEndings as $exclude => $length) {
+            if (substr($localPath, -$length) === $exclude) {
+                return;
+            }
+        }
 
         $fullPath = $sourceFolder.'/'.$localPath;
         if (is_file($fullPath)) {
@@ -467,17 +486,26 @@ protected function addPathToZpk($zpk, $sourceFolder, $localPath, $zpkPath, $excl
 
         // we are dealing with directories
         $entries = scandir($fullPath);
-        if (count($entries) <= 2) {
+        // filter entries
+        foreach ($entries as $idx => $name) {
+            if (in_array($name, array('.','..'))) {
+                unset($entries[$idx]);
+                continue;
+            }
+
+            foreach ($excludedEndings as $exclude => $length) {
+                if ($name === $exclude) {
+                    unset($entries[$idx]);
+                }
+            }
+        }
+        if (count($entries) == 0) {
             $zpk->addEmptyDir($zpkPath);
             return;
         }
 
         foreach ($entries as $name) {
-            if (in_array($name, array('.','..'))) {
-                continue;
-            }
-
-            $this->addPathToZpk($zpk, $sourceFolder, $localPath.'/'.$name, $zpkPath.'/'.$name, $excludes);
+            $this->addPathToZpk($zpk, $sourceFolder, $localPath.'/'.$name, $zpkPath.'/'.$name, $excludes, $excludedEndings);
         }
     }