From e01fbc6151f7f52f988d1c03b4fbfec19e785fa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9s=20Monta=C3=B1ez?= <andresmontanez@gmail.com>
Date: Thu, 12 Jun 2014 17:42:47 -0300
Subject: [PATCH] Review and rework Composer tasks.

---
 .../BuiltIn/Composer/GenerateAutoload.php     | 40 -------------------
 .../BuiltIn/Composer/GenerateAutoloadTask.php | 30 ++++++++++++++
 Mage/Task/BuiltIn/Composer/InstallTask.php    | 30 ++++++++++++++
 .../.mage/config/environment/staging.yml      |  2 +-
 4 files changed, 61 insertions(+), 41 deletions(-)
 delete mode 100644 Mage/Task/BuiltIn/Composer/GenerateAutoload.php
 create mode 100644 Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php
 create mode 100644 Mage/Task/BuiltIn/Composer/InstallTask.php

diff --git a/Mage/Task/BuiltIn/Composer/GenerateAutoload.php b/Mage/Task/BuiltIn/Composer/GenerateAutoload.php
deleted file mode 100644
index 00ae10a..0000000
--- a/Mage/Task/BuiltIn/Composer/GenerateAutoload.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-namespace Mage\Task\BuiltIn\Composer;
-
-use Exception;
-use Mage\Task\AbstractTask;
-use Mage\Task\ErrorWithMessageException;
-use Mage\Task\SkipException;
-
-class GenerateAutoload extends AbstractTask
-{
-    /**
-     * Returns the Title of the Task
-     * @return string
-     */
-    public function getName()
-    {
-        return 'Generating autoload files via composer [built-in]';
-    }
-
-    /**
-     * Runs the task
-     *
-     * @return boolean
-     * @throws Exception
-     * @throws ErrorWithMessageException
-     * @throws SkipException
-     */
-    public function run()
-    {
-        $releasesDirectory = $this->getConfig()->release('directory', 'releases');
-        $releasesDirectory = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $releasesDirectory;
-        $currentCopy = $releasesDirectory . '/' . $this->getConfig()->getReleaseId();
-
-        $sharedFolderName = $this->getParameter('shared', 'shared');
-        $sharedFolderName = rtrim($this->getConfig()->deployment('to'), '/') . '/' . $sharedFolderName;
-
-        $composerPath = $this->getParameter('composer', "$sharedFolderName/composer.phar");
-        return $this->runCommandRemote("/usr/bin/env php $composerPath --working-dir=$currentCopy dumpautoload --optimize", $output);
-    }
-}
diff --git a/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php b/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php
new file mode 100644
index 0000000..fbb730d
--- /dev/null
+++ b/Mage/Task/BuiltIn/Composer/GenerateAutoloadTask.php
@@ -0,0 +1,30 @@
+<?php
+namespace Mage\Task\BuiltIn\Composer;
+
+use Mage\Task\AbstractTask;
+use Mage\Task\ErrorWithMessageException;
+
+class GenerateAutoloadTask extends AbstractTask
+{
+    /**
+     * Returns the Title of the Task
+     * @return string
+     */
+    public function getName()
+    {
+        return 'Generate autoload via Composer [built-in]';
+    }
+
+    /**
+     * Runs the task
+     *
+     * @return boolean
+     * @throws ErrorWithMessageException
+     */
+    public function run()
+    {
+        $composerPath = $this->getConfig()->general('composer_path', 'php composer.phar');
+
+        return $this->runCommand($composerPath . ' dumpautoload --optimize');
+    }
+}
diff --git a/Mage/Task/BuiltIn/Composer/InstallTask.php b/Mage/Task/BuiltIn/Composer/InstallTask.php
new file mode 100644
index 0000000..77395aa
--- /dev/null
+++ b/Mage/Task/BuiltIn/Composer/InstallTask.php
@@ -0,0 +1,30 @@
+<?php
+namespace Mage\Task\BuiltIn\Composer;
+
+use Mage\Task\AbstractTask;
+use Mage\Task\ErrorWithMessageException;
+
+class InstallTask extends AbstractTask
+{
+    /**
+     * Returns the Title of the Task
+     * @return string
+     */
+    public function getName()
+    {
+        return 'Install vendors via Composer [built-in]';
+    }
+
+    /**
+     * Runs the task
+     *
+     * @return boolean
+     * @throws ErrorWithMessageException
+     */
+    public function run()
+    {
+        $composerPath = $this->getConfig()->general('composer_path', 'php composer.phar');
+
+        return $this->runCommand($composerPath . ' install');
+    }
+}
diff --git a/docs/example-config/.mage/config/environment/staging.yml b/docs/example-config/.mage/config/environment/staging.yml
index 9facee7..5c1c51d 100644
--- a/docs/example-config/.mage/config/environment/staging.yml
+++ b/docs/example-config/.mage/config/environment/staging.yml
@@ -2,7 +2,7 @@
 deployment:
   user: root
   from: ./
-  to: /var/vvv
+  to: /var/www
   scm:
     branch: master
 releases: