Added an execute() method to context to catch unhandled commands

examples/basic.php

@@ -0,0 +1,12 @@
+<?php
+
+require_once __DIR__."/../vendor/autoload.php";
+
+use NoccyLabs\Shell\Shell;
+use NoccyLabs\Shell\Context;
+
+
+$myShell = new Shell();
+$myShell->setPrompt("test>");
+$myShell->pushContext(new Context());
+$myShell->run();

examples/catchall.php

@@ -0,0 +1,20 @@
+<?php
+
+require_once __DIR__."/../vendor/autoload.php";
+
+use NoccyLabs\Shell\Shell;
+use NoccyLabs\Shell\Context;
+
+class CatchAllContext extends Context
+{
+    public function execute($cmd, ...$arg)
+    {
+        printf("Executing: %s %s\n", $cmd, join(" ",$arg));
+        return true;
+    }
+}
+
+$myShell = new Shell();
+$myShell->setPrompt("test>");
+$myShell->pushContext(new CatchAllContext());
+$myShell->run();

lib/Context.php

@@ -23,6 +23,11 @@ class Context
         $this->configure();
     }
 
+    public function getContextInfo()
+    {
+        return null;
+    }
+
     public function setShell(Shell $shell)
     {
         $this->shell = $shell;
@@ -141,6 +146,23 @@ class Context
         return array_key_exists('global', $info);
     }
 
+    /**
+     * Catch-all handler for commands not defined in context, globally or builtin.
+     * Override this function and return true if the command is handled ok.
+     *
+     * @param string $command The command to execute
+     * @param string[] $args The arguments to the command
+     * @return bool True if the command was handled
+     */
+    public function execute($command, ...$args)
+    {
+        return false;
+    }
+
+    /**
+     * Get the name of the context
+     *
+     */
     public function getName()
     {
         return $this->name;

lib/LineRead.php

@@ -68,11 +68,11 @@ class LineRead
             $this->posCursor = strlen($this->buffer);
         }
 
-        $cursor = strlen($this->prompt) + 1 + $this->posCursor - $this->posScroll;
+        $cursor = strlen($this->prompt) + 2 + $this->posCursor - $this->posScroll;
         
         $endStyle = "\e[0m";
         
-        fprintf(STDOUT, "\r\e[2K%s%s\e[%dG{$endStyle}", ($this->promptStyle)($prompt), ($this->commandStyle)($buffer), $cursor);
+        fprintf(STDOUT, "\r\e[2K%s %s\e[%dG{$endStyle}", ($this->promptStyle)($prompt), ($this->commandStyle)($buffer), $cursor);
     }
     
     protected function styleToAnsi($style)

lib/Shell.php

@@ -19,6 +19,8 @@ class Shell
     
     protected $timers = [];
 
+    protected $prompt = ">";
+
     public function __construct()
     {
         $this->configure();
@@ -162,10 +164,11 @@ class Shell
 
     public function setPrompt($text)
     {
-        if (!$this->lineReader) {
-            return;
+        $this->prompt = $text;
+    
+        if ($this->lineReader) {
+            $this->lineReader->setPromptText($text);
         }
-        $this->lineReader->setPromptText($text);
     }
 
     /**
@@ -220,6 +223,12 @@ class Shell
             }
             return;
         }
+
+        // Call 'execute' on the current context
+        if ($this->context->execute($command, ...$args)) {
+            return;
+        }
+
         // Throw error if the command could not be found
         throw new Exception\BadCommandException("Command {$command} not found");
     }
@@ -229,11 +238,11 @@ class Shell
         switch ($command) {
             case '.':
                 $type = basename(strtr(get_class($this->context), "\\", "/"));
-                printf("%s<%s>: %s\n", $type, $this->context->getName(), json_encode($this->context->getData()));
+                printf("%s<%s>: %s\n", $type, $this->context->getName(), $this->context->getContextInfo());
                 $level = 0;
                 foreach ($this->contextStack as $context) {
                     $type = basename(strtr(get_class($context), "\\", "/"));
-                    printf(" %s- %s<%s>\n", str_repeat("  ",$level++), $type, $context->getName());
+                    printf(" %s└─%s<%s>: %s\n", str_repeat("  ",$level++), $type, $context->getName(), $context->getContextInfo());
                 }
                 break;
             case '..':
@@ -314,7 +323,7 @@ class Shell
     {
         $this->lineReader = new LineRead();
 
-        $this->lineReader->setPromptText("shell>");
+        $this->lineReader->setPromptText($this->prompt);
         $this->lineReader->setPromptStyle(new Style(Style::BR_GREEN));
         $this->lineReader->setCommandStyle(new Style(Style::GREEN));