improve 'new' command to use installed templates instead of integrated templates

Author: Machometec

composer.json

@@ -10,7 +10,8 @@
         }
     ],
     "require": {
-        "devnet/system": "1.1.*"
+        "devnet/system": "1.1.*",
+        "devnet/console": "1.1.*"
     },
     "bin": [
         "bin/devnet"

src/Commands/NewCommand.php

@@ -29,8 +29,15 @@ public function __construct()
         $this->addOption('--output', 'Location to place the generated project output', '-o');
 
         $this->registry = TemplateRegistry::getSingleton();
-        $this->registry->set('console', new TemplateProvider('console', 'Console application.', __DIR__ . '/../../templates/console'));
-        $this->registry->set('web', new TemplateProvider('web', 'DevNet web application.', __DIR__ . '/../../templates/web'));
+        $this->registry->set('console', new TemplateProvider(dirname(__DIR__, 3) . '/console'));
+
+        if (is_file(dirname(__DIR__, 3) . '/web/composer.json')) {
+            $this->registry->set('web', new TemplateProvider(dirname(__DIR__, 3) . '/web'));
+        }
+
+        if (is_file(dirname(__DIR__, 3) . '/mvc/composer.json')) {
+            $this->registry->set('mvc', new TemplateProvider(dirname(__DIR__, 3) . '/mvc'));
+        }
 
         $this->setHelp(function ($builder) {
             $builder->useDefaults();
@@ -72,7 +79,7 @@ public function onExecute(object $sender, CommandEventArgs $args): void
         $templateName = strtolower($templateName);
         $provider     = $this->registry->get($templateName);
 
-        if (!$provider || !is_dir($provider->getSourcePath())) {
+        if (!$provider || !is_dir($provider->getPath())) {
             Console::$ForegroundColor = ConsoleColor::Red;
             Console::writeLine("The template {$templateName} does not exist!");
             Console::resetColor();
@@ -92,20 +99,20 @@ public function onExecute(object $sender, CommandEventArgs $args): void
         }
     }
 
-    public static function createProject(string $src, string $dst): bool
+    public static function createProject(string $source, string $destination): bool
     {
         try {
-            $dir = opendir($src);
-            if (!is_dir($dst)) {
-                mkdir($dst, 0777, true);
+            $dir = opendir($source);
+            if (!is_dir($destination)) {
+                mkdir($destination, 0777, true);
             }
 
             while ($file = readdir($dir)) {
                 if ($file !== '.' && $file !== '..' && $file !== '.git') {
-                    if (is_dir($src . '/' . $file)) {
-                        self::createProject($src . '/' . $file, $dst . '/' . $file);
+                    if (is_dir($source . '/' . $file)) {
+                        self::createProject($source . '/' . $file, $destination . '/' . $file);
                     } else {
-                        copy($src . '/' . $file, $dst . '/' . $file);
+                        copy($source . '/' . $file, $destination . '/' . $file);
                     }
                 }
             }

src/Plugin/ITemplateProvider.php

@@ -24,5 +24,5 @@ public function getDescription(): string;
     /**
      * Get the template source path
      */
-    public function getSourcePath(): string;
+    public function getPath(): string;
 }

src/Plugin/TemplateProvider.php

@@ -13,13 +13,33 @@ class TemplateProvider implements ITemplateProvider
 {
     protected string $name;
     protected string $description;
-    protected string $sourcePath;
+    protected string $path;
 
-    public function __construct(string $name, string $description, string $sourcePath)
+    public function __construct(string $sourcePath)
     {
-        $this->name = $name;
-        $this->description = $description;
-        $this->sourcePath = $sourcePath;
+        $this->path = $sourcePath;
+        if (!is_file($sourcePath . "/composer.json")) {
+            throw new \Exception("Cannot find 'composer.json' in the template path : " . $sourcePath);
+        }
+
+        $content = file_get_contents($sourcePath . "/composer.json");
+        $package = json_decode($content);
+        
+        if (!isset($package->name)) {
+            throw new \Exception("The template package name is mission in : " . $sourcePath . "/composer.json");
+        }
+
+        $segments = explode('/', $package->name);
+        if (count($segments) != 2) {
+            throw new \Exception("The template package name has an invalid format in : " . $sourcePath . "/composer.json");
+        }
+
+        if (!isset($package->description)) {
+            throw new \Exception("The template package description is mission in : " > $sourcePath . "/composer.json");
+        }
+
+        $this->name = $segments[1];
+        $this->description = $package->description;
     }
 
     /**
@@ -41,8 +61,8 @@ public function getDescription(): string
     /**
      * Get the template source path
      */
-    public function getSourcePath(): string
+    public function getPath(): string
     {
-        return  $this->sourcePath;
+        return  $this->path;
     }
 }