Merge pull request #4 from atoum/looper_interface

use looper interface

Author: jubianchi

classes/extension.php

@@ -37,13 +37,10 @@ public function __construct(atoum\configurator $configurator = null)
             $autoLoopHandler = function(\mageekguy\atoum\scripts\runner $script, $argument, $values) use ($configuration) {
                 $script->enableLoopMode();
 
-                $customPrompt = new prompt();
-                $customPrompt->setOutputWriter($script->getPrompt()->getOutputWriter());
-                $customPrompt->setInputReader($script->getPrompt()->getInputReader());
-                $customPrompt->setRunner($script->getRunner());
-                $customPrompt->setConfiguration($configuration);
-                $script->setPrompt($customPrompt);
+                $watcherStrategy = new scripts\runner\loopers\watcher($script);
+                $watcherStrategy->setConfiguration($configuration);
 
+                $script->setLooper($watcherStrategy);
             };
 
             $script

classes/prompt.php …asses/scripts/runner/loopers/watcher.phpclasses/prompt.php renamed to classes/scripts/runner/loopers/watcher.php classes/prompt.php renamed to classes/scripts/runner/loopers/watcher.php

@@ -1,36 +1,40 @@
 <?php
 
-namespace mageekguy\atoum\autoloop;
+namespace mageekguy\atoum\autoloop\scripts\runner\loopers;
 
 use Lurker\Event\FilesystemEvent;
 use Lurker\ResourceWatcher;
+use mageekguy\atoum\autoloop\configuration;
+use mageekguy\atoum\scripts\runner;
+use mageekguy\atoum\scripts\runner\looper;
 
-class prompt extends \mageekguy\atoum\script\prompt
+class watcher implements looper
 {
     /**
-     * @var \mageekguy\atoum\runner
+     * @var configuration
      */
-    protected $runner;
+    protected $configuration;
 
     /**
-     * @var configuration
+     * @var runner
      */
-    protected $configuration;
+    private $runner;
 
     /**
-     * @param string $message
-     *
-     * @return string
+     * @param runner $runner
      */
-    public function ask($message)
+    public function __construct(runner $runner)
     {
-        $runAgainText = "Press <Enter> to reexecute, press any other key and <Enter> to stop...";
-        if ($message != $runAgainText) {
-            return parent::ask($message);
-        }
+        $this->runner = $runner;
+    }
 
+    /**
+     * @return string
+     */
+    public function runAgain()
+    {
         /** @var \mageekguy\atoum\writers\std\out $outputWriter */
-        $outputWriter = $this->getOutputWriter();
+        $outputWriter = $this->runner->getOutputWriter();
 
         $watcher = new ResourceWatcher;
 
@@ -44,7 +48,7 @@ public function ask($message)
             $watcher->addListener($watchedFile, $onEvent);
         }
 
-        foreach ($this->getRunner()->getTestPaths() as $path) {
+        foreach ($this->runner->getRunner()->getTestPaths() as $path) {
             $watcher->track($path, $path);
             $watcher->addListener($path, $onEvent);
         }
@@ -56,22 +60,6 @@ public function ask($message)
         return '';
     }
 
-    /**
-     * @return \mageekguy\atoum\runner
-     */
-    public function getRunner()
-    {
-        return $this->runner;
-    }
-
-    /**
-     * @param $runner
-     */
-    public function setRunner($runner)
-    {
-        $this->runner = $runner;
-    }
-
     /**
      * @return configuration
      */

composer.json

@@ -17,7 +17,7 @@
         }
     },
     "require": {
-        "atoum/atoum": ">=2.5.0,<3.0",
+        "atoum/atoum": ">=2.6.0,<3.0",
         "henrikbjorn/lurker": ">=1.1,<2.0"
     }
 }