Merge branch 'composer-advanced'

Author: Slavey Karadzhov

.gitignore

@@ -0,0 +1,3 @@
+composer.phar
+composer.lock
+vendor/

README.md

@@ -136,6 +136,29 @@ It will output the name of the newly created package file. You have to use this
 or update an existing application on Zend Server. If you want to use other name for
 the output file you can use the --name="{desired-zpk-name}" option.
 
+#### Composer Integration ####
+There is experimental integration with composer that allows you to download the dependant packages, as described in composer.json,
+download them and convert them to zpk files. The above command with composer integration will look like this
+
+```
+php bin/zs-client.php packZpk --folder="<folder-where-the-PHP-code-is>" \
+			      --destination="<folder-where-the-package-will-be-created>" \
+                              --composer
+```
+The result from the command will be list of packages in the order that they have to be installed (top first, bottom last). 
+Example:
+
+/tmp/zendframework.zend-stdlib-2.2.4.zpk
+/tmp/zendframework.zend-console-2.2.4.zpk
+/tmp/zendframework.zend-file-2.2.4.zpk
+/tmp/zendframework.zend-mvc-2.2.4.zpk
+/tmp/zendframework.zend-text-2.2.4.zpk
+/tmp/zendframework.zend-math-2.2.4.zpk
+/tmp/zendframework.zend-json-2.2.4.zpk
+/tmp/zendframework.zend-serializer-2.2.4.zpk
+/tmp/zenddevops.webapi-dev-dev.zpk
+/tmp/AddYourUniqueApplicationName-1.0.0.zpk
+
 ### Deploy Package
 Run the following command to install a package.
 ```
@@ -153,6 +176,22 @@ php bin/zs-client.php installApp --zpk="<location-of-the-zpk-file>" \
                                  --baseUri="<baseUri>" \
                                  --userParams="APPLICATION_ENV=staging&DB_TYPE=mysql"
 ```
+#### Deploy Multiple Packages
+If you use the composer integration then packZpk can create multiple packages, instead of one. Below is a suggestion how you can
+deploy these newly created packages in the correct order.
+
+```
+ZPKS=`php bin/zs-client.php packZpk --folder="<folder-where-the-PHP-code-is>" \
+			      	        --destination="<folder-where-the-package-will-be-created>" \
+	                                --composer`;
+
+for i in $ZPKS; do 
+	php bin/zs-client.php installApp --zpk="$i" \
+                                 --target="<the-name-of-the-target>" \
+                                 --baseUri="<baseUri>" \
+                                 --userParams="APPLICATION_ENV=staging&DB_TYPE=mysql"
+done;
+```
 
 HTTP tuning
 ============
@@ -171,6 +210,12 @@ php bin/zs-client.php getSystemInfo --target="<name-of-the-target> \
 In most cases the HTTPS access to your Zend Server will use self-signed certificate. 
 In order to instruct the client to accept the SSL certificate you can do the following.
 
+```
+php bin/zs-client.php getSystemInfo --target="<name-of-the-target> \
+                                    --http="sslverify=0" 
+
+```
+
 ### Combining Multiple HTTP options
 If you want to combine multiple HTTP options in the same request then you can format the value of the http parameter as a valid 
 HTTP query string. Request with timeout of 40 seconds and acceptance of self-signed certificates will look like this.

composer.json

@@ -22,11 +22,12 @@
 	"require" : {
 		"php" : ">=5.3.3",
 		"openlss/lib-array2xml" : "dev-master",
-		"zenddevops/webapi" : "dev-master"
+		"zenddevops/webapi" : "dev-master",
+                "mustangostang/spyc" : "dev-master"
 	},
 	"require-dev" : {
 		"phpunit/phpunit" : "3.7.*",
-		"zendframework/zendframework" : "2.*"
+		"zendframework/zendframework" : "2.2.*"
 	},
 	"autoload" : {
 		"psr-0" : {

module/Client/Module.php

@@ -114,7 +114,14 @@ public function postRoute (MvcEvent $event)
             $path = $services->get('path');
             foreach ($config['console']['router']['routes'][$routeName]['options']['files'] as $param) {
                 if ($value = $match->getParam($param)) {
-                    $match->setParam($param, $path->getAbsolute($value));
+                    if (!is_array($value)) {
+                        $match->setParam($param, $path->getAbsolute($value));
+                    } else {
+                        $newValue = array_map(function($v) use ($path) {
+                            return $path->getAbsolute($v);
+                        }, $value);
+                        $match->setParam($param,$newValue);
+                    }
                 }
             }
         }

module/Client/config/composer/post_stage.php

@@ -0,0 +1,30 @@
+<?php
+// Start: AutoGenerated from @ZendServerClient
+
+// Map back all composer env variables.
+foreach ($_ENV as $key=> $value) {
+    if (0 === ($pos = strpos($key, 'ZS_COMPOSER_'))) {
+        putenv(substr($key, $pos),$value);
+    }
+}
+
+###libLines###
+
+copy(__DIR__ . '/composer.json', getenv('ZS_APPLICATION_BASE_DIR') . '/composer.json');
+$cwd = getcwd();
+chdir(__DIR__);
+
+$phpBin = "/usr/local/zend/bin/php";
+if (defined('PHP_BINARY')) {
+    $phpBin = PHP_BINARY;
+}
+
+$command = 'post-install-cmd';
+if (getenv('ZS_PREVIOUS_APP_VERSION')) {
+    $command = 'post-update-cmd';
+}
+
+shell_exec("$phpBin composer.phar run-script $command -n -d " . getenv('ZS_APPLICATION_BASE_DIR'));
+unlink(getenv('ZS_APPLICATION_BASE_DIR') . '/composer.json ');
+chdir($cwd);
+// End: AutoGenerated from @ZendServerClient

module/Client/config/module.config.php

@@ -151,7 +151,7 @@
                             ),
                             'packZpk'   => array(
                                 'options' => array (
-                                    'route' => 'packZpk [--folder=] [--destination=] [--name=] [--version=]',
+                                    'route' => 'packZpk [--folder=] [--destination=] [--name=]  [--version=] [--composer] [--composer-options=] [--composer-dist-files=]',
                                     'defaults' => array (
                                         'controller' => 'webapi-zpk-controller',
                                         'action' => 'pack',
@@ -163,16 +163,21 @@
                                           array('--folder','Folder where the source code is located'),
                                           array('--destination','Folder in which to save the created ZPK file'),
                                           array('--name','The name of the package. If not provided the name will be constructed from the name of the application and its version.'),
-                                          array('--version','The version release of the package. The version release will be replace in deployment.xml before creating ZPK package.')
+                                          array('--version','The version release of the package. The version release will be replace in deployment.xml before creating ZPK package.'),
+                                          array('--composer','Enables experimental composer support.'),
+                                          array('--composer-options','Adds composer options when running composer'),
+                                          array('--composer-dist-files', 'Comma separated list of YAML .dist files containing user parameters.'),
+                                    ),
+                                    'arrays' => array(
+                                                'composer-dist-files',
                                     ),
                                     'files' => array(
-                                        'folder', 'destination'
+                                        'folder', 'destination','composer-dist-files',
                                     ),
                                     'no-target' => true,
                                     'group' => 'packaging'
                                 ),
                             ),
-
                             'installLib' => array (
                                 'options' => array (
                                     'route' => 'installLib --zpk= [--target=] [--zsurl=] [--zskey=] [--zssecret=] [--zsversion=]',
@@ -216,6 +221,8 @@
             'invokables' => array (
                 'zpk'  => 'Client\Service\ZpkInvokable',
                 'path' => 'Client\Service\PathInvokable',
+                'composer' => 'Client\Service\ComposerInvokable',
+                'Composer\File' => 'Client\Service\Composer\File',
              )
         ),