update, some bug fixed

Author: inhere

examples/HomeController.php

@@ -44,9 +44,10 @@ public function indexCommand()
     protected function colorConfigure()
     {
         $this->createDefinition()
-            ->setDescription('command description')
-            ->addArgument('name', Input::ARG_REQUIRED)
-            ->addOption('yes', 'y', Input::OPT_BOOLEAN);
+            ->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]');
     }
 
     /**
@@ -60,7 +61,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();
 
@@ -253,7 +254,7 @@ public function envCommand()
 
         Interact::panel($info);
 
-        echo Helper::printR($_SERVER);
+        echo Helper::printVars($_SERVER);
     }
 
     /**

examples/app

@@ -1,17 +1,15 @@
 #!/usr/bin/env php
 <?php
-// define STDIN, STDOUT and STDERR if the PHP SAPI did not define them (e.g. creating console application in web env)
-// http://php.net/manual/en/features.commandline.io-streams.php
-defined('STDIN') or define('STDIN', fopen('php://stdin', 'rb'));
-defined('STDOUT') or define('STDOUT', fopen('php://stdout', 'wb'));
-defined('STDERR') or define('STDERR', fopen('php://stderr', 'wb'));
 
 define('PROJECT_PATH', dirname(__DIR__));
 
 require __DIR__ . '/s-autoload.php';
 
 // create app instance
-$app = new \inhere\console\App();
+$app = new \inhere\console\App([
+    'debug' => true,
+    'rootPath' => PROJECT_PATH,
+]);
 
 // require dirname(__DIR__) . '/boot/cli-services.php';
 

examples/baks/color.php

@@ -6,5 +6,59 @@
 // $text = sprintf("\033[%sm%s\033[%sm\n", implode(';', $setCodes), $text, implode(';', $unsetCodes));
 // var_dump(chr(27));
 // echo $text;
+system("echo -e '\033[32;40;1;4mfoo\033[39;49;22;24m'");
+system("printf '\033[32;40;1;4mfoo\033[39;49;22;24m'");
 fwrite(STDOUT, "\033[32;40;1;4mfoo\033[39;49;22;24m");
 fflush(STDOUT);
+
+function execInBackground($cmd)
+{
+    if (substr(php_uname(), 0, 7) == "Windows") {
+        pclose(popen("start /B " . $cmd, "r"));
+    } else {
+        exec($cmd . " > /dev/null &");
+    }
+}
+function GetProgCpuUsage($program)
+{
+    if (!$program) {
+        return -1;
+    }
+
+    $c_pid = exec("ps aux | grep " . $program . " | grep -v grep | grep -v su | awk {'print $3'}");
+    return $c_pid;
+}
+
+function GetProgMemUsage($program)
+{
+    if (!$program) {
+        return -1;
+    }
+
+    $c_pid = exec("ps aux | grep " . $program . " | grep -v grep | grep -v su | awk {'print $4'}");
+    return $c_pid;
+}
+
+// If you want to download files from a linux server with a filesize bigger than 2GB you can use the following
+function serveFile($file, $as)
+{
+    header('Expires: Mon, 1 Apr 1974 05:00:00 GMT');
+    header('Pragma: no-cache');
+    header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
+    header('Content-Description: File Download');
+    header('Content-Type: application/octet-stream');
+    header('Content-Length: ' . trim(`stat -c%s "$file"`));
+    header('Content-Disposition: attachment; filename="' . $as . '"');
+    header('Content-Transfer-Encoding: binary');
+    //@readfile( $file );
+
+    flush();
+    $fp = popen("tail -c " . trim(`stat -c%s "$file"`) . " " . $file . ' 2>&1', "r");
+    while (!feof($fp)) {
+        // send the current file part to the browser
+        print fread($fp, 1024);
+        // flush the content to the browser
+        flush();
+    }
+    fclose($fp);
+}

src/AbstractApp.php

@@ -12,6 +12,7 @@
 use inhere\console\io\Output;
 use inhere\console\traits\InputOutputTrait;
 use inhere\console\traits\SimpleEventStaticTrait;
+use inhere\console\utils\Helper;
 
 /**
  * Class AbstractApp
@@ -36,12 +37,14 @@ abstract class AbstractApp
      * app config
      * @var array
      */
-    protected $config = [
+    private $config = [
         'env' => 'pdt', // dev test pdt
-        'debug' => true,
+        'debug' => false,
         'name' => 'My Console',
         'version' => '0.5.1',
         'publishAt' => '2017.03.24',
+        'rootPath' => '',
+        'hideRootPath' => true,
         'charset' => 'UTF-8',
         'timeZone' => 'Asia/Shanghai',
     ];
@@ -70,6 +73,11 @@ abstract class AbstractApp
      */
     private $commandName;
 
+    /**
+     * @var bool
+     */
+    private $hideRootPath = true;
+
     /**
      * App constructor.
      * @param array $config
@@ -78,13 +86,26 @@ abstract class AbstractApp
      */
     public function __construct(array $config = [], Input $input = null, Output $output = null)
     {
+        $this->runtimeCheck();
+        $this->setConfig($config);
+
         $this->input = $input ?: new Input();
         $this->output = $output ?: new Output();
 
-        $this->setConfig($config);
         $this->init();
     }
 
+    protected function runtimeCheck()
+    {
+        // check env
+        if (!in_array(PHP_SAPI, ['cli', 'cli-server'], true)) {
+            header('HTTP/1.1 403 Forbidden');
+            exit("  403 Forbidden \n\n"
+            . " current environment is CLI. \n"
+            . " :( Sorry! Run this script is only allowed in the terminal environment!\n,You are not allowed to access this file.\n");
+        }
+    }
+
     protected function init()
     {
         $this->commandName = $this->input->getCommand();
@@ -267,15 +288,19 @@ protected function dispatchExHandler($e)
         // open debug, throw exception
         if ($this->isDebug()) {
             $message = sprintf(
-                "<bold>Exception(%d)</bold>: <red>%s</red>\nCalled At %s, Line: <cyan>%d</cyan>\nCatch the exception by: %s\nCode Trace:\n%s\n",
-                $e->getCode(),
+                "<red>Exception</red>: %s\nCalled At %s, Line: <cyan>%d</cyan>\nCatch the exception by: %s\nCode Trace:\n%s\n",
+                // $e->getCode(),
                 $e->getMessage(),
                 $e->getFile(),
                 $e->getLine(),
                 get_class($e),
                 $e->getTraceAsString()
             );
 
+            if ($this->config('hideRootPath') && $rootPath = $this->config('rootPath')) {
+                $message = str_replace($rootPath, '{ROOT}', $message);
+            }
+
             $this->output->write($message, false);
         } else {
             // simple output
@@ -348,13 +373,14 @@ public function showHelpInfo($quit = true)
     public function showVersionInfo($quit = true)
     {
         $date = date('Y-m-d');
+        $name = $this->config('name', 'Console Application');
         $version = $this->config('version', 'Unknown');
-        $publishAt = $this->config['publishAt'];
+        $publishAt = $this->config('publishAt', 'Unknown');
         $phpVersion = PHP_VERSION;
         $os = PHP_OS;
 
         $this->output->aList([
-            "Console Application <info>{$this->config['name']}</info> Version <comment>$version</comment>(publish at $publishAt)",
+            "Console Application <info>{$name}</info> Version <comment>$version</comment>(publish at $publishAt)",
             'System' => "PHP version <info>$phpVersion</info>, on OS <info>$os</info>, current Date $date",
         ], null, [
             'leftChar' => ''
@@ -510,11 +536,9 @@ public function config($name, $default = null)
 
         // allow get $config['top']['sub'] by 'top.sub'
         if (strpos($name, '.') > 1) {
-            list($topKey, $subKey) = explode('.', $name, 2);
+            $nodes = array_filter(explode('.', $name));
 
-            if (isset($this->config[$topKey], $this->config[$topKey][$subKey])) {
-                return $this->config[$topKey][$subKey];
-            }
+            return Helper::findValueByNodes($this->config, $nodes, $default);
         }
 
         return $this->config[$name] ?? $default;

src/AbstractCommand.php

@@ -44,7 +44,7 @@ abstract class AbstractCommand
      * Allow display message tags in the command annotation
      * @var array
      */
-    protected static $allowTags = [
+    protected static $annotationTags = [
         // tag name => multi line align
         'description' => false,
         'usage' => false,
@@ -93,7 +93,7 @@ protected function configure()
      * validate input arguments and options
      * @return bool
      */
-    public function validate()
+    public function validateInput()
     {
         if (!$definition = $this->definition) {
             return true;
@@ -114,10 +114,9 @@ public function validate()
         }
 
         $defArgs = $definition->getArguments();
-
-        $missingArgs = array_filter(array_keys($defArgs), function ($name) use ($definition, $givenArgs) {
-            return !array_key_exists($name, $givenArgs) && $definition->argumentIsRequired($name);
-        });
+        $missingArgs = array_filter(array_keys($defArgs), function ($name, $key) use ($definition, $givenArgs) {
+            return !array_key_exists($key, $givenArgs) && $definition->argumentIsRequired($name);
+        }, ARRAY_FILTER_USE_BOTH);
 
         if (count($missingArgs) > 0) {
             throw new \RuntimeException(sprintf('Not enough arguments (missing: "%s").', implode(', ', $missingArgs)));
@@ -173,7 +172,8 @@ protected function beforeRun()
             }
         }
 
-        $this->validate();
+        // do validate input arg and opt
+        $this->validateInput();
     }
 
     /**
@@ -240,9 +240,9 @@ protected function showHelpByMethodAnnotation($method, $action = null)
                 continue;
             }
 
-            if (isset(self::$allowTags[$tag])) {
+            if (isset(self::$annotationTags[$tag])) {
                 // need multi align
-                if (self::$allowTags[$tag]) {
+                if (self::$annotationTags[$tag]) {
                     $lines = array_map(function ($line) {
                         return trim($line);
                     }, explode("\n", $msg));
@@ -304,18 +304,18 @@ public static function setDescription(string $description)
     /**
      * @return array
      */
-    public static function getAllowTags(): array
+    public static function getAnnotationTags(): array
     {
-        return self::$allowTags;
+        return self::$annotationTags;
     }
 
     /**
-     * @param array $allowTags
+     * @param array $annotationTags
      * @param bool $replace
      */
-    public static function setAllowTags(array $allowTags, $replace = false)
+    public static function setAnnotationTags(array $annotationTags, $replace = false)
     {
-        self::$allowTags = $replace ? $allowTags : array_merge(self::$allowTags, $allowTags);
+        self::$annotationTags = $replace ? $annotationTags : array_merge(self::$annotationTags, $annotationTags);
     }
 
     /**

src/Command.php

@@ -23,8 +23,8 @@ abstract class Command extends AbstractCommand
      */
     public function run()
     {
-        // load input definition
-//        $this->configure();
+        // load input definition configure
+        $this->configure();
 
         if ($this->input->sameOpt(['h','help'])) {
             return $this->showHelp();
@@ -40,7 +40,6 @@ public function run()
             $this->afterRun();
 
             App::fire(App::ON_AFTER_EXEC, [$this]);
-
         } catch (\Throwable $e) {
             App::fire(App::ON_EXEC_ERROR, [$e, $this]);
             $this->handleRuntimeException($e);
@@ -62,17 +61,21 @@ abstract protected function execute($input, $output);
      */
     protected function configure()
     {
-        $this
-            ->createDefinition()
-            ->addArgument('test')
-            ->addOption('test');
+        // $this
+        //     ->createDefinition()
+        //     ->addArgument('test')
+        //     ->addOption('test');
     }
 
     /**
      * @return int
      */
-    public function showHelp()
+    protected function showHelp()
     {
+        if ($def = $this->getDefinition()) {
+            return $this->write($def->getSynopsis());
+        }
+
         return $this->showHelpByMethodAnnotation('execute');
     }
 }

src/Controller.php

@@ -58,8 +58,8 @@ protected function configure()
      */
     public function run()
     {
+        $this->configure();
         $action = $this->action;
-//        $this->configure();
 
         if ($action && $this->input->sameOpt(['h','help'])) {
             return $this->helpCommand();
@@ -124,7 +124,7 @@ final public function helpCommand()
 
         $action = Helper::transName($action);
 
-        if ($def = $this->getDefinition()) {
+        if ($def = $this->getDefinition()) { var_dump($def);
             return $this->write($def->getSynopsis());
         }