Bugfixes to help command

examples/commandevents.php

@@ -36,9 +36,9 @@ $myShell->setPrompt("test>");
 
 // Create an anonymous context and add a command
 $ctx = $myShell->createContext("root");
-$ctx->addCommand("hello", function () {
+$ctx->addCommand("hello", function ($who="World") {
-    echo "Hello World!\n";
+    echo "Hello {$who}!\n";
-});
+}, [ "help"=>"Say hello", "args"=>"who" ]);
 
 // Run the shell
 $myShell->run();

examples/contexts.php

@@ -6,21 +6,46 @@ use NoccyLabs\Shell\Shell;
 use NoccyLabs\Shell\Context;
 
 $shell = new Shell();
-$shell->addListener("prompt", function ($event, $shell) {
+$shell->addListener(Shell::EVT_UPDATE_PROMPT, function ($event) {
-    $name = $shell->getContextPath();
+    $name = $event->shell->getContextPath();
-    $shell->setPrompt("shell{$name}> ");
+    $event->shell->setPrompt("shell{$name}> ");
 });
 
-$root = new Context();
+class MyContext extends Context
-$root->addCommand("test", function () {
+{
-    echo "It works!\n";
+    public function __construct()
-});
+    {
-$root->addCommand("context", function ($name) {
+        // Remember to call the parent constructor if you want to use
-    $context = new Context($name);
+        // the doccomment syntax to mark commands, as demonstrated
-    $context->name = $name;
+        // at the end of this class for the bar command.
-    return $context;
+        parent::__construct();
-});
+        $this->addCommand("foo",[$this,"foo"],[
-$shell->pushContext($root);
+            'help' => "Foo command"
+        ]);
+    }
+    
+    public function onEnter()
+    {
+        echo "Entering context!\n";
+    }
+    
+    public function foo()
+    {
+        echo "Foo!\n";
+    }
+    
+    /**
+     * @command bar
+     * @args
+     * @help Bar command
+     */
+    public function bar()
+    {
+        echo "Bar!\n";
+    }
+}
+
+$shell->pushContext(new MyContext());
 
 
 $shell->run();

lib/Context.php

@@ -66,6 +66,11 @@ class Context
         $this->findCommands();
     }
 
+    public function onEnter()
+    {
+    }
+
+
     protected function findCommands()
     {
         $refl = new \ReflectionClass(get_called_class());

lib/Shell.php

@@ -90,6 +90,16 @@ class Shell
         }
     }
 
+    /**
+     * Return the current context
+     *
+     * @return Context The current context
+     */
+    public function getContext()
+    {
+        return $this->context;
+    }
+
     /**
      * Push a new primary context, saving the previous contexts on a stack.
      *
@@ -104,6 +114,7 @@ class Shell
         $context->setShell($this);
         $this->context = $context;
         $this->dispatchEvent(self::EVT_CONTEXT_CHANGED);
+        $context->onEnter();
     }
 
     /**
@@ -407,25 +418,30 @@ class Shell
                     }
                 }
                 ksort($ghelp);
+                $_ = function($command,$args,$info) {
+                    printf("  \e[96m%s\e[0m \e[0;3m%s\e[0m  \e[30G\e[36m%s\e[0m\n", $command, $args, $info);
+                };
                 printf("\e[1mCommands:\e[0m\n");
                 foreach ($help as $command=>$info) {
                     if (strpos($command," ")!==false) {
                         list($command,$args) = explode(" ",$command,2);
                     } else $args=null;
-                    $command = sprintf("\e[97m%s \e[90m%s\e[0m", $command,$args);
+                    $_($command, $args,$info);
-                    printf("  %s - \e[3;36m%s\e[0m\n", $command, $info);
                 }
                 if (count($ghelp)) {
-                    printf("\n\e[0mCommands from parent contexts:\e[0m\n");
+                    foreach ($ghelp as $command=>$info) {
+                        printf("\e[1mCommands from parent contexts:\e[0m\n");
                         if (strpos($command," ")!==false) {
                             list($command,$args) = explode(" ",$command,2);
                         } else $args=null;
-                    $command = sprintf("\e[97m%s \e[90m%s\e[0m", $command,$args);
+                        if (!array_key_exists($command,$ghelp)) continue;
-                    printf("  %s - \e[3;36m%s\e[0m\n", $command, $info);
+                        $_($command, $args,$info);
                     }
-                printf("\nGlobal commands:\n");
+                }
-                printf("  \e[97m%s\e[0;36;3m - %s\e[0m\n", "exit", "Leave the shell");
+                printf("\e[1mGlobal commands:\e[0m\n");
-                printf("  \e[97m%s\e[0;36;3m - %s\e[0m\n", "..", "Discard the current context and go to parent");
+                    $_("exit", null, "Leave the shell");
+                    $_(".", null, "Show the context tree");
+                    $_("..", null, "Discard the current context and go to parent");
                 break;
             case 'exit':
                 $this->stop();