Merge pull request #10 from shopwareLabs/improve-output-formatting

improve output formatting
shopwareLabs · Nov 1, 2016 · ad90ddb · ad90ddb
2 parents da71f01 + 92e132a
commit ad90ddb
Showing 1 changed file with 11 additions and 16 deletions.
diff --git a/src/Application/ClimateLogger.php b/src/Application/ClimateLogger.php
@@ -69,36 +69,31 @@ public function finishScript(Script $script)
     public function logCommandStart(string $shellCommand, int $line, bool $isIgnoreError, int $index, int $max)
     {
         $index++;
-        $this->cliMate->yellow("\n({$index}/{$max}) Starting\n<bold>> {$shellCommand}</bold>");
+        $this->cliMate->yellow()->inline("\n({$index}/{$max}) Starting\n<bold>> {$shellCommand}</bold>\n\t");
     }
 
     /**
      * @param string $response
      */
     public function err(string $response)
     {
-        $lines = explode("\n", $response);
-
-        foreach ($lines as $line) {
-            $this->cliMate->red("\t$line");
-        }
+        $this->cliMate->red()->inline($this->formatOutput($response));
     }
 
     /**
      * @param string $response
      */
     public function out(string $response)
     {
-        $lines = explode(PHP_EOL, $response);
-
-        foreach ($lines as $rowRaw) {
-            $row = trim($rowRaw);
-
-            if (!$row) {
-                continue;
-            }
+        $this->cliMate->green()->inline($this->formatOutput($response));
+    }
 
-            $this->cliMate->green("\t" . $row);
-        }
+    /**
+     * @param string $response
+     * @return string
+     */
+    private function formatOutput(string $response) :string
+    {
+        return str_replace(PHP_EOL, PHP_EOL . "\t", $response);
     }
 }