fix listing services and features in CLI

Author: Mulkave

src/Commands/FeatureMakeCommand.php

@@ -11,10 +11,11 @@
 
 namespace Lucid\Console\Commands;
 
-use Lucid\Console\Str;
-use Lucid\Console\Finder;
-use Lucid\Console\Filesystem;
 use Illuminate\Console\GeneratorCommand;
+use Lucid\Console\Filesystem;
+use Lucid\Console\Finder;
+use Lucid\Console\Generators\FeatureGenerator;
+use Lucid\Console\Str;
 use Symfony\Component\Console\Input\InputArgument;
 
 /**
@@ -53,13 +54,22 @@ class FeatureMakeCommand extends GeneratorCommand
      */
     public function fire()
     {
-        $service = studly_case($this->argument('service'));
-        $feature = $this->parseName($this->argument('feature'));
+        try {
+            $service = studly_case($this->argument('service'));
+            $title = $this->parseName($this->argument('feature'));
+
+            $generator = app(FeatureGenerator::class);
+            $feature = $generator->generate($title, $service);
 
-        $this->info('Feature class '.$feature.' created successfully.'.
-            "\n".
-            "\n".
-            'Find it at <comment>'.strstr($path, 'src/').'</comment>'."\n");
+            $this->info(
+                'Feature class '.$feature->title.' created successfully.'.
+                "\n".
+                "\n".
+                'Find it at <comment>'.strstr($feature->relativePath, 'src/').'</comment>'."\n"
+            );
+        } catch (Exception $e) {
+            $this->error($e->getMessage());
+        }
     }
 
     /**
@@ -90,7 +100,7 @@ protected function getStub()
      *  remove the Feature.php suffix if found
      *  we're adding it ourselves.
      *
-     * @param  string $name
+     * @param string $name
      *
      * @return string
      */

src/Commands/FeaturesListCommand.php

@@ -45,6 +45,9 @@ public function fire()
     {
         foreach ($this->listFeatures($this->argument('service')) as $service => $features) {
             $this->comment("\n$service\n");
+            $features = array_map(function($feature) {
+                return [$feature->title, $feature->service->name, $feature->file, $feature->relativePath];
+            }, $features->all());
             $this->table(['Feature', 'Service', 'File', 'Path'], $features);
         }
     }

src/Commands/JobMakeCommand.php

@@ -60,14 +60,14 @@ public function fire()
         $title = $this->parseName($this->argument('job'));
 
         try {
-
             $job = $generator->generate($title, $domain);
 
-            $this->info('Job class '.$title.' created successfully.'.
-            "\n".
-            "\n".
-            'Find it at <comment>'.$job->relativePath.'</comment>'."\n");
-
+            $this->info(
+                'Job class '.$title.' created successfully.'.
+                "\n".
+                "\n".
+                'Find it at <comment>'.$job->relativePath.'</comment>'."\n"
+            );
         } catch (Exception $e) {
             $this->error($e->getMessage());
         }
@@ -96,7 +96,7 @@ public function getStub()
      *  remove the Job.php suffix if found
      *  we're adding it ourselves.
      *
-     * @param  string $name
+     * @param string $name
      *
      * @return string
      */

src/Commands/ServicesListCommand.php

@@ -37,6 +37,9 @@ class ServicesListCommand extends Command
 
     public function fire()
     {
-        $this->table(['Service', 'Slug', 'Path'], $this->listServices());
+        $services = $this->listServices()->all();
+        $this->table(['Service', 'Slug', 'Path'], array_map(function($service) {
+            return [$service->name, $service->slug, $service->relativePath];
+        }, $services));
     }
 }