update, some logic update

Author: inhere

.gitignore

@@ -12,3 +12,4 @@ composer.lock
 *.swo
 *.zip
 .DS_Store
+.interactive_history

examples/HomeController.php

@@ -38,18 +38,6 @@ public function indexCommand()
         $this->write('hello, welcome!! this is ' . __METHOD__);
     }
 
-    /**
-     * command config
-     */
-    protected function colorConfigure()
-    {
-        $this->createDefinition()
-            ->setDescription('the color command description')
-            ->addArgument('name', Input::ARG_REQUIRED, 'description for the argument [name]')
-            ->addOption('yes', 'y', Input::OPT_BOOLEAN, 'description for the option [yes]')
-            ->addOption('opt1', null, Input::OPT_REQUIRED, 'description for the option [opt1]');
-    }
-
     /**
      * a example for use color text output on command
      * @usage ./bin/app home/color
@@ -61,7 +49,7 @@ public function colorCommand()
 
             return 0;
         }
-$this->output->dumpVars($this->input->getArgs(), $this->input->getBoolOpt('y'));
+
         $this->write('color text output:');
         $styles = $this->output->getStyle()->getStyleNames();
 
@@ -220,6 +208,26 @@ public function useArgCommand()
         // var_dump($this->input);
     }
 
+    /**
+     * command `defArgCommand` config
+     */
+    protected function defArgConfigure()
+    {
+        $this->createDefinition()
+            ->setDescription('the command arg/opt config use defined configure, it like symfony console: argument define by position')
+            ->addArgument('name', Input::ARG_REQUIRED, 'description for the argument [name]')
+            ->addOption('yes', 'y', Input::OPT_BOOLEAN, 'description for the option [yes]')
+            ->addOption('opt1', null, Input::OPT_REQUIRED, 'description for the option [opt1]');
+    }
+
+    /**
+     * the command arg/opt config use defined configure, it like symfony console: argument define by position
+     */
+    public function defArgCommand()
+    {
+        $this->output->dumpVars($this->input->getArgs(), $this->input->getOpts(), $this->input->getBoolOpt('y'));
+    }
+
     /**
      * use <red>Interact::confirm</red> method
      *

examples/baks/.interactive_history

@@ -0,0 +1,19 @@
+#!/usr/env/php
+<?php
+
+use inhere\console\examples\HomeController;
+
+define('PROJECT_PATH', dirname(__DIR__));
+
+require __DIR__ . '/s-autoload.php';
+
+$app = new \inhere\console\App([
+    'debug' => true,
+    'rootPath' => PROJECT_PATH,
+]);
+
+$app->controller('home', HomeController::class);
+
+exit(
+    (int)$app->runAction('home', $app->getInput()->getCommand(), false, true)
+);

examples/home

@@ -12,7 +12,6 @@
 use inhere\console\io\Output;
 use inhere\console\traits\InputOutputTrait;
 use inhere\console\traits\SimpleEventStaticTrait;
-use inhere\console\utils\Helper;
 
 /**
  * Class AbstractApp
@@ -33,6 +32,9 @@ abstract class AbstractApp
     const ON_STOP_RUN = 'stopRun';
     const ON_NOT_FOUND = 'notFound';
 
+    /** @var bool render no color */
+    private static $noColor = false;
+
     /**
      * @var string
      */
@@ -69,6 +71,7 @@ abstract class AbstractApp
     protected static $internalOptions = [
         '--debug' => 'setting the application runtime debug level',
         '--no-color' => 'setting no color for message output',
+        '--version' => 'Show application version information',
     ];
 
     /**
@@ -334,6 +337,16 @@ public function exceptionHandler($e)
      */
     protected function filterSpecialCommand($command)
     {
+        if (!$command) {
+            if ($this->input->getSameOpt(['V', 'version'])) {
+                $this->showVersionInfo();
+            }
+        }
+
+        if ($this->input->getSameOpt(['no-color'])) {
+            self::$noColor = true;
+        }
+
         $command = $command ?: 'list';
 
         switch ($command) {
@@ -469,6 +482,14 @@ public function showCommandList($quit = true)
      * getter/setter methods
      **********************************************************/
 
+    /**
+     * @return bool
+     */
+    public static function isNoColor(): bool
+    {
+        return self::$noColor;
+    }
+
     /**
      * @param array $controllers
      */
@@ -543,12 +564,14 @@ public function isInternalCommand(string $name): bool
     public function setMeta(array $meta)
     {
         if ($meta) {
-            $this->meta = array_merge($this->meta, (array)$meta);
+            $this->meta = array_merge($this->meta, $meta);
         }
     }
 
     /**
      * get meta info
+     * @param null $name
+     * @param null $default
      * @return array
      */
     public function getMeta($name = null, $default = null)

src/AbstractApp.php

@@ -116,9 +116,10 @@ public function runCommand($name, $believable = false)
      * @param string $name Controller name
      * @param string $action
      * @param bool $believable The `$name` is believable
+     * @param bool $standAlone
      * @return mixed
      */
-    public function runAction($name, $action, $believable = false)
+    public function runAction($name, $action, $believable = false, $standAlone = false)
     {
         // if $believable = true, will skip check.
         if (!$believable && !$this->isController($name)) {
@@ -141,6 +142,7 @@ public function runAction($name, $action, $believable = false)
 
         $object::setName($name);
         $object->delimiter = $this->delimiter;
+        $object->setStandAlone($standAlone);
 
         return $object->setAction($action)->run();
     }

src/App.php

@@ -44,8 +44,16 @@ abstract class Controller extends AbstractCommand
      */
     public $delimiter = '/'; // '/' ':'
 
+    /**
+     * @var bool
+     */
     protected $showMore = true;
 
+    /**
+     * @var bool
+     */
+    private $standAlone = false;
+
     /**
      * load command configure
      */
@@ -104,13 +112,13 @@ protected function showHelp()
 
     /**
      * Show help of the controller command group or specified command action
-     * @usage <info>{name}/[command] -h</info> OR <info>{name}/help [command]</info> OR <info>{name} [command]</info>
+     * @usage <info>{name}/[command] -h</info> OR <info>{command} [command]</info> OR <info>{name} [command] -h</info>
      * @example
-     * {script} {name} -h
-     * {script} {name}/help
-     * {script} {name}/help index
-     * {script} {name}/index -h
-     * {script} {name} index
+     *  {script} {name} -h
+     *  {script} {name}/help
+     *  {script} {name}/help index
+     *  {script} {name}/index -h
+     *  {script} {name} index
      *
      * @return int
      */
@@ -135,13 +143,12 @@ final public function helpCommand()
     final protected function showCommandList()
     {
         $ref = new \ReflectionClass($this);
-
-        $class = $ref->getName();
         $sName = lcfirst(self::getName() ?: $ref->getShortName());
-        $this->write("This is in the console controller [<bold>$class</bold>]\n");
+
+        // $this->write(sprintf("This is in the console controller [<bold>%s</bold>]\n", $class = $ref->getName();));
 
         if (!($classDes = self::getDescription())) {
-            $classDes = Annotation::description($ref->getDocComment()) ?: 'No Description';
+            $classDes = Annotation::description($ref->getDocComment()) ?: 'No Description for the console controller';
         }
 
         $suffix = $this->actionSuffix;
@@ -172,16 +179,22 @@ final protected function showCommandList()
             }
         }
 
-        $sep = $this->delimiter;
-        $name = $sName . $sep;
+        if ($this->standAlone) {
+            $name = $sName . ' ';
+            $usage = '<info>{command}</info> [arguments] [options]';
+        } else {
+            $name = $sName . $this->delimiter;
+            $usage = "<info>{$name}</info>{command} [arguments] [options]";
+        }
+
         $this->output->mList([
             'Description:' => $classDes,
-            'Usage:' => "{$name}[command] [arguments] [options]",
-            'Group Name:' => "<info>$sName</info>",
+            'Usage:' => $usage,
+            //'Group Name:' => "<info>$sName</info>",
             'Commands:' => $commands,
             'Options:' => [
-                '--help,-h' => 'Show help of the command group or specified command action',
-                $this->showMore ? "\nMore information please use <cyan>{$name}[command] -h</cyan> OR <cyan>{$name}help [command]</cyan>" : ''
+                '-h,--help' => 'Show help of the command group or specified command action',
+                $this->showMore ? "\nMore information please use <cyan>{$name}[command] -h</cyan>" : ''
             ],
         ]);
     }
@@ -254,4 +267,21 @@ public function setNotFoundCallback($notFoundCallback)
     {
         $this->notFoundCallback = $notFoundCallback;
     }
+
+    /**
+     * @return bool
+     */
+    public function isStandAlone(): bool
+    {
+        return $this->standAlone;
+    }
+
+    /**
+     * @param bool $standAlone
+     */
+    public function setStandAlone($standAlone = true)
+    {
+        $this->standAlone = (bool)$standAlone;
+    }
+
 }

src/Controller.php

@@ -545,7 +545,7 @@ public function setScript(string $script)
      * @param null|string $default
      * @return string
      */
-    public function getCommand($default = null): string
+    public function getCommand($default = ''): string
     {
         return $this->command ?: $default;
     }

src/io/Input.php

@@ -38,10 +38,10 @@ public function read($question = null, $nl = false): string;
     public function getScript(): string;
 
     /**
-     * @param null|string $default
+     * @param string $default
      * @return string
      */
-    public function getCommand($default = null): string;
+    public function getCommand($default = ''): string;
 
     /**
      * @return array