Merge pull request #9 from joshuaGlass808/DevB

Major updates, moved src to its own repo

.gitignore

@@ -1,3 +1,3 @@
 /vendor
-/app/Storage/logs/*.log
+/logs/*.log
 .env

app/Commands/ExampleCommand.php

@@ -2,14 +2,14 @@
 
 namespace App\Commands;
 
-use SCF\Interfaces\CmdInterface;
-use SCF\Shell\BaseCmd;
-use SCF\Traits\CmdTrait;
-use SCF\Styles\TextColor;
+use SCF\Contracts\CommandContract;
+use SCF\Commands\BaseCommand;
+use SCF\Traits\CommandTrait;
+use SCF\Styles\TextStyle;
 
-class ExampleCommand extends BaseCmd implements CmdInterface
+class ExampleCommand extends BaseCommand implements CommandContract
 {
-    use CmdTrait;
+    use CommandTrait;
 
     public string $signature = 'print:message';
     public array $argumentMap = [
@@ -30,7 +30,7 @@ public function execute(): void
             $this->success("Message: {$args['message']}\n");
             $this->warn("Environment: {$this->env['ENV']}\n");
             $this->warn("Config DB Driver: {$this->config['database-driver']}\n");
-            $this->output('Execution took: ' . (microtime(true) - $start) . " seconds\n", TextColor::CYAN);
+            $this->output('Execution took: ' . (microtime(true) - $start) . " seconds\n", TextStyle::CYAN);
         }
     }
 }

app/Kernel.php

@@ -3,16 +3,19 @@
 namespace App;
 
 use App\Commands\ExampleCommand;
+use SCF\Contracts\KernelContract;
+use SCF\Traits\KernelTrait;
 
-use SCF\Shell\{
-	BaseCmd,
-	CreateShell
+use SCF\Commands\{
+	BaseCommand,
+    CreateCommand
 };
 
-class Kernel
+class Kernel implements KernelContract
 {
+    use KernelTrait;
 	/**
-	 * Register Commands here.
+	 * Register your Commands here.
 	 */
 	const COMMANDS = [
 		ExampleCommand::class,
@@ -21,14 +24,14 @@ class Kernel
     /**
      * Classes is a method were you register all the command classes.
      * They be from any namespace as long as they implement 
-     *   extend BaseCmd and have an execute method.
+     *   extend BaseCommand and have an execute method.
      * 
      * @return array - an array of all registered commands.
      */
     public static function classes(): array
     {
 		$commands = self::COMMANDS;
-		$commands[] = CreateShell::class;
+		$commands[] = CreateCommand::class;
 
 		return $commands;
     }
@@ -38,9 +41,9 @@ public static function classes(): array
      * 
      * @param string $signature - The command signature <basic:signature:block>
      * @param null|array $args  - Arguments passed with the command at run time.
-     * @return null|BaseCmd     - Returns a Cmd class or null if not registered.
+     * @return null|BaseCommand     - Returns a Cmd class or null if not registered.
      */
-    public static function getCommandClass(string $signature, ?array $args, array $env, array $config): ?BaseCmd
+    public static function getCommandClass(string $signature, ?array $args, array $env, array $config): ?BaseCommand
     {
         $classes = self::classes();
         $classSignatures = [];
@@ -59,27 +62,4 @@ public static function getCommandClass(string $signature, ?array $args, array $e
 
         return null;
     }
-
-    /**
-     * Display Help Message.
-     * 
-     * @return void
-     */
-    public static function printHelp(): void
-    {
-        $classes = self::classes();
-        print "Usage: ./scf <shell:signature> [--args=...]\n"
-            . "       ./scf -h\n\n";
-
-        rsort($classes);
-        foreach ($classes as $class) {
-            $c = new $class;
-            $s = '    ';
-            print $s . $c->signature . "\n";
-            foreach ($c->argumentMap as $arg => $desc) {
-                print $s . $s . $arg . ' : ' . $desc . "\n";
-            }
-            print "\n";
-        }
-    }
 }

composer.json

@@ -12,12 +12,12 @@
     ],
     "autoload": {
         "psr-4": {
-            "App\\": "app/",
-            "SCF\\": "src/"
+            "App\\": "app/"
         }
     },
     "require": {
-        "php": "^7.4"
+        "php": "^7.4",
+        "scf/simple-command-framework": "^1.0"
     },
     "prefer-stable": true,
     "scripts": {