Fixes consolidation#354: Use standard 7-bit ASCII characters for prom…

…pt in --no-ansi mode. Also disable the progress bar in --no-ansi mode, since this mode disables the cursor-moving sequences necessary for it to work right.
elmpp · Aug 1, 2016 · 45edbfd · 45edbfd
1 parent 628f807
commit 45edbfd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/Common/IO.php b/src/Common/IO.php
@@ -34,15 +34,23 @@ protected function getInput()
         return Robo::input();
     }
 
+    protected function decorationCharacter($nonDecorated, $decorated)
+    {
+        if (!$this->getOutput()->isDecorated() || (strncasecmp(PHP_OS, 'WIN', 3) == 0)) {
+            return $nonDecorated;
+        }
+        return $decorated;
+    }
+
     protected function say($text)
     {
-        $char = strncasecmp(PHP_OS, 'WIN', 3) == 0 ? '>' : '➜';
+        $char = $this->decorationCharacter('>', '➜');
         $this->writeln("$char  $text");
     }
 
     protected function yell($text, $length = 40, $color = 'green')
     {
-        $char = strncasecmp(PHP_OS, 'WIN', 3) == 0 ? ' ' : '➜';
+        $char = $this->decorationCharacter(' ', '➜');
         $format = "$char  <fg=white;bg=$color;options=bold>%s</fg=white;bg=$color;options=bold>";
         $text = str_pad($text, $length, ' ', STR_PAD_BOTH);
         $len = strlen($text) + 2;

diff --git a/src/Common/ProgressIndicator.php b/src/Common/ProgressIndicator.php
@@ -77,7 +77,7 @@ public function startProgressIndicator($totalSteps, $owner)
 
     public function autoShowProgressIndicator()
     {
-        if (($this->autoDisplayInterval < 0) || !isset($this->progressBar)) {
+        if (($this->autoDisplayInterval < 0) || !isset($this->progressBar) || !$this->output->isDecorated()) {
             return;
         }
         if ($this->autoDisplayInterval <= $this->getExecutionTime()) {

diff --git a/tests/unit/OutputTest.php b/tests/unit/OutputTest.php
@@ -32,8 +32,7 @@ protected function _before()
     public function testSay()
     {
         $this->say('Hello, world!');
-        $char = strncasecmp(PHP_OS, 'WIN', 3) == 0 ? '>' : '➜';
-        $this->guy->seeInOutput($char . '  Hello, world!');
+        $this->guy->seeInOutput('>  Hello, world!');
     }
 
     public function testAskReply()

diff --git a/tests/unit/RunnerTest.php b/tests/unit/RunnerTest.php
@@ -95,7 +95,7 @@ public function testRunnerTryArgs()
         $this->runner->execute($argv);
 
         $expected = <<<EOT
-➜  The parameters passed are:
+>  The parameters passed are:
 array (
   0 => 'a',
   1 => 'b',