Merge pull request #37 from bluzphp/develop

Added `--force` option to file generators

Author: Anton

bin/bluzman

@@ -35,16 +35,23 @@ ini_set('display_errors', 1);
 ini_set('log_errors', 0);
 ini_set('html_errors', 0);
 
-// Get project info from composer.json
-$composerConfig = json_decode(
-    file_get_contents(PATH_VENDOR .DS. 'bluzphp' .DS. 'bluzman' .DS. 'composer.json'),
-    true
-);
-require_once PATH_VENDOR . '/autoload.php';
-
-$application = new Bluzman\Application\Application(
-    $composerConfig['description'],
-    $composerConfig['version'] ?? 'dev'
-);
-$application->init();
-$application->run();
+try {
+    // Get project info from composer.json
+    $composerConfig = json_decode(
+        file_get_contents(PATH_VENDOR . DS . 'bluzphp' . DS . 'bluzman' . DS . 'composer.json'),
+        true
+    );
+    require_once PATH_VENDOR . '/autoload.php';
+
+    $application = new Bluzman\Application\Application(
+        $composerConfig['description'],
+        $composerConfig['version'] ?? 'dev'
+    );
+    $application->init();
+    $application->run();
+} catch (\Throwable $e) {
+    echo "Error #{$e->getCode()}:\n\n";
+    echo "\t{$e->getFile()}:{$e->getLine()}\n";
+    echo "\t{$e->getMessage()}\n";
+    echo "\n";
+}

src/Command/Generate/AbstractGenerateCommand.php

@@ -14,6 +14,7 @@
 use Bluzman\Generator\GeneratorException;
 use Bluzman\Input\InputArgument;
 use Bluzman\Input\InputException;
+use Bluzman\Input\InputOption;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -31,6 +32,17 @@ abstract class AbstractGenerateCommand extends AbstractCommand
      */
     abstract public function verify(InputInterface $input, OutputInterface $output) : void;
 
+    /**
+     * Add Force Option
+     *
+     * @return void
+     */
+    protected function addForceOption() : void
+    {
+        $force = new InputOption('--force', '-f', InputOption::VALUE_NONE, 'Rewrite previously generated files');
+        $this->getDefinition()->addOption($force);
+    }
+
     /**
      * Add Model Argument
      *
@@ -142,8 +154,9 @@ protected function getTemplate($class)
      */
     protected function generateFile($class, $file, array $data = []) : void
     {
-        if (file_exists($file)) {
+        if (file_exists($file) && !$this->getInput()->getOption('force')) {
             $this->comment(" |> File <info>$file</info> already exists");
+            return;
         }
 
         $template = $this->getTemplate($class);

src/Command/Generate/ControllerCommand.php

@@ -34,6 +34,7 @@ protected function configure()
 
         $this->addModuleArgument();
         $this->addControllerArgument();
+        $this->addForceOption();
     }
 
     /**

src/Command/Generate/CrudCommand.php

@@ -31,10 +31,12 @@ protected function configure()
             ->setDescription('Generate a CRUD for model')
             // the full command description shown when running the command with
             // the "--help" option
-            ->setHelp('This command allows you to generate CRUD files');
+            ->setHelp('This command allows you to generate CRUD files')
+        ;
 
         $this->addModelArgument();
         $this->addModuleArgument(InputArgument::OPTIONAL);
+        $this->addForceOption();
     }
 
     /**

src/Command/Generate/GridCommand.php

@@ -36,6 +36,7 @@ protected function configure()
 
         $this->addModelArgument();
         $this->addModuleArgument(InputArgument::OPTIONAL);
+        $this->addForceOption();
     }
 
     /**

src/Command/Generate/ModelCommand.php

@@ -35,6 +35,7 @@ protected function configure()
 
         $this->addModelArgument();
         $this->addTableArgument();
+        $this->addForceOption();
     }
 
     /**

src/Command/Generate/ModuleCommand.php

@@ -33,6 +33,7 @@ protected function configure()
         ;
 
         $this->addModuleArgument();
+        $this->addForceOption();
     }
 
     /**

src/Command/Generate/RestCommand.php

@@ -35,6 +35,7 @@ protected function configure()
 
         $this->addModelArgument();
         $this->addModuleArgument();
+        $this->addForceOption();
     }
 
     /**

src/Command/Generate/ScaffoldCommand.php

@@ -36,6 +36,7 @@ protected function configure()
         $this->addModelArgument();
         $this->addTableArgument();
         $this->addModuleArgument();
+        $this->addForceOption();
     }
 
     /**