Merge pull request #36 from php-school/time-server-run

Allow TimeServer exercise to work in run mode

Author: AydinHassan

composer.lock

@@ -10,6 +10,7 @@
 use PhpSchool\PhpWorkshop\Exercise\ExerciseInterface;
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
+use PhpSchool\PhpWorkshop\Output\OutputInterface;
 use PhpSchool\PhpWorkshop\Result\Failure;
 use PhpSchool\PhpWorkshop\Result\StdOutFailure;
 use PhpSchool\PhpWorkshop\Result\Success;
@@ -63,15 +64,14 @@ public function configure(ExerciseDispatcher $exerciseDispatcher)
     {
         $eventDispatcher = $exerciseDispatcher->getEventDispatcher();
 
-        $eventDispatcher->listen('cli.verify.solution-execute.pre', function (CliExecuteEvent $event) {
+        $appendArgsListener = function (CliExecuteEvent $event) {
             $event->appendArg('127.0.0.1');
             $event->appendArg($this->getRandomPort());
-        });
+        };
 
-        $eventDispatcher->listen('cli.verify.user-execute.pre', function (CliExecuteEvent $event) {
-            $event->appendArg('127.0.0.1');
-            $event->appendArg($this->getRandomPort());
-        });
+        $eventDispatcher->listen('cli.verify.solution-execute.pre', $appendArgsListener);
+        $eventDispatcher->listen('cli.verify.user-execute.pre', $appendArgsListener);
+        $eventDispatcher->listen('cli.run.user-execute.pre', $appendArgsListener);
 
         $eventDispatcher->listen('cli.verify.solution.executing', function (CliExecuteEvent $event) {
             $args   = $event->getArgs()->getArrayCopy();
@@ -114,6 +114,24 @@ public function configure(ExerciseDispatcher $exerciseDispatcher)
             }
             return new Success($this->getName());
         });
+
+        $eventDispatcher->listen('cli.run.executing', function (CliExecuteEvent $event) {
+            /** @var OutputInterface $output */
+            $output = $event->getParameter('output');
+            $args   = $event->getArgs()->getArrayCopy();
+            $client = $this->socketFactory->createClient(...$args);
+
+            //wait for server to boot
+            usleep(100000);
+
+            $client->connect();
+            $out = $client->readAll();
+
+            //wait for shutdown
+            usleep(100000);
+
+            $output->write($out);
+        });
     }
 
     /**

src/Exercise/TimeServer.php

@@ -3,10 +3,13 @@
 
 namespace PhpSchool\LearnYouPhpTest\Exercise;
 
+use Colors\Color;
 use Faker\Factory;
 use Faker\Generator;
 use Hoa\Core\Exception\Exception;
 use Hoa\Socket\Client;
+use PhpSchool\CliMenu\Terminal\TerminalInterface;
+use PhpSchool\CliMenu\Terminal\UnixTerminal;
 use PhpSchool\LearnYouPhp\Exercise\ArrayWeGo;
 use PhpSchool\LearnYouPhp\Exercise\TimeServer;
 use PhpSchool\LearnYouPhp\TcpSocketFactory;
@@ -15,6 +18,7 @@
 use PhpSchool\PhpWorkshop\Exercise\ExerciseType;
 use PhpSchool\PhpWorkshop\ExerciseDispatcher;
 use PhpSchool\PhpWorkshop\Factory\RunnerFactory;
+use PhpSchool\PhpWorkshop\Output\StdOutput;
 use PhpSchool\PhpWorkshop\Result\Failure;
 use PhpSchool\PhpWorkshop\Result\StdOutFailure;
 use PhpSchool\PhpWorkshop\Result\Success;
@@ -112,4 +116,28 @@ public function testSuccessIsReturnedIfOutputIsCorrect()
         $success = iterator_to_array($results)[0];
         $this->assertInstanceOf(Success::class, $success);
     }
+
+    public function testRun()
+    {
+        $color = new Color;
+        $color->setForceStyle(true);
+        $output = new StdOutput($color, $terminal = $this->getMock(TerminalInterface::class));
+        
+        $outputRegEx  = "/\n";
+        $outputRegEx .= '\[1m\[4mArguments\[0m\[0m';
+        $outputRegEx .= "\n";
+        $outputRegEx .= '127.0.0.1, \d+';
+        $outputRegEx .= "\n";
+        $outputRegEx .= '\[1m\[4mOutput\[0m\[0m';
+        $outputRegEx .= "\n";
+        $outputRegEx .= '\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}';
+        $outputRegEx .= "\n/";
+        $this->expectOutputRegex($outputRegEx);
+
+        $this->exerciseDispatcher->run(
+            $this->exercise,
+            __DIR__ . '/../res/time-server/solution.php',
+            $output
+        );
+    }
 }