Merge pull request #36 from webfactor/fix-22

Fixes #22 - console output more relevant to developer

Author: tswonke

src/Commands/MakeEntity.php

@@ -47,15 +47,13 @@ public function handle()
 
     private function loadSchema()
     {
-        $this->info('Load Schema');
+        $this->info('Loading Schema');
         $this->schema = new Schema($this->option('schema'));
-        $this->info('Schema loaded');
-        $this->line('');
     }
 
     private function loadNaming()
     {
-        $this->info('Load Naming Classes');
+        $this->info('Loading Naming Classes');
 
         $namingClasses = config('webfactor.generators.naming');
         $count = count($namingClasses);
@@ -68,7 +66,6 @@ private function loadNaming()
             $this->naming[$key] = $namingObject;
         }
 
-        $this->info('Naming Classes loaded');
         $this->line('');
     }
 
@@ -77,15 +74,14 @@ private function loadServices()
         $services = $this->getServicesToBeExecuted();
         $progressBar = $this->output->createProgressBar(count($services));
 
-        foreach ($services as $serviceClass) {
-            $progressBar->advance();
-            $this->info(' Call: ' . $serviceClass);
+        foreach ($services as $k => $serviceClass) {
+            $serviceInstance = new $serviceClass($this);
+            $this->executeService($serviceInstance);
 
-            $this->executeService(new $serviceClass($this));
+            $progressBar->advance();
+            $this->info(' '.$serviceInstance->getConsoleOutput());
         }
 
-        $progressBar->finish();
-        $this->info(' Service Classes loaded');
         $this->line('');
     }
 

src/Contracts/ServiceAbstract.php

@@ -43,4 +43,9 @@ private function getSplFile(string $pathToFile): \SplFileInfo
 
         return null;
     }
+
+    public function getConsoleOutput()
+    {
+        return 'Handling ' . $this->key;
+    }
 }

src/Schemas/Naming/CrudController.php

@@ -6,6 +6,8 @@
 
 class CrudController extends NamingAbstract
 {
+    private $path = 'Http/Controllers/Admin';
+
     /**
      * @return string
      */
@@ -35,7 +37,15 @@ public function getFileName(): string
      */
     public function getPath(): string
     {
-        return app_path('Http/Controllers/Admin');
+        return app_path($this->path);
+    }
+
+    /**
+     * @return string
+     */
+    public function getRelativeFilePath(): string
+    {
+        return str_replace("\\", '/', $this->getAppNamespace()).$this->path.'/'.$this->getFileName();
     }
 
     /**

src/Schemas/Naming/CrudModel.php

@@ -6,6 +6,8 @@
 
 class CrudModel extends NamingAbstract
 {
+    private $path = 'Models';
+
     /**
      * @return string
      */
@@ -35,7 +37,15 @@ public function getFileName(): string
      */
     public function getPath(): string
     {
-        return app_path('Models');
+        return app_path($this->path);
+    }
+
+    /**
+     * @return string
+     */
+    public function getRelativeFilePath(): string
+    {
+        return str_replace("\\", '/', $this->getAppNamespace()).$this->path.'/'.$this->getFileName();
     }
 
     /**

src/Schemas/Naming/CrudRequest.php

@@ -6,6 +6,8 @@
 
 class CrudRequest extends NamingAbstract
 {
+    private $path = 'Http/Requests/Admin';
+
     /**
      * @return string
      */
@@ -35,7 +37,15 @@ public function getFileName(): string
      */
     public function getPath(): string
     {
-        return app_path('Http/Requests/Admin');
+        return app_path($this->path);
+    }
+
+    /**
+     * @return string
+     */
+    public function getRelativeFilePath(): string
+    {
+        return str_replace("\\", '/', $this->getAppNamespace()).$this->path.'/'.$this->getFileName();
     }
 
     /**

src/Schemas/Naming/Factory.php

@@ -30,6 +30,14 @@ public function getPath(): string
         return database_path('factories');
     }
 
+    /**
+     * @return string
+     */
+    public function getRelativeFilePath(): string
+    {
+        return 'database/factories/'.$this->getFileName();
+    }
+
     /**
      * @return string
      */

src/Schemas/Naming/LanguageFile.php

@@ -45,4 +45,12 @@ public function getPath(): string
     {
         return resource_path('lang/' . \Lang::locale());
     }
+
+    /**
+     * @return string
+     */
+    public function getRelativeFilePath(): string
+    {
+        return 'resources/lang/'.\Lang::locale().'/'.$this->getFileName();
+    }
 }

src/Schemas/Naming/Migration.php

@@ -60,6 +60,14 @@ public function getPath(): string
         return database_path('migrations');
     }
 
+    /**
+     * @return string
+     */
+    public function getRelativeFilePath(): string
+    {
+        return 'database/migrations/'.$this->getFileName();
+    }
+
     /**
      * @return string
      */

src/Schemas/Naming/RouteFile.php

@@ -29,4 +29,12 @@ public function getPath(): string
     {
         return base_path('routes/backpack');
     }
+
+    /**
+     * @return string
+     */
+    public function getRelativeFilePath(): string
+    {
+        return 'routes/backpack/'.$this->getFileName();
+    }
 }

src/Schemas/Naming/Seeder.php

@@ -38,6 +38,14 @@ public function getPath(): string
         return database_path('seeds');
     }
 
+    /**
+     * @return string
+     */
+    public function getRelativeFilePath(): string
+    {
+        return 'database/seeds/'.$this->getFileName();
+    }
+
     /**
      * @return string
      */