update some screenshots. begin prepare nofity components

Author: inhere

README.md

@@ -92,10 +92,12 @@ $app->run();
 
 然后在命令行里执行 `php examples/app`, 立即就可以看到如下输出了:
 
-!['output-commands-info'](images/example-app.png)
+!['app-command-list'](docs/screenshots/app-command-list.png)
 
 > `Independent Commands` 中的 demo 就是我们上面添加的命令
 
+- `[alias: ...]` 命令最后的alias 表明了此命令拥有的别名。 
+
 ## 添加命令
 
 添加命令的方式有三种
@@ -206,7 +208,7 @@ class HomeController extends Controller
 
 - 运行效果(by `php examples/app home`):
 
-![command-group-example](./images/example-for-group.png)
+![group-command-list](docs/screenshots/group-command-list.png)
 
 更多请查看 [examples](./examples) 中的示例代码和在目录下运行示例 `php examples/app` 来查看效果
 
@@ -429,7 +431,7 @@ while ($i <= $total) {
 }
 ```
 
-![show-progress](images/show-progress.png)
+![show-progress](docs/screenshots/progress-demo.png)
 
 ### 列表数据展示输出 
 

README_en.md

@@ -72,7 +72,7 @@ $app->run();
 
 now, you can see:
 
-!['output-commands-info'](images/example-app.png)
+!['app-command-list'](docs/screenshots/app-command-list.png)
 
 ## input
 

docs/screenshots/app-command-list.png

@@ -18,7 +18,7 @@
  */
 class HomeController extends Controller
 {
-    protected static $description = 'default command controller. there are some command usage examples(2)';
+    protected static $description = 'This is a demo command controller. there are some command usage examples(2)';
 
     /**
      * @return array
@@ -123,7 +123,7 @@ public function artFontCommand()
     }
 
     /**
-     * a counter example show. It is like progress txt, but no max value.
+     * dynamic notice message show: counterTxt. It is like progress txt, but no max value.
      * @example
      *  {script} {command}
      * @return int
@@ -146,6 +146,32 @@ public function counterCommand()
         return 0;
     }
 
+    /**
+     * dynamic notice message show: spinner
+     */
+    public function spinnerCommand()
+    {
+        $total = 5000;
+
+        while ($total--) {
+            Show::spinner();
+            usleep(100);
+        }
+    }
+
+    /**
+     * dynamic notice message show: pending
+     */
+    public function pendingCommand()
+    {
+        $total = 5000;
+
+        while ($total--) {
+            Show::spinner();
+            usleep(100);
+        }
+    }
+
     /**
      * a progress bar example show
      * @options
@@ -504,7 +530,7 @@ public function limitedAskCommand()
     }
 
     /**
-     * This is a demo for input password on command line. use: <magenta>Interact::askPassword()</magenta>
+     * This is a demo for input password. use: <magenta>Interact::askPassword()</magenta>
      * @usage {fullCommand}
      */
     public function pwdCommand()

docs/screenshots/group-command-list.png

@@ -11,14 +11,14 @@ $app = new \Inhere\Console\Application([
     'rootPath' => dirname(__DIR__),
 ]);
 
-$app->setLogoText('
-  _  _    ___  _  _
- | || |  / _ \| || |
- | || |_| | | | || |_
- |__   _| | | |__   _|
-    | | | |_| |  | |
-    |_|  \___/   |_|
-    ');
+$app->setLogo("
+     ________    ____   ___                ___            __  _
+    / ____/ /   /  _/  /   |  ____  ____  / (_)________ _/ /_(_)___  ____
+   / /   / /    / /   / /| | / __ \/ __ \/ / / ___/ __ `/ __/ / __ \/ __ \
+  / /___/ /____/ /   / ___ |/ /_/ / /_/ / / / /__/ /_/ / /_/ / /_/ / / / /
+  \____/_____/___/  /_/  |_/ .___/ .___/_/_/\___/\__,_/\__/_/\____/_/ /_/
+                          /_/   /_/
+", 'success');
 
 // require dirname(__DIR__) . '/boot/cli-services.php';
 

docs/screenshots/progress-demo.png

@@ -4,4 +4,102 @@
  * User: inhere
  * Date: 2017-12-21
  * Time: 10:02
- */
+ * @link https://github.com/dealnews/Console
+ */
+
+class Status
+{
+    public static function clearLine()
+    {
+        echo "\033[2K"; // delete the current line
+        echo "\r"; // return the cursor to the beginning of the line
+    }
+
+    /**
+     * Spinner that updates every call up to 4 per second
+     *
+     * .*.
+     */
+    public static function spinner()
+    {
+        static $spinner = 0;
+        static $mtime = null;
+
+        // static $chars = '-\|/';
+        static $chars = '-.*.-';
+
+        $now = microtime(true);
+        if (null === $mtime || ($mtime < $now - 0.1)) {
+            $mtime = $now;
+            self::clearLine();
+            echo $chars[$spinner];
+            $spinner++;
+
+            if ($spinner > strlen($chars) - 1) {
+                $spinner = 0;
+            }
+        }
+    }
+
+    /**
+     * Uses `stty` to hide input/output completely.
+     * @param boolean $hidden Will hide/show the next data. Defaults to true.
+     */
+    public static function hide($hidden = true)
+    {
+        system( 'stty ' . ( $hidden? '-echo' : 'echo' ) );
+    }
+
+    /**
+     * Prompts the user for input. Optionally masking it.
+     *
+     * @param   string  $prompt     The prompt to show the user
+     * @param   bool    $masked     If true, the users input will not be shown. e.g. password input
+     * @param   int     $limit      The maximum amount of input to accept
+     * @return  string
+     */
+    public static function prompt($prompt, $masked=false, $limit=100)
+    {
+        echo "$prompt: ";
+        if ($masked) {
+            `stty -echo`; // disable shell echo
+        }
+        $buffer = "";
+        $char = "";
+        $f = fopen('php://stdin', 'r');
+        while (strlen($buffer) < $limit) {
+            $char = fread($f, 1);
+            if ($char === "\n" || $char === "\r") {
+                break;
+            }
+            $buffer.= $char;
+        }
+        if ($masked) {
+            `stty echo`; // enable shell echo
+            echo "\n";
+        }
+        return $buffer;
+    }
+}
+
+Status::hide();
+echo 'Password: ';
+$input = fgets(STDIN);
+Status::hide(false);
+echo $input;
+die;
+$total = random_int(5000, 10000);
+for ($x=1; $x<=$total; $x++) {
+    Status::spinner();
+    usleep(50);
+}
+
+Status::clearLine();
+
+//
+// $answer = Status::prompt("What is the secret word?", 0);
+// if ($answer == "secret") {
+//     echo "Yay! You got it!";
+// } else {
+//     echo "Boo! That is wrong!";
+// }

examples/Controllers/HomeController.php

@@ -45,7 +45,7 @@ abstract class AbstractApplication implements ApplicationInterface
      * @var array
      */
     private $meta = [
-        'name' => 'My Console',
+        'name' => 'My Console Application',
         'debug' => false,
         'profile' => false,
         'version' => '0.5.1',
@@ -374,7 +374,7 @@ public function showVersionInfo($quit = true)
         }
 
         $this->output->aList([
-            "\n  <info>{$name}</info>, Version <comment>$version</comment>\n$logo",
+            "$logo\n  <info>{$name}</info>, Version <comment>$version</comment>\n",
             'System Info' => "PHP version <info>$phpVersion</info>, on <info>$os</info> system",
             'Application Info' => "Update at <info>$updateAt</info>, publish at <info>$publishAt</info>(current $date)",
         ], null, [
@@ -612,10 +612,15 @@ public function getLogoText()
 
     /**
      * @param string $logoTxt
+     * @param string|null $style
      */
-    public function setLogoText(string $logoTxt)
+    public function setLogo(string $logoTxt, string $style = null)
     {
         $this->meta['logoText'] = $logoTxt;
+        
+        if ($style) {
+            $this->meta['logoStyle'] = $style;
+        }
     }
 
     /**

examples/app

@@ -8,7 +8,6 @@
 
 namespace Inhere\Console\Components;
 
-use Inhere\Console\BuiltIn\ArtFonts\ArtFontsBlock;
 use Inhere\Console\Utils\Helper;
 use Inhere\Console\Utils\Show;
 
@@ -94,6 +93,18 @@ public function showInternal(string $name, array $opts = [])
         return $this->show($name, self::INTERNAL_GROUP, $opts);
     }
 
+    /**
+     * @param string $name
+     * @param string $group
+     * @return string
+     */
+    public function showItalic(string $name, string $group = null, array $opts = [])
+    {
+        $opts['type'] = 'italic';
+
+        return $this->show($name . '_italic', $group, $opts);
+    }
+
     /**
      * display the art font
      * @param string $name
@@ -155,58 +166,74 @@ public function font(string $name, string $group = null)
         return '';
     }
 
+
     /**
-     * @param string $name
      * @param string $group
-     * @return string
+     * @param string $path
+     * @return $this
      */
-    public function italic(string $name, string $group = null)
+    public function addGroup(string $group, string $path)
     {
-        return $this->font($name . '_italic', $group);
-    }
+        $group = trim($group, '_');
 
-    public function addFontsFromPath(string $path, string $group)
-    {
+        if (!$group || !is_dir($path)) {
+            return $this;
+        }
+
+        if (!isset($this->groups[$group])) {
+            $this->groups[$group] = $path;
+        }
 
+        return $this;
     }
 
     /**
-     * @param string $name
-     * @param string $file font file path
+     * @param string $group
+     * @param string $path
      * @return $this
      */
-    public function addFont(string $name, string $file)
+    public function setGroup(string $group, string $path)
     {
-        if (is_file($file) && ($txt = trim(file_get_contents($file)))) {
-            $this->fonts[$name] = $txt;
+        $group = trim($group, '_');
+
+        if (!$group || !is_dir($path)) {
+            return $this;
         }
 
+        $this->groups[$group] = $path;
+
         return $this;
     }
 
     /**
      * @param string $name
-     * @param string $content
+     * @param string $file font file path
+     * @param string|null $group
      * @return $this
      */
-    public function addFontContent(string $name, string $content)
+    public function addFont(string $name, string $file, string $group = null)
     {
-        if ($name && ($content = trim($content))) {
-            $this->fontContents[$name] = $content;
+        $group = $group ?: self::DEFAULT_GROUP;
+
+        if (is_file($file)) {
+            $info = pathinfo($file);
+            $ext = !empty($info['extension']) ? $info['extension'] : 'txt';
+
+            $this->fonts[$group][$name] = $info['dirname'] . '/' . $info['filename'] . '.' . $ext;
         }
 
         return $this;
     }
 
     /**
-     * @param string $name Named fonts path
-     * @param string $path fonts path
-     * @return ArtFont
+     * @param string $name
+     * @param string $content
+     * @return $this
      */
-    public function addPath(string $name, string $path)
+    public function addFontContent(string $name, string $content)
     {
-        if (file_exists($path)) {
-            $this->groups[$name] = $path;
+        if ($name && ($content = trim($content))) {
+            $this->fontContents[$name] = $content;
         }
 
         return $this;