Issue #25: NEPT-1105: Allow to define commands in runner.yml.dist

openeuropa · Jan 13, 2018 · 2de8d06 · 2de8d06
1 parent c49e4f8
commit 2de8d06
Show file tree

Hide file tree

Showing 24 changed files with 555 additions and 425 deletions.
diff --git a/bin/run b/bin/run
@@ -5,10 +5,11 @@ use Symfony\Component\Console\Input\ArgvInput;
 use EC\OpenEuropa\TaskRunner\TaskRunner;
 
 if (file_exists(__DIR__.'/../vendor/autoload.php')) {
-    require_once __DIR__.'/../vendor/autoload.php';
+    $classLoader = require __DIR__.'/../vendor/autoload.php';
 } elseif (file_exists(__DIR__.'/../../../autoload.php')) {
-    require_once __DIR__ . '/../../../autoload.php';
+    $classLoader = require __DIR__ . '/../../../autoload.php';
 }
 
-$statusCode = (new TaskRunner())->run();
-exit($statusCode);
+$runner = new TaskRunner();
+$runner->registerExternalCommands($classLoader);
+exit($runner->run());
diff --git a/config/commands/setup.yml b/config/commands/setup.yml
diff --git a/config/runner.yml b/config/runner.yml
@@ -4,7 +4,7 @@
 
 # Global Task Runner settings.
 runner:
-  bin-dir: "./vendor/bin"
+  bin_dir: "./vendor/bin"
 
 # Drupal-related setting values.
 # All default values below refers to Drupal 8.
@@ -75,3 +75,9 @@ github:
 
   # GitHub OAuth token.
   token: ~
+
+commands:
+  setup:behat:
+    - { task: "process", source: "behat.yml.dist", destination: "behat.yml" }
+  setup:phpunit:
+    - { task: "process", source: "phpunit.xml.dist", destination: "phpunit.xml" }
diff --git a/src/Commands/BaseCommands.php b/src/Commands/BaseCommands.php
@@ -2,23 +2,15 @@
 
 namespace EC\OpenEuropa\TaskRunner\Commands;
 
-use Consolidation\AnnotatedCommand\AnnotatedCommand;
-use Consolidation\AnnotatedCommand\AnnotationData;
 use Robo\Common\ConfigAwareTrait;
 use Robo\Common\IO;
 use Robo\Contract\ConfigAwareInterface;
 use Robo\Contract\IOAwareInterface;
 use Robo\Contract\BuilderAwareInterface;
-use League\Container\ContainerAwareInterface;
-use League\Container\ContainerAwareTrait;
 use Robo\Exception\TaskException;
 use Robo\LoadAllTasks;
-use Robo\Result;
 use Robo\Robo;
-use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
 
 /**
  * Class BaseCommands.
@@ -52,13 +44,7 @@ public function getConfigurationFile()
      */
     public function initializeRuntimeConfiguration(ConsoleCommandEvent $event)
     {
-        $workingDir = $event->getInput()->getOption('working-dir');
-
-        Robo::loadConfiguration([
-            $workingDir.'/runner.yml.dist',
-            $workingDir.'/runner.yml',
-            $this->getConfigurationFile(),
-        ], $this->getConfig());
+        Robo::loadConfiguration([$this->getConfigurationFile()], $this->getConfig());
     }
 
     /**
@@ -69,7 +55,7 @@ public function initializeRuntimeConfiguration(ConsoleCommandEvent $event)
      */
     protected function getBin($name)
     {
-        $filename = $this->getConfig()->get('runner.bin-dir').'/'.$name;
+        $filename = $this->getConfig()->get('runner.bin_dir').'/'.$name;
         if (!file_exists($filename) && !$this->isSimulating()) {
             throw new TaskException($this, "Executable '{$filename}' not found.");
         }

diff --git a/src/Commands/DrupalCommands.php b/src/Commands/DrupalCommands.php
@@ -3,26 +3,27 @@
 namespace EC\OpenEuropa\TaskRunner\Commands;
 
 use EC\OpenEuropa\TaskRunner\Contract\ComposerAwareInterface;
-use EC\OpenEuropa\TaskRunner\Traits\ComposerAwareTrait;
-use EC\OpenEuropa\TaskRunner\Traits\ConfigurationTokensTrait;
-use EC\OpenEuropa\TaskRunner\Traits\PathUtilitiesTrait;
+use EC\OpenEuropa\TaskRunner\Contract\FilesystemAwareInterface;
 use Robo\Exception\TaskException;
 use Symfony\Component\Console\Event\ConsoleCommandEvent;
-use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Yaml\Yaml;
+use EC\OpenEuropa\TaskRunner\Tasks as TaskRunnerTasks;
+use EC\OpenEuropa\TaskRunner\Traits as TaskRunnerTraits;
+use NuvoleWeb\Robo\Task as NuvoleWebTasks;
 
 /**
  * Class DrupalCommands.
  *
  * @package EC\OpenEuropa\TaskRunner\Commands
  */
-class DrupalCommands extends BaseCommands implements ComposerAwareInterface
+class DrupalCommands extends BaseCommands implements ComposerAwareInterface, FilesystemAwareInterface
 {
-    use ComposerAwareTrait;
-    use ConfigurationTokensTrait;
-    use PathUtilitiesTrait;
-    use \NuvoleWeb\Robo\Task\Config\Php\loadTasks;
+    use TaskRunnerTraits\ComposerAwareTrait;
+    use TaskRunnerTraits\ConfigurationTokensTrait;
+    use TaskRunnerTraits\FilesystemAwareTrait;
+    use TaskRunnerTasks\CollectionFactory\loadTasks;
+    use NuvoleWebTasks\Config\Php\loadTasks;
 
     /**
      * {@inheritdoc}
@@ -32,16 +33,6 @@ public function getConfigurationFile()
         return __DIR__.'/../../config/commands/drupal.yml';
     }
 
-    /**
-     * @param \Symfony\Component\Console\Input\InputInterface $input
-     *
-     * @hook init
-     */
-    public function init(InputInterface $input)
-    {
-        $this->getComposer()->setWorkingDir($input->getOption('working-dir'));
-    }
-
     /**
      * Command initialization.
      *
@@ -157,18 +148,9 @@ public function siteInstall(array $options = [
      */
     public function sitePostInstall()
     {
-        $commands = $this->getConfig()->get('drupal.post_install');
-        if (!empty($commands)) {
-            $taskStack = $this->taskExecStack();
-
-            foreach ($commands as $command) {
-                $taskStack->exec($command);
-            }
-
-            return $taskStack;
-        }
+        $tasks = $this->getConfig()->get('drupal.post_install');
 
-        return $this->taskExec('');
+        return $this->taskCollectionFactory($tasks);
     }
 
     /**
@@ -337,9 +319,8 @@ protected function setupSiteBuild($root, $symlinks = [])
 
         foreach ($symlinks as $symlink) {
             if (is_dir($symlink['from']) || $this->isSimulating()) {
-                $destination = $root.'/'.$symlink['to'];
-                $source = $this->walkPath($destination, $symlink['from']);
-                $collection->addTask($this->taskFilesystemStack()->symlink($source, $destination));
+                $source = $this->getFilesystem()->makePathRelative($symlink['from'], $symlink['to']);
+                $collection->addTask($this->taskFilesystemStack()->symlink($source, $root.'/'.$symlink['to']));
             }
         }
 

diff --git a/src/Commands/DynamicCommands.php b/src/Commands/DynamicCommands.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace EC\OpenEuropa\TaskRunner\Commands;
+
+use EC\OpenEuropa\TaskRunner\Tasks\CollectionFactory\loadTasks;
+
+/**
+ * Class DynamicCommands
+ *
+ * @package EC\OpenEuropa\TaskRunner\Commands
+ */
+class DynamicCommands extends BaseCommands
+{
+    use loadTasks;
+
+    /**
+     * @return \EC\OpenEuropa\TaskRunner\Tasks\CollectionFactory\CollectionFactory
+     */
+    public function runTasks()
+    {
+        $command = $this->input()->getArgument('command');
+        $tasks = $this->getConfig()->get("commands.{$command}");
+
+        return $this->taskCollectionFactory($tasks);
+    }
+}
diff --git a/src/Commands/SetupCommands.php b/src/Commands/SetupCommands.php
diff --git a/src/Contract/ComposerAwareInterface.php b/src/Contract/ComposerAwareInterface.php
@@ -18,6 +18,8 @@ public function getComposer();
 
     /**
      * @param \EC\OpenEuropa\TaskRunner\Services\Composer $composer
+     *
+     * @return $this
      */
     public function setComposer(Composer $composer);
 }
diff --git a/src/Contract/FilesystemAwareInterface.php b/src/Contract/FilesystemAwareInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace EC\OpenEuropa\TaskRunner\Contract;
+
+/**
+ * Interface FilesystemAwareTrait
+ *
+ * @package EC\OpenEuropa\TaskRunner\Contract
+ */
+interface FilesystemAwareInterface
+{
+    /**
+     * @return \Symfony\Component\Filesystem\Filesystem
+     */
+    public function getFilesystem();
+
+    /**
+     * @param \Symfony\Component\Filesystem\Filesystem $filesystem
+     *
+     * @return $this
+     */
+    public function setFilesystem($filesystem);
+}