Merge pull request #145 from niels-nijens/composer-binary-install

Change installation of Composer binary to upload and self-update
accompli · May 4, 2016 · d94a02a · d94a02a
2 parents e9f7fab + 6be6cff
commit d94a02a
Show file tree

Hide file tree

Showing 4 changed files with 169 additions and 81 deletions.
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1,13 @@
+preset: symfony
+
+linting: true
+
+enabled:
+  - ordered_use
+
+disabled:
+  - unneeded_control_parentheses
+
+finder:
+  not-name:
+    - "*.phar"
diff --git a/src/Resources/Composer/composer.phar b/src/Resources/Composer/composer.phar
diff --git a/src/Task/ComposerInstallTask.php b/src/Task/ComposerInstallTask.php
@@ -67,37 +67,33 @@ public function onPrepareWorkspaceInstallComposer(WorkspaceEvent $event, $eventN
         $connection = $this->ensureConnection($host);
 
         $workspace = $event->getWorkspace();
-        if ($workspace instanceof Workspace) {
-            if ($connection->isFile($host->getPath().'/composer.phar') === false) {
-                $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Installing the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_IN_PROGRESS)));
-
-                $connection->changeWorkingDirectory($host->getPath());
-                $result = $connection->executeCommand('php -r "readfile(\'https://getcomposer.org/installer\');" | php');
-                if ($result->isSuccessful() && $connection->isFile($host->getPath().'/composer.phar')) {
-                    $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Installed the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_COMPLETED, 'output.resetLine' => true)));
-                } else {
-                    throw new TaskCommandExecutionException('Failed installing the Composer binary.', $result, $this);
-                }
-
-                $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::DEBUG, "{separator} Command output:{separator}\n{command.result}{separator}", $eventName, $this, array('command.result' => $result->getOutput(), 'separator' => "\n=================\n")));
-            } else {
-                $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Updating the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_IN_PROGRESS)));
+        if ($workspace instanceof Workspace === false) {
+            throw new TaskRuntimeException('The workspace of the host has not been created.', $this);
+        }
 
-                $connection->changeWorkingDirectory($host->getPath());
-                $result = $connection->executeCommand('php composer.phar self-update');
-                if ($result->isSuccessful()) {
-                    $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Updated the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_COMPLETED, 'output.resetLine' => true)));
-                } else {
-                    $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::WARNING, 'Failed updating the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_FAILED)));
-                }
+        if ($connection->isFile($host->getPath().'/composer.phar') === false) {
+            $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Installing the Composer binary...', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_IN_PROGRESS)));
 
-                $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::DEBUG, "{separator} Command output:{separator}\n{command.result}{separator}", $eventName, $this, array('command.result' => $result->getOutput(), 'separator' => "\n=================\n")));
+            $connection->changeWorkingDirectory($host->getPath());
+            $connection->putFile(__DIR__.'/../Resources/Composer/composer.phar', $host->getPath().'/composer.phar');
+            if ($connection->isFile($host->getPath().'/composer.phar')) {
+                $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Installed the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_COMPLETED, 'output.resetLine' => true)));
+            } else {
+                throw new TaskRuntimeException('Failed installing the Composer binary.', $this);
             }
+        }
 
-            return;
+        $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Updating the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_IN_PROGRESS)));
+
+        $connection->changeWorkingDirectory($host->getPath());
+        $result = $connection->executeCommand('php composer.phar self-update');
+        if ($result->isSuccessful()) {
+            $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::INFO, 'Updated the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_COMPLETED, 'output.resetLine' => true)));
+        } else {
+            $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::WARNING, 'Failed updating the Composer binary.', $eventName, $this, array('event.task.action' => TaskInterface::ACTION_FAILED)));
         }
 
-        throw new TaskRuntimeException('The workspace of the host has not been created.', $this);
+        $eventDispatcher->dispatch(AccompliEvents::LOG, new LogEvent(LogLevel::DEBUG, "{separator} Command output:{separator}\n{command.result}{separator}", $eventName, $this, array('command.result' => $result->getOutput(), 'separator' => "\n=================\n")));
     }
 
     /**