output check in console as a table

OveD-php · Feb 13, 2017 · 2a2a8b5 · 2a2a8b5
1 parent 84dad98
commit 2a2a8b5
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 16 deletions.
diff --git a/src/Checks/HealthCheck.php b/src/Checks/HealthCheck.php
@@ -4,7 +4,7 @@
 
 abstract class HealthCheck
 {
-    private $error;
+    private $error = '';
     private $log = [];
 
     abstract public function run(): bool;

diff --git a/src/Commands/HealthCommand.php b/src/Commands/HealthCommand.php
@@ -4,10 +4,6 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Foundation\Bus\DispatchesJobs;
-use Timekit\Account;
-use Timekit\Filter;
-use Timekit\Jobs\DeleteUser as DeleteUserJob;
-use Timekit\User;
 use Vistik\HealthChecker;
 use Vistik\Utils\CheckList;
 
@@ -39,13 +35,11 @@ public function handle()
 
         $output = $checker->prettyPrint();
 
-        foreach ($output as $name => $passed) {
-            if ($passed) {
-                $this->info($name);
-                continue;
-            }
-            $this->error($name);
+        $rows = [];
+        foreach ($output as $o) {
+            $rows[] = [$o['check'], $o['passed'], $o['log'], $o['error']];
         }
+        $this->table(['check', 'status', 'log', 'error'], $rows);
 
         $checker->run();
     }

diff --git a/src/HealthChecker.php b/src/HealthChecker.php
@@ -40,11 +40,17 @@ public function prettyPrint()
         $output = [];
         /** @var HealthCheck $check */
         foreach ($this->list as $check) {
-            if (!$check->run()) {
-                $output[get_class($check) . ' failed!'] = false;
-                continue;
+            $passed = false;
+            if ($check->run()) {
+                $passed = true;
             }
-            $output[get_class($check) . ' ok!'] = true;
+
+            $output[] = [
+                'passed' => $passed,
+                'check'  => get_class($check),
+                'log'    => implode("\n", $check->getLog()),
+                'error'  => $check->getError()
+            ];
         }
 
         return $output;

diff --git a/tests/CommandTest.php b/tests/CommandTest.php
@@ -1,7 +1,9 @@
 <?php
 
+use Illuminate\Support\Facades\App;
 use Orchestra\Testbench\TestCase;
 use Vistik\Checks\DebugModeOff;
+use Vistik\Commands\HealthCommand;
 use Vistik\ServiceProvider\HealthCheckServiceProvider;
 
 class CommandTest extends TestCase
@@ -17,7 +19,7 @@ protected function getPackageProviders($app)
      * @expectedException Vistik\Exceptions\FailedHealthCheckException
      * @expectedExceptionMessage Failed health check: Vistik\Checks\DebugModeOff
      */
-    public function can_run_health_check_from_command_line()
+    public function running_health_check_from_command_line_will_throw_exception()
     {
         // Given
         $this->app['config']->set('app.debug', true);
@@ -29,4 +31,22 @@ public function can_run_health_check_from_command_line()
         // Then
 
     }
+
+    /**
+     * @test
+     * @group cli
+     */
+    public function can_run_health_check_from_command_line()
+    {
+        // Given
+        $this->app['config']->set('app.debug', false);
+        $this->app['config']->set('health.checks', [new DebugModeOff()]);
+
+        // When
+        $this->artisan('health:check');
+
+        // Then
+        $this->assertTrue(true);
+
+    }
 }