Merge pull request #8 from ifacesoft/composer

fixes

.travis.yml

@@ -13,7 +13,7 @@ before_script:
   - mysql -e "create database IF NOT EXISTS test;" -uroot
   - ./Bin/install.sh
   - wget http://getcomposer.org/composer.phar
-  - ./cli Ice:Composer_Update
+  - php composer.phar install
 
 script: ./cli Ice:Phpunit_Run
 

Source/Ice/Action/Composer/Update.php

@@ -11,6 +11,7 @@
 
 use Ice\Core\Action;
 use Ice\Core\Logger;
+use Ice\Core\Module;
 use Ice\Helper\Console;
 
 /**
@@ -70,7 +71,11 @@ class Composer_Update extends Action
     protected static function config()
     {
         return [
-            'view' => ['template' => '']
+            'view' => ['template' => ''],
+            'input' => [
+                'vendor' => ['default' => 'ifacesoft/composer'],
+                'command' => ['default' => '/bin/composer']
+            ]
         ];
     }
 
@@ -87,11 +92,12 @@ protected static function config()
      */
     public function run(array $input)
     {
+        $command = VENDOR_DIR . $input['vendor'] . $input['command'];
+
         Console::run([
             'cd ' . MODULE_DIR,
-            'php composer.phar self-update',
-            'php composer.phar clear-cache',
-            'php composer.phar update --prefer-source'
+            'php ' . $command . ' clear-cache',
+            'php ' . $command . ' update --prefer-source'
         ]);
     }
 }

Source/Ice/Helper/Console.php

@@ -181,10 +181,10 @@ public static function run($commands, $toDevNull = false)
         $commandString = '';
 
         foreach ((array)$commands as $command) {
-            $commandString .= $command . ' && ';
+            $commandString .= $command . ' && \\' . "\n";
         }
 
-        $commandString = substr($commandString, 0, -4);
+        $commandString = substr($commandString, 0, -5);
 
         if ($toDevNull) {
             $commandString .= ' > /dev/null 2>&1';

bootstrap.php

@@ -5,7 +5,7 @@
 
     define('MODULE_DIR', __DIR__ . '/');
     define('MODULE_CONFIG_PATH', 'Config/Ice/Core/Module.php');
-    define('VENDOR_DIR', dirname(MODULE_DIR) . '/_vendor/Ice/');
+    define('VENDOR_DIR', dirname(MODULE_DIR) . '/_vendor/');
 
     $loader = require VENDOR_DIR . 'autoload.php';
 

composer.json

@@ -13,15 +13,16 @@
     }
   ],
   "config": {
-    "vendor-dir": "../_vendor/Ice/"
+    "vendor-dir": "../_vendor/"
   },
   "autoload": {
     "psr-4": {"Ice\\": "Source/Ice/"}
   },
   "require": {
     "php": ">=5.5",
     "twig/twig": "1.*",
-    "smarty/smarty": "3.1.*"
+    "smarty/smarty": "3.1.*",
+    "ifacesoft/composer": "dev-master"
   },
   "require-dev": {
     "firephp/firephp-core": "dev-master",