bug fixed: group command ailas

new: add some symbol char classes

Author: inhere

examples/Controllers/HomeController.php

@@ -11,6 +11,7 @@
 use Inhere\Console\Components\Style\LiteStyle;
 use Inhere\Console\Utils\Helper;
 use Inhere\Console\Utils\Interact;
+use Inhere\Console\Utils\ProcessUtil;
 use Inhere\Console\Utils\ProgressBar;
 use Inhere\Console\Utils\Show;
 
@@ -54,7 +55,7 @@ protected function init()
 
     protected function afterExecute()
     {
-        $this->write('after command execute');
+        // $this->write('after command execute');
     }
 
     /**
@@ -98,6 +99,14 @@ public function defArgCommand()
         $this->output->dump($this->input->getArgs(), $this->input->getOpts(), $this->input->getBoolOpt('y'));
     }
 
+    /**
+     * dump current env information
+     */
+    public function dumpEnvCommand()
+    {
+        $this->output->aList($_SERVER, '$_SERVER data');
+    }
+
     /**
      * a example for highlight code
      * @options
@@ -138,6 +147,25 @@ public function colorCommand()
         return 0;
     }
 
+    /**
+     * check color support for current env.
+     */
+    public function colorCheckCommand()
+    {
+        // $char= '❤';
+        // $ret = ProcessUtil::run('echo ❤');
+        // var_dump($ret, trim($ret[1]), $char === trim($ret[1]));
+        //
+        // die;
+
+        $this->output->aList([
+            'basic color output?' => Helper::supportColor() ? '<info>Y</info>' : 'N',
+            'ansi char output?' => Helper::isAnsiSupport() ? 'Y' : 'N',
+            '256 color output?' => Helper::isSupport256Color() ? 'Y' : 'N',
+            'font symbol output?' => Helper::isSupport256Color() ? 'Y' : 'N',
+        ], 'color support check');
+    }
+
     /**
      * a example for use color text output by LiteStyle::class
      */

examples/Controllers/ProcessController.php

@@ -73,6 +73,8 @@ public function runScriptCommand()
 
             echo "command returned $retVal\n";
         }
+
+        ProcessUtil::run();
     }
 
     /**

src/Application.php

@@ -282,6 +282,7 @@ protected function dispatch(string $name)
         if (strpos($realName, $sep) > 0) {
             $input = array_values(array_filter(explode($sep, $realName)));
             list($realName, $action) = \count($input) > 2 ? array_splice($input, 2) : $input;
+            $realName = $this->getRealCommandName($realName);
         }
 
         if ($this->isController($realName)) {

src/BuiltIn/PharController.php

@@ -28,6 +28,7 @@ class PharController extends Controller
      * @options
      *  --dir STRING        Setting the directory for packing.
      *                      - default is current work-dir.(<comment>{workDir}</comment>)
+     *  --fast BOOL         Fast build. only add modified files by <cyan>git status -s</cyan>
      *  --output STRING     Setting the output file name(<comment>app.phar</comment>)
      *  --refresh BOOL      Whether build vendor folder files on phar file exists(<comment>False</comment>)
      * @param  \Inhere\Console\IO\Input $in
@@ -38,21 +39,26 @@ public function packCommand($in, $out): int
     {
         $time = microtime(1);
         $workDir = $in->getPwd();
-        $dir = $in->getOpt('dir') ?: $workDir;
-        $pharFile = $workDir . '/' . $in->getOpt('output', 'app.phar');
 
+        $dir = $in->getOpt('dir') ?: $workDir;
         $cpr = $this->configCompiler($dir);
 
         $counter = null;
         $refresh = $in->boolOpt('refresh');
+        $pharFile = $workDir . '/' . $in->getOpt('output', 'app.phar');
+
+        // use fast build
+        if ($this->input->boolOpt('fast')) {
+            $cpr->setModifies($cpr->findChangedByGit());
+            $this->output->liteNote('Use fast build, will only pack changed or new files(from git status)');
+        }
 
         $out->liteInfo(
             "Now, will begin building phar package.\n from path: <comment>$workDir</comment>\n" .
             " phar file: <info>$pharFile</info>"
         );
 
         $out->info('Pack file to Phar: ');
-
         $cpr->onError(function ($error) {
             $this->output->warning($error);
         });
@@ -63,7 +69,6 @@ public function packCommand($in, $out): int
             });
         } else {
             $counter = Show::counterTxt('Handling ...', 'Done.');
-
             $cpr->onAdd(function () use($counter) {
                 $counter->send(1);
             });
@@ -72,6 +77,7 @@ public function packCommand($in, $out): int
         // packing ...
         $cpr->pack($pharFile, $refresh);
 
+        // end
         if ($counter) {
             $counter->send(-1);
         }
@@ -94,9 +100,8 @@ public function packCommand($in, $out): int
      */
     protected function configCompiler(string $dir): PharCompiler
     {
-        $cpr = new PharCompiler($dir);
-
         // config
+        $cpr = new PharCompiler($dir);
         $cpr
             // ->stripComments(false)
             ->setShebang(true)

src/BuiltIn/SelfUpdateCommand.php

@@ -45,7 +45,7 @@ class SelfUpdateCommand extends Command
      */
     protected function execute($input, $output)
     {
-        $this->version = $this->getApplication()->getVersion();
+        $this->version = $this->getApp()->getVersion();
         $parser = new VersionParser;
 
         /**

src/Utils/EmojiSymbol.php

@@ -0,0 +1,70 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2018-01-26
+ * Time: 9:33
+ */
+
+namespace Inhere\Console\Utils;
+
+/**
+ * Class EmojiSymbol
+ * @package Inhere\Console\Utils
+ */
+class EmojiSymbol
+{
+    const KEY = '🔑';
+    const BOX = '📦';
+    const GIFT = '🎁';
+    const CLOCK = '⏰';
+    const FLAG = '🚩';
+
+    const DOC = '📄';
+    const DIR = '📂';
+    const BOOK = '📔';
+
+    const TOOL = '🔧';
+    const GUN = '🔫';
+
+    const UP = '👍';
+    const DOWN = '👎';
+
+    const FIRE = '🔥';
+    const SNOW = '❄';
+    const WATER = '💧';
+    const FLASH = '⚡';
+
+    const HEART = '💖';
+
+    const SUC = '✅';
+    const FAIL = '❌';
+    const WAN = '❗';
+
+    const CAR = '🚕';
+
+    const TREE = '🌲';
+    const FLOWER = '🌺';
+
+    const PEAR = '🍐';
+    const APPLE = '🍎';
+
+    const ELEPHANT = '🐘';
+    const WHALE = '🐳';
+
+    const SUN = '🌞';
+    const STAR = '⭐';
+    const MOON = '🌜';
+
+    /**
+     * @return array
+     */
+    public static function getConstants(): array
+    {
+        $objClass = new \ReflectionClass(__CLASS__);
+
+        // 此处获取类中定义的全部常量 返回的是 [key=>value,...] 的数组
+        // key是常量名 value是常量值
+        return $objClass->getConstants();
+    }
+}

src/Utils/FontSymbol.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2018-01-26
+ * Time: 9:33
+ */
+
+namespace Inhere\Console\Utils;
+
+/**
+ * Class FontSymbol
+ * - 字体符号
+ * @package Inhere\Console\Utils
+ */
+class FontSymbol
+{
+    const OK = '✔';
+    const NO = '✘';
+    const PEN = '✎';
+    const HEART = '❤';
+
+    const UP = '';
+    const DOWN = '';
+    const LEFT = '';
+    const RIGHT = '';
+
+    const MALE = '♂';
+    const FEMALE = '♀';
+
+    /**
+     * @return array
+     */
+    public static function getConstants(): array
+    {
+        $objClass = new \ReflectionClass(__CLASS__);
+
+        return $objClass->getConstants();
+    }
+}

src/Utils/Helper.php

@@ -103,7 +103,7 @@ public static function supportColor(): bool
     /**
      * @return bool
      */
-    public function isSupport256Color(): bool
+    public static function isSupport256Color(): bool
     {
         return DIRECTORY_SEPARATOR === '/' && strpos(getenv('TERM'), '256color') !== false;
     }
@@ -113,7 +113,11 @@ public function isSupport256Color(): bool
      */
     public static function isAnsiSupport(): bool
     {
-        return getenv('ANSICON') === true || getenv('ConEmuANSI') === 'ON';
+        if (DIRECTORY_SEPARATOR === '\\') {
+            return getenv('ANSICON') === true || getenv('ConEmuANSI') === 'ON';
+        }
+
+        return true;
     }
 
     /**