Merge pull request #155 from Laravel-Backpack/create-publish-views

Fixes on create/publish views commands

Author: tabacitu

src/Console/Commands/ButtonBackpackCommand.php

@@ -2,12 +2,14 @@
 
 namespace Backpack\Generators\Console\Commands;
 
+use Backpack\CRUD\ViewNamespaces;
 use Illuminate\Console\GeneratorCommand;
 use Illuminate\Support\Str;
 
 class ButtonBackpackCommand extends GeneratorCommand
 {
     use \Backpack\CRUD\app\Console\Commands\Traits\PrettyCommandOutput;
+
     /**
      * The console command name.
      *
@@ -20,7 +22,7 @@ class ButtonBackpackCommand extends GeneratorCommand
      *
      * @var string
      */
-    protected $signature = 'backpack:button {name}';
+    protected $signature = 'backpack:button {name} {--from=}';
 
     /**
      * The console command description.
@@ -37,51 +39,77 @@ class ButtonBackpackCommand extends GeneratorCommand
     protected $type = 'Button';
 
     /**
-     * Get the stub file for the generator.
+     * View Namespace.
      *
-     * @return string
+     * @var string
      */
-    protected function getStub()
-    {
-        return __DIR__.'/../stubs/button.stub';
-    }
+    protected $viewNamespace = 'buttons';
 
     /**
-     * Alias for the fire method.
+     * Get the stub file for the generator.
      *
-     * In Laravel 5.5 the fire() method has been renamed to handle().
-     * This alias provides support for both Laravel 5.4 and 5.5.
+     * @return string
      */
-    public function handle()
+    protected function getStub()
     {
-        $this->fire();
+        return __DIR__.'/../stubs/button.stub';
     }
 
     /**
      * Execute the console command.
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         $name = Str::of($this->getNameInput());
-        $path = $this->getPath($name);
+        $path = Str::of($this->getPath($name));
+        $pathRelative = $path->after(base_path())->replace('\\', '/')->trim('/');
 
-        if ($this->alreadyExists($this->getNameInput())) {
-            $this->error($this->type.' already existed!');
+        $this->infoBlock("Creating {$name->replace('_', ' ')->title()} {$this->type}");
+        $this->progressBlock("Creating view <fg=blue>{$pathRelative}</>");
+
+        if ($this->alreadyExists($name)) {
+            $this->closeProgressBlock('Already existed', 'yellow');
 
             return false;
         }
 
-        $this->infoBlock("Creating {$name->replace('_', ' ')->title()} {$this->type}");
-        $this->progressBlock("Creating view <fg=blue>resources/views/vendor/backpack/crud/buttons/${name}.blade.php</>");
+        $source = null;
+        if ($this->option('from')) {
+            $from = $this->option('from');
+            $namespaces = ViewNamespaces::getFor($this->viewNamespace);
+            foreach ($namespaces as $namespace) {
+                $viewPath = "$namespace.$from";
+                if (view()->exists($viewPath)) {
+                    $source = view($viewPath)->getPath();
+                    break;
+                }
+            }
+
+            // full file path may be provided
+            if (file_exists($from)) {
+                $source = $from;
+            }
+
+            if (! $source) {
+                $this->errorProgressBlock();
+                $this->note("$this->type '$from' does not exist!", 'red');
+                $this->newLine();
+
+                return false;
+            }
+        }
 
         $this->makeDirectory($path);
-        $this->files->put($path, $this->buildClass($name));
+
+        if ($source) {
+            $this->files->copy($source, $path);
+        } else {
+            $this->files->put($path, $this->buildClass($name));
+        }
 
         $this->closeProgressBlock();
-        $this->newLine();
-        $this->info($this->type.' created successfully.');
     }
 
     /**
@@ -119,16 +147,4 @@ protected function buildClass($name)
 
         return $stub;
     }
-
-    /**
-     * Get the console command options.
-     *
-     * @return array
-     */
-    protected function getOptions()
-    {
-        return [
-
-        ];
-    }
 }

src/Console/Commands/ColumnBackpackCommand.php

@@ -9,6 +9,7 @@
 class ColumnBackpackCommand extends GeneratorCommand
 {
     use \Backpack\CRUD\app\Console\Commands\Traits\PrettyCommandOutput;
+
     /**
      * The console command name.
      *
@@ -38,73 +39,77 @@ class ColumnBackpackCommand extends GeneratorCommand
     protected $type = 'Column';
 
     /**
-     * Get the stub file for the generator.
+     * View Namespace.
      *
-     * @return string
+     * @var string
      */
-    protected function getStub()
-    {
-        return __DIR__.'/../stubs/column.stub';
-    }
+    protected $viewNamespace = 'columns';
 
     /**
-     * Alias for the fire method.
+     * Get the stub file for the generator.
      *
-     * In Laravel 5.5 the fire() method has been renamed to handle().
-     * This alias provides support for both Laravel 5.4 and 5.5.
+     * @return string
      */
-    public function handle()
+    protected function getStub()
     {
-        $this->fire();
+        return __DIR__.'/../stubs/column.stub';
     }
 
     /**
      * Execute the console command.
      *
      * @return bool|null
      */
-    public function fire()
+    public function handle()
     {
         $name = Str::of($this->getNameInput());
-        $path = $this->getPath($name);
+        $path = Str::of($this->getPath($name));
+        $pathRelative = $path->after(base_path())->replace('\\', '/')->trim('/');
+
+        $this->infoBlock("Creating {$name->replace('_', ' ')->title()} {$this->type}");
+        $this->progressBlock("Creating view <fg=blue>{$pathRelative}</>");
 
-        if ($this->alreadyExists($this->getNameInput())) {
-            $this->error("Error : $this->type $name already existed!");
+        if ($this->alreadyExists($name)) {
+            $this->closeProgressBlock('Already existed', 'yellow');
 
             return false;
         }
 
-        $src = null;
+        $source = null;
         if ($this->option('from')) {
-            $column = Str::of($this->option('from'));
-            $arr = ViewNamespaces::getFor('columns');
-            foreach ($arr as $key => $value) {
-                $viewPath = $value.'.'.$column;
+            $from = $this->option('from');
+            $namespaces = ViewNamespaces::getFor($this->viewNamespace);
+            foreach ($namespaces as $namespace) {
+                $viewPath = "$namespace.$from";
                 if (view()->exists($viewPath)) {
-                    $src = view($viewPath)->getPath();
+                    $source = view($viewPath)->getPath();
                     break;
                 }
             }
-            if ($src == null) {
-                $this->error("Error : $this->type $column does not exist!");
+
+            // full file path may be provided
+            if (file_exists($from)) {
+                $source = $from;
+            }
+
+            if (! $source) {
+                $this->errorProgressBlock();
+                $this->note("$this->type '$from' does not exist!", 'red');
+                $this->newLine();
 
                 return false;
             }
         }
 
-        $this->infoBlock("Creating {$name->replace('_', ' ')->title()} {$this->type}");
-        $this->progressBlock("Creating view <fg=blue>resources/views/vendor/backpack/crud/columns/{$name->snake('_')}.blade.php</>");
-
         $this->makeDirectory($path);
-        if ($src != null) {
-            $this->files->copy($src, $path);
+
+        if ($source) {
+            $this->files->copy($source, $path);
         } else {
             $this->files->put($path, $this->buildClass($name));
         }
 
         $this->closeProgressBlock();
-        $this->newLine();
-        $this->info($this->type.' created successfully.');
     }
 
     /**
@@ -145,12 +150,15 @@ protected function buildClass($name)
     }
 
     /**
-     * Get the console command options.
+     * Get the desired class name from the input.
      *
-     * @return array
+     * @return string
      */
-    protected function getOptions()
+    protected function getNameInput()
     {
-        return [];
+        return Str::of($this->argument('name'))
+            ->trim()
+            ->snake('_')
+            ->value;
     }
 }