Merge pull request #1444 from hydephp/fancy-serve-command

Fancy serve command hydephp/develop@1fafeb5

src/Console/Commands/ServeCommand.php

@@ -4,12 +4,15 @@
 
 namespace Hyde\Console\Commands;
 
+use Closure;
 use Hyde\Hyde;
 use Hyde\Facades\Config;
+use Hyde\RealtimeCompiler\ConsoleOutput;
 use Illuminate\Support\Facades\Process;
 use LaravelZero\Framework\Commands\Command;
 
 use function sprintf;
+use function class_exists;
 
 /**
  * Start the realtime compiler server.
@@ -26,7 +29,7 @@ class ServeCommand extends Command
 
     public function handle(): int
     {
-        $this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop');
+        $this->printStartMessage();
 
         $this->runServerProcess(sprintf('php -S %s:%d %s',
             $this->getHostSelection(),
@@ -54,8 +57,32 @@ protected function getExecutablePath(): string
 
     protected function runServerProcess(string $command): void
     {
-        Process::forever()->run($command, function (string $type, string $line): void {
+        Process::forever()->env($this->getEnvironmentVariables())->run($command, $this->getOutputHandler());
+    }
+
+    protected function getEnvironmentVariables(): array
+    {
+        return [
+            'HYDE_RC_REQUEST_OUTPUT' => ! $this->option('no-ansi'),
+        ];
+    }
+
+    protected function printStartMessage(): void
+    {
+        $this->useBasicOutput()
+            ? $this->line('<info>Starting the HydeRC server...</info> Press Ctrl+C to stop')
+            : ConsoleOutput::printStartMessage($this->getHostSelection(), $this->getPortSelection());
+    }
+
+    protected function getOutputHandler(): Closure
+    {
+        return $this->useBasicOutput() ? function (string $type, string $line): void {
             $this->output->write($line);
-        });
+        } : ConsoleOutput::getFormatter($this->output->isVerbose());
+    }
+
+    protected function useBasicOutput(): bool
+    {
+        return $this->option('no-ansi') || ! class_exists(ConsoleOutput::class);
     }
 }

tests/Feature/Commands/ServeCommandTest.php

@@ -24,7 +24,7 @@ protected function setUp(): void
 
     public function test_hyde_serve_command()
     {
-        $this->artisan('serve')
+        $this->artisan('serve --no-ansi')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -33,7 +33,7 @@ public function test_hyde_serve_command()
 
     public function test_hyde_serve_command_with_port_option()
     {
-        $this->artisan('serve --port=8081')
+        $this->artisan('serve --no-ansi --port=8081')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -42,7 +42,7 @@ public function test_hyde_serve_command_with_port_option()
 
     public function test_hyde_serve_command_with_host_option()
     {
-        $this->artisan('serve --host=foo')
+        $this->artisan('serve --no-ansi --host=foo')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -51,7 +51,7 @@ public function test_hyde_serve_command_with_host_option()
 
     public function test_hyde_serve_command_with_port_and_host_option()
     {
-        $this->artisan('serve --port=8081 --host=foo')
+        $this->artisan('serve --no-ansi --port=8081 --host=foo')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -62,7 +62,7 @@ public function test_hyde_serve_command_with_port_defined_in_config()
     {
         config(['hyde.server.port' => 8081]);
 
-        $this->artisan('serve')
+        $this->artisan('serve --no-ansi')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -73,7 +73,7 @@ public function test_hyde_serve_command_with_port_defined_in_config_and_port_opt
     {
         config(['hyde.server.port' => 8081]);
 
-        $this->artisan('serve --port=8082')
+        $this->artisan('serve --no-ansi --port=8082')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -84,7 +84,7 @@ public function test_hyde_serve_command_with_port_missing_in_config_and_port_opt
     {
         config(['hyde.server.port' => null]);
 
-        $this->artisan('serve --port=8081')
+        $this->artisan('serve --no-ansi --port=8081')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -95,7 +95,7 @@ public function test_hyde_serve_command_with_host_defined_in_config()
     {
         config(['hyde.server.host' => 'foo']);
 
-        $this->artisan('serve')
+        $this->artisan('serve --no-ansi')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -106,7 +106,7 @@ public function test_hyde_serve_command_with_host_defined_in_config_and_host_opt
     {
         config(['hyde.server.host' => 'foo']);
 
-        $this->artisan('serve --host=bar')
+        $this->artisan('serve --no-ansi --host=bar')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -117,7 +117,7 @@ public function test_hyde_serve_command_with_host_missing_in_config_and_host_opt
     {
         config(['hyde.server.host' => null]);
 
-        $this->artisan('serve --host=foo')
+        $this->artisan('serve --no-ansi --host=foo')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
 
@@ -129,7 +129,7 @@ public function test_hyde_serve_command_with_invalid_config_value()
         $this->expectException(TypeError::class);
         config(['hyde.server.port' => 'foo']);
 
-        $this->artisan('serve')
+        $this->artisan('serve --no-ansi')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->assertExitCode(0);
     }
@@ -141,6 +141,11 @@ public function test_hyde_serve_command_passes_through_process_output()
             ->withNoArgs()
             ->andReturnSelf();
 
+        Process::shouldReceive('env')
+            ->once()
+            ->with(['HYDE_RC_REQUEST_OUTPUT' => false])
+            ->andReturnSelf();
+
         Process::shouldReceive('run')
             ->once()
             ->withArgs(function (string $command, Closure $handle) {
@@ -150,12 +155,23 @@ public function test_hyde_serve_command_passes_through_process_output()
             })
             ->andReturnSelf();
 
-        $this->artisan('serve')
+        $this->artisan('serve --no-ansi')
             ->expectsOutput('Starting the HydeRC server... Press Ctrl+C to stop')
             ->expectsOutput('foo')
             ->assertExitCode(0);
     }
 
+    public function testWithFancyOutput()
+    {
+        Process::fake(['php -S localhost:8080 {$this->binaryPath()}' => 'foo']);
+
+        $this->artisan('serve')
+            ->expectsOutputToContain('HydePHP Realtime Compiler')
+            ->assertExitCode(0);
+
+        Process::assertRan("php -S localhost:8080 {$this->binaryPath()}");
+    }
+
     protected function binaryPath(): string
     {
         return Hyde::path('vendor/hyde/realtime-compiler/bin/server.php');