Separate timer initialization from result collection

Author: schmengler

recipe/timer.php

@@ -3,23 +3,15 @@
 
 namespace Deployer;
 
-use Deployer\Task\Task;
 use IntegerNet\DeployerTimer\DecorateAllTasks;
+use IntegerNet\DeployerTimer\ResultTaskFactory;
 use IntegerNet\DeployerTimer\TimerTaskDecorator;
 
-function timerCsv(string $fileName)
+function timer(): ResultTaskFactory
 {
     $deployer = Deployer::get();
     $decorateAllTasks = new DecorateAllTasks($deployer);
     $timer = new TimerTaskDecorator();
     $decorateAllTasks->with($timer);
-    $tasks = $deployer->tasks->toArray();
-    /** @var Task $lastTask */
-    $lastTask = array_pop($tasks);
-    $collectResultTask = uniqid('timer_result-', true);
-    task(
-        $collectResultTask, function() use ($timer, $fileName) {
-        file_put_contents($fileName, $timer->resultsAsCsv());
-    });
-    after($lastTask->getName(), $collectResultTask);
-}
+    return new ResultTaskFactory($deployer, $timer);
+}

src/ResultTaskFactory.php

@@ -0,0 +1,36 @@
+<?php
+declare(strict_types=1);
+
+namespace IntegerNet\DeployerTimer;
+
+use Deployer\Deployer;
+use Deployer\Task\Task;
+
+class ResultTaskFactory
+{
+    /**
+     * @var TimerTaskDecorator
+     */
+    private $timer;
+    /**
+     * @var Deployer
+     */
+    private $deployer;
+
+    public function __construct(Deployer $deployer, TimerTaskDecorator $timer)
+    {
+        $this->deployer = $deployer;
+        $this->timer = $timer;
+    }
+
+    public function createCsvResultTask($fileName): string
+    {
+        $taskName = uniqid('timer_result-', true);
+        $taskBody = function () use ($fileName) {
+            file_put_contents($fileName, $this->timer->resultsAsCsv());
+        };
+        $this->deployer->tasks->set($taskName, new Task($taskName, $taskBody));
+
+        return $taskName;
+    }
+}

tests/RecipeTest.php

@@ -3,9 +3,7 @@
 
 namespace IntegerNet\DeployerTimer;
 
-use Deployer\Deployer;
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\Process\Process;
 
 class RecipeTest extends TestCase
 {
@@ -31,7 +29,7 @@ protected function tearDown(): void
         }
     }
 
-    public function testTimer()
+    public function testTimerWithCsvResult()
     {
         $recipeFile = __DIR__ . '/../recipe/timer.php';
         $csvFile = $this->createTmpFile();
@@ -45,7 +43,7 @@ public function testTimer()
 
 task('test', function() { writeln('Test Output');});
 
-timerCsv('{$csvFile}');
+after('test', timer()->createCsvResultTask('{$csvFile}'));
 PHP
         );
         exec('vendor/bin/dep --file=' . $this->deployFile . ' test', $output);