Merge branch 'feature/AddPostCloneCommandOption' into 'master'

[FEATURE] Add postClone option to the clone command The postClone option can either be an array or a string. The given commands are executed with the shell after the clone is finished. The the local FLOW_CONTEXT is added to the command so `./flow ...` can be used without specifying the context. See merge request !6
sitegeist · Mar 1, 2016 · 02f87a7 · 02f87a7
2 parents 3e542e5 + 6ec99b1
commit 02f87a7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 2 deletions.
diff --git a/Classes/Sitegeist/MagicWand/Command/AbstractCommandController.php b/Classes/Sitegeist/MagicWand/Command/AbstractCommandController.php
@@ -62,12 +62,23 @@ protected function executeLocalShellCommand($command, $arguments = [], $options
      * @param array $arguments
      * @param array $options
      */
-    protected function executeLocalFlowCommand($command, $arguments = [], $options = [])
+    protected function executeLocalShellCommandWithFlowContext($command, $arguments = [], $options = [])
     {
-        $flowCommand = 'FLOW_CONTEXT=' . $this->bootstrap->getContext() . ' ./flow ' . $command;
+        $flowCommand = sprintf('FLOW_CONTEXT=%s %s', $this->bootstrap->getContext(), $command);
         return $this->executeLocalShellCommand($flowCommand, $arguments, $options);
     }
 
+    /**
+     * @param string $commands
+     * @param array $arguments
+     * @param array $options
+     */
+    protected function executeLocalFlowCommand($command, $arguments = [], $options = [])
+    {
+        $flowCommand = sprintf('./flow %s', $command);
+        return $this->executeLocalShellCommandWithFlowContext($flowCommand, $arguments, $options);
+    }
+
     /**
      * @param $line
      */

diff --git a/Classes/Sitegeist/MagicWand/Command/CloneCommandController.php b/Classes/Sitegeist/MagicWand/Command/CloneCommandController.php
@@ -67,6 +67,7 @@ public function presetCommand($presetName, $yes = false, $keepDb = false)
                 $this->clonePresets[$presetName]['port'],
                 $this->clonePresets[$presetName]['path'],
                 $this->clonePresets[$presetName]['context'],
+                (isset($this->clonePresets[$presetName]['postClone']) ? $this->clonePresets[$presetName]['postClone'] : NULL),
                 $yes,
                 $keepDb
             );
@@ -84,6 +85,7 @@ public function presetCommand($presetName, $yes = false, $keepDb = false)
      * @param string $port ssh port
      * @param string $path path on the remote server
      * @param string $context flow_context on the remote server
+     * @param mixded $postClone command or array of commands to be executed after cloning
      * @param boolean $yes confirm execution without further input
      * @param boolean $keepDb skip dropping of database during sync
      */
@@ -93,6 +95,7 @@ public function remoteHostCommand(
         $port,
         $path,
         $context = 'Production',
+        $postClone = NULL,
         $yes = false,
         $keepDb = false
     ) {
@@ -240,6 +243,21 @@ public function remoteHostCommand(
         $this->outputHeadLine('Publish Resources');
         $this->executeLocalFlowCommand('resource:publish');
 
+        ##############
+        # Post Clone #
+        ##############
+
+        if ($postClone) {
+            $this->outputHeadLine('Execute post_clone commands');
+            if (is_array($postClone)) {
+                foreach($postClone as $postCloneCommand) {
+                    $this->executeLocalShellCommandWithFlowContext($postCloneCommand);
+                }
+            } else {
+                $this->executeLocalShellCommandWithFlowContext($postClone);
+            }
+        }
+
         #################
         # Final Message #
         #################