rename some dir. begin refactoring run logic

inhere · inhere · commit c617af464a05 · 2019-02-19T22:45:32.000+08:00
diff --git a/src/AbstractApplication.php b/src/AbstractApplication.php
@@ -10,8 +10,8 @@
 
 use Inhere\Console\Component\ErrorHandler;
 use Inhere\Console\Component\Style\Style;
-use Inhere\Console\Face\ApplicationInterface;
-use Inhere\Console\Face\ErrorHandlerInterface;
+use Inhere\Console\Contract\ApplicationInterface;
+use Inhere\Console\Contract\ErrorHandlerInterface;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\InputInterface;
 use Inhere\Console\IO\Output;
diff --git a/src/AbstractCommand.php b/src/AbstractCommand.php
@@ -8,8 +8,8 @@
 
 namespace Inhere\Console;
 
-use Inhere\Console\Face\BaseCommandInterface;
-use Inhere\Console\Face\CommandInterface;
+use Inhere\Console\Contract\BaseCommandInterface;
+use Inhere\Console\Contract\CommandInterface;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\InputDefinition;
 use Inhere\Console\IO\Output;
diff --git a/src/Command.php b/src/Command.php
@@ -8,7 +8,7 @@
 
 namespace Inhere\Console;
 
-use Inhere\Console\Face\CommandInterface;
+use Inhere\Console\Contract\CommandInterface;
 
 /**
  * Class Command
diff --git a/src/Component/ErrorHandler.php b/src/Component/ErrorHandler.php
@@ -9,7 +9,7 @@
 namespace Inhere\Console\Component;
 
 use Inhere\Console\AbstractApplication;
-use Inhere\Console\Face\ErrorHandlerInterface;
+use Inhere\Console\Contract\ErrorHandlerInterface;
 use Toolkit\Cli\Highlighter;
 
 /**
diff --git a/src/Component/Progress/CounterText.php b/src/Component/Progress/CounterText.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Inhere\Console\Component\Notify;
+namespace Inhere\Console\Component\Progress;
 
 use Inhere\Console\Component\NotifyMessage;
 use Inhere\Console\Console;
-use Inhere\Library\Helpers\Cli;
+use Toolkit\Cli\Cli;
 
 /**
  * Class CounterText
- * @package Inhere\Console\Component\Notify
+ * @package Inhere\Console\Component\Progress
  */
 class CounterText extends NotifyMessage
 {
diff --git a/src/Component/Progress/DynamicText.php b/src/Component/Progress/DynamicText.php
@@ -1,14 +1,14 @@
 <?php
 
-namespace Inhere\Console\Component\Notify;
+namespace Inhere\Console\Component\Progress;
 
 use Inhere\Console\Component\NotifyMessage;
-use Inhere\Console\Component\Style\Style;
+use Inhere\Console\Console;
 use Toolkit\Cli\Cli;
 
 /**
  * Class DynamicText
- * @package Inhere\Console\Component\Notify
+ * @package Inhere\Console\Component\Progress
  */
 class DynamicText extends NotifyMessage
 {
@@ -25,11 +25,11 @@ public static function gen(string $doneMsg, string $fixedMsg = ''): \Generator
         $template = Cli::isSupportColor() ? "\x0D\x1B[2K" : "\x0D";
 
         if ($fixedMsg) {
-            $template .= Style::instance()->render($fixedMsg);
+            $template .= Console::style()->render($fixedMsg);
         }
 
         $template .= '%s';
-        $doneMsg  = $doneMsg ? Style::instance()->render($doneMsg) : '';
+        $doneMsg  = $doneMsg ? Console::style()->render($doneMsg) : '';
 
         while (true) {
             if ($finished) {
diff --git a/src/Component/Progress/Pending.php b/src/Component/Progress/Pending.php
@@ -6,13 +6,13 @@
  * Time: 13:31
  */
 
-namespace Inhere\Console\Component\Notify;
+namespace Inhere\Console\Component\Progress;
 
 use Inhere\Console\Component\NotifyMessage;
 
 /**
  * Class Pending
- * @package Inhere\Console\Component\Notify
+ * @package Inhere\Console\Component\Progress
  */
 class Pending extends NotifyMessage
 {
diff --git a/src/Component/Progress/Spinner.php b/src/Component/Progress/Spinner.php
@@ -6,13 +6,13 @@
  * Time: 13:32
  */
 
-namespace Inhere\Console\Component\Notify;
+namespace Inhere\Console\Component\Progress;
 
 use Inhere\Console\Component\NotifyMessage;
 
 /**
  * Class Spinner
- * @package Inhere\Console\Component\Notify
+ * @package Inhere\Console\Component\Progress
  */
 class Spinner extends NotifyMessage
 {
diff --git a/src/Console.php b/src/Console.php
@@ -199,7 +199,7 @@ public static function stderr($text, $nl = true, $quit = -200): void
      * print log to console
      * @param string $msg
      * @param array  $data
-     * @param string $type
+     * @param string $level
      * @param array  $opts
      * [
      *  '_category' => 'application',
@@ -208,14 +208,13 @@ public static function stderr($text, $nl = true, $quit = -200): void
      *  'coId' => 12,
      * ]
      */
-    public static function log(string $msg, array $data = [], string $type = 'info', array $opts = []): void
+    public static function log(string $msg, array $data = [], string $level = 'info', array $opts = []): void
     {
-        if (isset(self::LOG_LEVEL2TAG[$type])) {
-            $type = ColorTag::add(\strtoupper($type), self::LOG_LEVEL2TAG[$type]);
+        if (isset(self::LOG_LEVEL2TAG[$level])) {
+            $level = ColorTag::add(\strtoupper($level), self::LOG_LEVEL2TAG[$level]);
         }
 
         $userOpts = [];
-
         foreach ($opts as $n => $v) {
             if (\is_numeric($n) || \strpos($n, '_') === 0) {
                 $userOpts[] = "[$v]";
@@ -229,7 +228,7 @@ public static function log(string $msg, array $data = [], string $type = 'info',
         self::write(\sprintf(
             '%s [%s]%s %s %s',
             \date('Y/m/d H:i:s'),
-            $type,
+            $level,
             $optString,
             \trim($msg),
             $data ? \PHP_EOL . \json_encode($data, \JSON_UNESCAPED_SLASHES | \JSON_PRETTY_PRINT) : ''
diff --git a/src/Contract/ApplicationInterface.php b/src/Contract/ApplicationInterface.php
@@ -6,11 +6,11 @@
  * Time: 16:51
  */
 
-namespace Inhere\Console\Face;
+namespace Inhere\Console\Contract;
 
 /**
  * Interface ApplicationInterface
- * @package Inhere\Console
+ * @package Inhere\Console\Contract
  */
 interface ApplicationInterface
 {
diff --git a/src/Contract/BaseCommandInterface.php b/src/Contract/BaseCommandInterface.php
@@ -6,14 +6,14 @@
  * Time: 18:57
  */
 
-namespace Inhere\Console\Face;
+namespace Inhere\Console\Contract;
 
 use Inhere\Console\AbstractApplication;
 use Inhere\Console\IO\InputDefinition;
 
 /**
  * Interface BaseCommandInterface
- * @package Inhere\Console\Face
+ * @package Inhere\Console\Contract
  */
 interface BaseCommandInterface
 {
diff --git a/src/Contract/CommandInterface.php b/src/Contract/CommandInterface.php
@@ -6,11 +6,11 @@
  * Time: 9:23
  */
 
-namespace Inhere\Console\Face;
+namespace Inhere\Console\Contract;
 
 /**
  * Interface CommandInterface
- * @package Inhere\Console\Face
+ * @package Inhere\Console\Contract
  */
 interface CommandInterface extends BaseCommandInterface
 {
diff --git a/src/Contract/ControllerInterface.php b/src/Contract/ControllerInterface.php
@@ -6,11 +6,11 @@
  * Time: 9:23
  */
 
-namespace Inhere\Console\Face;
+namespace Inhere\Console\Contract;
 
 /**
  * interface ControllerInterface
- * @package Inhere\Console\Face
+ * @package Inhere\Console\Contract
  */
 interface ControllerInterface
 {
diff --git a/src/Contract/ErrorHandlerInterface.php b/src/Contract/ErrorHandlerInterface.php
@@ -6,14 +6,14 @@
  * Time: 13:12
  */
 
-namespace Inhere\Console\Face;
+namespace Inhere\Console\Contract;
 
 use Inhere\Console\AbstractApplication;
 use Inhere\Console\Application;
 
 /**
  * Interface ErrorHandlerInterface
- * @package Inhere\Console\Face
+ * @package Inhere\Console\Contract
  */
 interface ErrorHandlerInterface
 {
diff --git a/src/Contract/RouterInterface.php b/src/Contract/RouterInterface.php
@@ -6,11 +6,11 @@
  * Time: 23:52
  */
 
-namespace Inhere\Console\Face;
+namespace Inhere\Console\Contract;
 
 /**
  * Interface RouterInterface
- * @package Inhere\Console\Face
+ * @package Inhere\Console\Contract
  */
 interface RouterInterface
 {
diff --git a/src/Controller.php b/src/Controller.php
@@ -8,7 +8,7 @@
 
 namespace Inhere\Console;
 
-use Inhere\Console\Face\ControllerInterface;
+use Inhere\Console\Contract\ControllerInterface;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
 use Inhere\Console\Util\FormatUtil;
diff --git a/src/Dispatcher.php b/src/Dispatcher.php
@@ -1,44 +1,40 @@
 <?php
-/**
- * Created by PhpStorm.
- * User: inhere
- * Date: 2019-02-02
- * Time: 23:47
- */
 
 namespace Inhere\Console;
 
-use Inhere\Console\Face\CommandInterface;
-use Inhere\Console\Face\ControllerInterface;
-use Inhere\Console\Face\RouterInterface;
+use Inhere\Console\Contract\CommandInterface;
+use Inhere\Console\Contract\ControllerInterface;
+use Inhere\Console\Contract\RouterInterface;
 
 /**
- * Class Router
+ * Class Dispatcher - match input command and dispatch command handler
  * @package Inhere\Console
  */
-class Router implements RouterInterface
+class Dispatcher implements RouterInterface
 {
     /**
-     * @var array The independent commands
+     * The independent commands
+     * @var array
      * [
      *  'name' => [
      *      'handler' => MyCommand::class,
      *      'options' => []
      *  ]
      * ]
      */
-    protected $commands = [];
+    private $commands = [];
 
     /**
-     * @var array The group commands(controller)
+     * The group commands(controller)
+     * @var array
      * [
      *  'name' => [
      *      'handler' => MyController::class,
      *      'options' => []
      *  ]
      * ]
      */
-    protected $controllers = [];
+    private $controllers = [];
 
     /**
      * Register a app group command(by controller)
diff --git a/src/Traits/ApplicationHelpTrait.php b/src/Traits/ApplicationHelpTrait.php
@@ -9,7 +9,7 @@
 namespace Inhere\Console\Traits;
 
 use Inhere\Console\Component\Style\Style;
-use Inhere\Console\Face\CommandInterface;
+use Inhere\Console\Contract\CommandInterface;
 use Inhere\Console\Util\FormatUtil;
 use Toolkit\Cli\ColorTag;
 
diff --git a/src/Util/Show.php b/src/Util/Show.php
@@ -11,8 +11,8 @@
 use Inhere\Console\Component\Formatter\Table;
 use Inhere\Console\Component\Formatter\Title;
 use Inhere\Console\Component\Formatter\Tree;
-use Inhere\Console\Component\Notify\CounterText;
-use Inhere\Console\Component\Notify\DynamicText;
+use Inhere\Console\Component\Progress\CounterText;
+use Inhere\Console\Component\Progress\DynamicText;
 use Inhere\Console\Component\Progress\SimpleBar;
 use Inhere\Console\Component\Progress\SimpleTextBar;
 use Inhere\Console\Component\Style\Style;
@@ -23,8 +23,7 @@
 use Toolkit\Sys\Sys;
 
 /**
- * Class Show
- *  show formatted message text
+ * Class Show - render and display formatted message text
  * @package Inhere\Console\Util
  * @method static int info($messages, $quit = false)
  * @method static int note($messages, $quit = false)
