added event parameter to task runners;

ppaulis · ppaulis · commit 83aebe4c0ec5 · 2016-10-06T14:47:04.000+02:00
passing applicationPath to run() command
diff --git a/module/DeployAgent/src/Task/Runner/Command.php b/module/DeployAgent/src/Task/Runner/Command.php
@@ -10,6 +10,8 @@
 
 namespace Continuous\DeployAgent\Task\Runner;
 
+use Zend\EventManager\Event;
+
 /**
  * Command
  *
@@ -39,9 +41,11 @@ public function setCommand($command)
         return $this;
     }
     
-    public function run()
+    public function run(Event $e)
     {
-        passthru($this->getCommand(), $return);
+        $applicationPath = $e->getParam('applicationPath');
+        
+        passthru("cd $applicationPath && " . $this->getCommand(), $return);
         if ($return) {
             throw new Exception('The command exit with code ' . $return, Exception::BAD_EXIT_EXCEPTION);
         }
diff --git a/module/DeployAgent/src/Task/Runner/TaskRunnerInterface.php b/module/DeployAgent/src/Task/Runner/TaskRunnerInterface.php
@@ -10,6 +10,8 @@
 
 namespace Continuous\DeployAgent\Task\Runner;
 
+use Zend\EventManager\Event;
+
 /**
  * TaskRunnerInterface
  *
@@ -19,5 +21,5 @@
  */
 interface TaskRunnerInterface
 {
-    public function run();
+    public function run(Event $e);
 }
diff --git a/module/DeployAgent/src/Task/TaskManager.php b/module/DeployAgent/src/Task/TaskManager.php
@@ -279,13 +279,25 @@ public function activate(EventInterface $event)
             $this->loadConfig($configFile);
         }
 
-        $application->getEventManager()->trigger($application::EVENT_AFTER_INSTALL);
+        $application->getEventManager()->trigger(
+            $application::EVENT_AFTER_INSTALL,
+            null,
+            [
+                'applicationPath' => $application->getPath() . DIRECTORY_SEPARATOR . $build
+            ]
+        );
 
         if (file_exists($application->getPath() . DIRECTORY_SEPARATOR . 'current')) {
             unlink($application->getPath() . DIRECTORY_SEPARATOR . 'current');
         }
 
-        $application->getEventManager()->trigger($application::EVENT_BEFORE_ACTIVATE);
+        $application->getEventManager()->trigger(
+            $application::EVENT_BEFORE_ACTIVATE,
+            null,
+            [
+                'applicationPath' => $application->getPath() . DIRECTORY_SEPARATOR . $build
+            ]
+        );
 
         $message = 'Starting ' . $application->getName() . ' (' . $build . ')';
         $this->getLogger()->info($message);
@@ -295,7 +307,13 @@ public function activate(EventInterface $event)
             $application->getPath() . DIRECTORY_SEPARATOR . 'current'
         );
 
-        $application->getEventManager()->trigger($application::EVENT_AFTER_ACTIVATE);
+        $application->getEventManager()->trigger(
+            $application::EVENT_AFTER_ACTIVATE,
+            null,
+            [
+                'applicationPath' => $application->getPath() . DIRECTORY_SEPARATOR . $build
+            ]
+        );
 
         $message = $application->getName() . ' (' . $build . ') has successfully started';
         $this->getLogger()->info($message);

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@`
`10`	`10`
`11`	`11`	`namespace Continuous\DeployAgent\Task\Runner;`
`12`	`12`
	`13`	`+use Zend\EventManager\Event;`
	`14`	`+`
`13`	`15`	`/**`
`14`	`16`	`* Command`
`15`	`17`	`*`
`@@ -39,9 +41,11 @@ public function setCommand($command)`
`39`	`41`	`return $this;`
`40`	`42`	`}`
`41`	`43`
`42`		`- public function run()`
	`44`	`+ public function run(Event $e)`
`43`	`45`	`{`
`44`		`- passthru($this->getCommand(), $return);`
	`46`	`+ $applicationPath = $e->getParam('applicationPath');`
	`47`	`+`
	`48`	`+ passthru("cd $applicationPath && " . $this->getCommand(), $return);`
`45`	`49`	`if ($return) {`
`46`	`50`	`throw new Exception('The command exit with code ' . $return, Exception::BAD_EXIT_EXCEPTION);`
`47`	`51`	`}`