Merge pull request #52 from adhocore/develop

Develop

Author: adhocore

src/Helper/Normalizer.php

@@ -11,6 +11,7 @@
 
 namespace Ahc\Cli\Helper;
 
+use Ahc\Cli\Input\Option;
 use Ahc\Cli\Input\Parameter;
 
 /**
@@ -58,8 +59,8 @@ public function normalizeArgs(array $args): array
      */
     public function normalizeValue(Parameter $parameter, string $value = null)
     {
-        if (\is_bool($default = $parameter->default())) {
-            return !$default;
+        if ($parameter instanceof Option && $parameter->bool()) {
+            return !$parameter->default();
         }
 
         if ($parameter->variadic()) {

src/Helper/OutputHelper.php

@@ -211,8 +211,10 @@ public function showUsage(string $usage = null): self
         }
 
         $lines = \explode("\n", \str_replace(['<eol>', '<eol/>', '</eol>', "\r\n"], "\n", $usage));
-        foreach ($lines as &$pos) {
-            $pos = \strpos(\preg_replace('~<.*?>~', '', $pos), ' ##');
+        foreach ($lines as $i => &$pos) {
+            if (false === $pos = \strrpos(\preg_replace('~</?\w+/?>~', '', $pos), ' ##')) {
+                unset($lines[$i]);
+            }
         }
 
         $maxlen = \max($lines) + 4;

src/Input/Option.php

@@ -87,6 +87,6 @@ public function is(string $arg): bool
      */
     public function bool(): bool
     {
-        return \preg_match('/\-no|\-with/', $this->long) > 0;
+        return \preg_match('/\-no-|\-with-/', $this->long) > 0;
     }
 }

src/Output/Color.php

@@ -35,7 +35,7 @@ class Color
     const DARKGRAY = 100;
 
     /** @var string Cli format */
-    protected $format = "\033[:bold:;:fg:;:bg:m:text:\033[0m";
+    protected $format = "\033[:mod:;:fg:;:bg:m:txt:\033[0m";
 
     /** @var array Custom styles */
     protected static $styles = [];
@@ -50,7 +50,7 @@ class Color
      */
     public function comment(string $text, array $style = []): string
     {
-        return $this->line($text, ['bold' => 2] + $style);
+        return $this->line($text, ['mod' => 2] + $style);
     }
 
     /**
@@ -115,17 +115,17 @@ public function info(string $text, array $style = []): string
      */
     public function line(string $text, array $style = []): string
     {
-        $style += ['bg' => null, 'fg' => static::WHITE, 'bold' => 0];
+        $style += ['bg' => null, 'fg' => static::WHITE, 'bold' => 0, 'mod' => null];
 
         $format = $style['bg'] === null
             ? \str_replace(';:bg:', '', $this->format)
             : $this->format;
 
         $line = \strtr($format, [
-            ':bold:' => (int) $style['bold'],
-            ':fg:'   => (int) $style['fg'],
-            ':bg:'   => (int) $style['bg'] + 10,
-            ':text:' => $text,
+            ':mod:' => (int) ($style['mod'] ?? $style['bold']),
+            ':fg:'  => (int) $style['fg'],
+            ':bg:'  => (int) $style['bg'] + 10,
+            ':txt:' => $text,
         ]);
 
         return $line;
@@ -227,9 +227,13 @@ protected function parseCall(string $name, array $arguments): array
     {
         list($text, $style) = $arguments + ['', []];
 
-        if (\stripos($name, 'bold') !== false) {
-            $name   = \str_ireplace('bold', '', $name);
-            $style += ['bold' => 1];
+        $mods = ['bold' => 1, 'dim' => 2, 'italic' => 3, 'underline' => 4, 'flash' => 5];
+
+        foreach ($mods as $mod => $value) {
+            if (\stripos($name, $mod) !== false) {
+                $name   = \str_ireplace($mod, '', $name);
+                $style += ['bold' => $value];
+            }
         }
 
         if (!\preg_match_all('/([b|B|f|F]g)?([A-Z][a-z]+)([^A-Z])?/', $name, $matches)) {

tests/Helper/OutputHelperTest.php

@@ -109,6 +109,7 @@ public function test_show_usage()
             '<bold>  $0</end> <comment>-a apple</end> ## apple only<eol>',
             '<bold>  $0</end> <comment>-a apple -b ball</end> ## apple ball<eol>',
             'loooooooooooong text ## something<eol>',
+            'no shell comments<eol>',
             'short text ## something else<eol>',
         ]));
 
@@ -118,6 +119,7 @@ public function test_show_usage()
             '  test -a apple          # apple only',
             '  test -a apple -b ball  # apple ball',
             'loooooooooooong text     # something',
+            'no shell comments',
             'short text               # something else',
             '',
         ], $this->output());
@@ -128,7 +130,7 @@ public function test_show_usage()
     public function newHelper()
     {
         return new OutputHelper(new Writer(static::$ou, new class extends Color {
-            protected $format = ':text:';
+            protected $format = ':txt:';
         }));
     }
 

tests/Input/CommandTest.php

@@ -250,6 +250,8 @@ protected function newCommand(string $version = '0.0.1', string $desc = '', bool
     {
         $p = new Command('cmd', $desc, $allowUnknown, $app);
 
-        return $p->version($version);
+        return $p->version($version . \debug_backtrace()[1]['function'])->onExit(function () {
+            return false;
+        });
     }
 }