some update, add some art font

Author: inhere

README.md

@@ -4,12 +4,12 @@
 [![Php Version](https://img.shields.io/badge/php-%3E=7.0-brightgreen.svg?maxAge=2592000)](https://packagist.org/packages/inhere/console)
 [![Latest Stable Version](http://img.shields.io/packagist/v/inhere/console.svg)](https://packagist.org/packages/inhere/console)
 
-简洁、功能全面的php命令行应用库。提供控制台参数解析, 颜色风格输出, 用户信息交互, 特殊格式信息显示。
+简洁、功能全面的php命令行应用库。提供控制台参数解析, 命令运行，颜色风格输出, 用户信息交互, 特殊格式信息显示。
 
 > 无其他库依赖，可以方便的整合到任何已有项目中。
 
 - 功能全面的命令行的选项参数解析(命名参数，短选项，长选项 ...)
-- 命令行应用, 命令行的 `controller`, `command` 解析运行
+- 命令行应用, 命令行的 `controller`, `command` 解析运行。(支持命令别名)
 - 命令行中功能强大的 `input`, `output` 管理、使用
 - 消息文本的多种颜色风格输出支持(`info`, `comment`, `success`, `danger`, `error` ... ...)
 - 丰富的特殊格式信息显示(`section`, `panel`, `padding`, `help-panel`, `table`, `title`, `list`, `multiList`, `progressBar`)

examples/app

@@ -11,6 +11,15 @@ $app = new \Inhere\Console\Application([
     'rootPath' => dirname(__DIR__),
 ]);
 
+$app->setLogoText('
+  _  _    ___  _  _
+ | || |  / _ \| || |
+ | || |_| | | | || |_
+ |__   _| | | |__   _|
+    | | | |_| |  | |
+    |_|  \___/   |_|
+    ');
+
 // require dirname(__DIR__) . '/boot/cli-services.php';
 
 require __DIR__ . '/routes.php';

src/Application.php

@@ -82,6 +82,7 @@ public function addController(string $name, string $class = null)
 
     /**
      * @param array $controllers
+     * @throws \InvalidArgumentException
      */
     public function controllers(array $controllers)
     {
@@ -149,6 +150,7 @@ public function command(string $name, $handler = null, $option = null)
 
     /**
      * @param array $commands
+     * @throws \InvalidArgumentException
      */
     public function commands(array $commands)
     {
@@ -254,16 +256,14 @@ protected function dispatch($name)
     {
         $sep = $this->delimiter ?: ':';
 
-        //// is a command name
-
+        // maybe is a command name
         $realName = $this->getRealCommandName($name);
 
         if ($this->isCommand($realName)) {
             return $this->runCommand($realName, true);
         }
 
-        //// is a controller name
-
+        // maybe is a controller name
         $action = '';
 
         // like 'home:index'
@@ -282,19 +282,10 @@ protected function dispatch($name)
         if (true !== self::fire(self::ON_NOT_FOUND, [$this])) {
             $this->output->liteError("The console command '{$name}' not exists!");
 
-            // find similar command names by similar_text()
-            $similar = [];
             $commands = array_merge($this->getControllerNames(), $this->getCommandNames());
 
-            foreach ($commands as $command) {
-                similar_text($name, $command, $percent);
-
-                if (45 <= (int)$percent) {
-                    $similar[] = $command;
-                }
-            }
-
-            if ($similar) {
+            // find similar command names by similar_text()
+            if ($similar = Helper::findSimilar($name, $commands)) {
                 $this->write(sprintf("\nMaybe what you mean is:\n    <info>%s</info>", implode(', ', $similar)));
             } else {
                 $this->showCommandList(false);

src/Base/AbstractApplication.php

@@ -24,15 +24,6 @@ abstract class AbstractApplication implements ApplicationInterface
 {
     use InputOutputAwareTrait, SimpleEventTrait;
 
-    /**
-     * @var array
-     * [
-     *  0 => logo text,
-     *  1 => color style, // 'info'
-     * ]
-     */
-    private static $logoInfo;
-
     /** @var array */
     protected static $internalCommands = [
         'version' => 'Show application version information',
@@ -66,6 +57,9 @@ abstract class AbstractApplication implements ApplicationInterface
         // 'env' => 'pdt', // dev test pdt
         // 'charset' => 'UTF-8',
 
+        'logoText' => '',
+        'logoStyle' => 'info',
+
         // runtime stats
         '_stats' => [],
     ];
@@ -366,16 +360,21 @@ public function showHelpInfo($quit = true, string $command = null)
      */
     public function showVersionInfo($quit = true)
     {
+        $os = PHP_OS;
         $date = date('Y.m.d');
+        $logo = '';
         $name = $this->getMeta('name', 'Console Application');
         $version = $this->getMeta('version', 'Unknown');
         $publishAt = $this->getMeta('publishAt', 'Unknown');
         $updateAt = $this->getMeta('updateAt', 'Unknown');
         $phpVersion = PHP_VERSION;
-        $os = PHP_OS;
+
+        if ($logoTxt = $this->getLogoText()) {
+            $logo = Helper::wrapTag($logoTxt, $this->getLogoStyle());
+        }
 
         $this->output->aList([
-            "\n  <info>{$name}</info>, Version <comment>$version</comment>\n",
+            "\n  <info>{$name}</info>, Version <comment>$version</comment>\n$logo",
             '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, [
@@ -606,49 +605,33 @@ public function isCommand($name)
     /**
      * @return string|null
      */
-    public static function getLogoTxt()
+    public function getLogoText()
     {
-        return self::$logoInfo[0] ?? null;
+        return $this->meta['logoText'] ?? null;
     }
 
     /**
      * @param string $logoTxt
      */
-    public static function setLogoTxt(string $logoTxt)
+    public function setLogoText(string $logoTxt)
     {
-        self::$logoInfo[0] = $logoTxt;
+        $this->meta['logoText'] = $logoTxt;
     }
 
     /**
      * @return string|null
      */
-    public static function getLogoStyle()
+    public function getLogoStyle()
     {
-        return self::$logoInfo[1] ?? 'info';
+        return $this->meta['logoStyle'] ?? 'info';
     }
 
     /**
      * @param string $style
      */
-    public static function setLogoStyle(string $style)
-    {
-        self::$logoInfo[1] = $style;
-    }
-
-    /**
-     * @return array
-     */
-    public static function getLogoInfo(): array
-    {
-        return self::$logoInfo;
-    }
-
-    /**
-     * @param array $logoInfo
-     */
-    public static function setLogoInfo(array $logoInfo)
+    public function setLogoStyle(string $style)
     {
-        self::$logoInfo = $logoInfo;
+        $this->meta['logoStyle'] = $style;
     }
 
     /**

src/BuiltIn/ArtFonts/ArtFontsBlock.php

@@ -0,0 +1,79 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-12-20
+ * Time: 10:08
+ */
+
+namespace Inhere\Console\BuiltIn\ArtFonts;
+
+/**
+ * Class ArtFontsBlock
+ * @package Inhere\Console\BuiltIn\ArtFonts
+ */
+class ArtFontsBlock
+{
+    const SUCCESS = '
+    _____
+   / ____|
+  | (___  _   _  ___ ___ ___  ___ ___
+   \___ \| | | |/ __/ __/ _ \/ __/ __|
+   ____) | |_| | (_| (_|  __/\__ \__ \
+  |_____/ \____|\___\___\___||___/___/
+    ';
+
+    const ERROR = "
+   ______
+  |  ____|
+  | |__   _ __ _ __ ___  _ __
+  |  __| | '__| '__/ _ \| '__|
+  | |____| |  | | | (_) | |
+  |______|_|  |_|  \___/|_|
+    ";
+
+    const ERROR_404 = '
+   _  _    ___  _  _
+  | || |  / _ \| || |
+  | || |_| | | | || |_
+  |__   _| | | |__   _|
+     | | | |_| |  | |
+     |_|  \___/   |_|
+    ';
+
+    const ERROR_500 = '
+   _____  ___   ___
+  | ____|/ _ \ / _ \
+  | |__ | | | | | | |
+  |___ \| | | | | | |
+   ___) | |_| | |_| |
+  |____/ \___/ \___/
+    ';
+
+    const YES = '
+  __     __
+  \ \   / /
+   \ \_/ /__  ___
+    \   / _ \/ __|
+     | |  __/\__ \
+     |_|\___||___/
+    ';
+
+    const OK = '
+    ____  _
+   / __ \| |
+  | |  | | | __
+  | |  | | |/ /
+  | |__| |   <
+   \____/|_|\_\
+    ';
+
+    const NO = '
+   _   _
+  | \ | |
+  |  \| | ___
+  | . ` |/ _ \
+  | |\  | (_) |
+  |_| \_|\___/
+    ';
+}

src/BuiltIn/ArtFonts/ArtFontsItalic.php

@@ -0,0 +1,18 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017-12-20
+ * Time: 11:31
+ */
+
+namespace Inhere\Console\BuiltIn\ArtFonts;
+
+/**
+ * Class ArtFontsItalic
+ * @package Inhere\Console\BuiltIn\ArtFonts
+ */
+class ArtFontsItalic
+{
+
+}

src/BuiltIn/Resources/art-fonts/404.txt

@@ -1,6 +1,6 @@
- _  _    ___  _  _
- | || |  / _ \| || |
- | || |_| | | | || |_
- |__   _| | | |__   _|
-    | | | |_| |  | |
-    |_|  \___/   |_|
+   _  _    ___  _  _
+  | || |  / _ \| || |
+  | || |_| | | | || |_
+  |__   _| | | |__   _|
+     | | | |_| |  | |
+     |_|  \___/   |_|

src/BuiltIn/Resources/art-fonts/500.txt

@@ -0,0 +1,6 @@
+   _____  ___   ___
+  | ____|/ _ \ / _ \
+  | |__ | | | | | | |
+  |___ \| | | | | | |
+   ___) | |_| | |_| |
+  |____/ \___/ \___/

src/Components/ArtFont.php

@@ -8,6 +8,8 @@
 
 namespace Inhere\Console\Components;
 
+use Inhere\Console\BuiltIn\ArtFonts\ArtFontsBlock;
+
 /**
  * Class ArtFont
  * @package Inhere\Console\Components
@@ -26,6 +28,12 @@ class ArtFont
      */
     private $fonts = [];
 
+    /**
+     * @see ArtFontsBlock
+     * @var array
+     */
+    private $classFonts = [];
+
     /**
      * @return self
      */
@@ -99,4 +107,20 @@ public function setFonts(array $fonts)
             $this->addFont($name, $font);
         }
     }
+
+    /**
+     * @return array
+     */
+    public function getClassFonts(): array
+    {
+        return $this->classFonts;
+    }
+
+    /**
+     * @param array $classFonts
+     */
+    public function setClassFonts(array $classFonts)
+    {
+        $this->classFonts = $classFonts;
+    }
 }