improved migration cli

reinvanoyen · Nov 13, 2019 · e37cc87 · e37cc87
1 parent d5f6ea7
commit e37cc87
Show file tree

Hide file tree

Showing 24 changed files with 279 additions and 319 deletions.
diff --git a/src/Application.php b/src/Application.php
@@ -10,7 +10,7 @@
  */
 class Application extends Container
 {
-    const VERSION = '1.0.6';
+    const VERSION = '1.0.7';
 
     /**
      * @var bool $isBooted

diff --git a/src/Console/Command/Command.php b/src/Console/Command/Command.php
@@ -45,8 +45,6 @@ public function __construct(ContainerInterface $app)
     abstract protected function createSignature(Signature $signature): Signature;
 
     /**
-     * Gets the name of the command
-     *
      * @return string
      * @throws \Exception
      */
@@ -62,8 +60,6 @@ final public function getName(): string
     }
 
     /**
-     * Gets the description of the command
-     *
      * @return string
      * @throws \Exception
      */
@@ -75,9 +71,8 @@ final public function getDescription(): string
     }
 
     /**
-     * Gets the signature of the command
-     *
      * @return Signature
+     * @throws \Exception
      */
     final public function getSignature(): Signature
     {
@@ -111,17 +106,17 @@ final private function make()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
+     * @throws \Exception
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->outputHelpMessage($output);
     }
 
     /**
-     * Runs the command
-     *
      * @param InputInterface $input
      * @param OutputInterface $output
+     * @throws \Exception
      */
     final public function run(InputInterface $input, OutputInterface $output)
     {
@@ -146,9 +141,8 @@ final public function run(InputInterface $input, OutputInterface $output)
     }
 
     /**
-     * Output an auto-generated help message
-     *
      * @param OutputInterface $output
+     * @throws \Exception
      */
     public function outputHelpMessage(OutputInterface $output)
     {

diff --git a/src/Console/Command/Option.php b/src/Console/Command/Option.php
@@ -27,6 +27,11 @@ class Option
      */
     private $description = '';
 
+    /**
+     * @var $default
+     */
+    private $default = true;
+
     /**
      * Option constructor.
      * @param string $name
@@ -81,13 +86,30 @@ public function getDescription(): string
     }
 
     /**
-     * Sets the description of the option
-     *
+     * @return bool
+     */
+    public function getDefault()
+    {
+        return $this->default;
+    }
+
+    /**
      * @param string $description
+     * @return $this
      */
     public function setDescription(string $description)
     {
         $this->description = $description;
         return $this;
     }
+
+    /**
+     * @param $default
+     * @return $this
+     */
+    public function setDefault($default)
+    {
+        $this->default = $default;
+        return $this;
+    }
 }
diff --git a/src/Console/Input/ConsoleInput.php b/src/Console/Input/ConsoleInput.php
@@ -62,29 +62,47 @@ private function parse()
             }
         }
 
-        // First we parse out the options
+        // Then we parse out the options
         foreach ($this->getSignature()->getOptions() as $option) {
+
             $definitions = [
                 '-'.$option->getName(),
                 '--'.$option->getName(),
             ];
 
-            if ($option->getAlias()) {
-                $definitions[] = '-'.$option->getAlias();
-                $definitions[] = '--'.$option->getAlias();
+            if ($alias = $option->getAlias()) {
+                $definitions[] = '-'.$alias;
+                $definitions[] = '--'.$alias;
             }
 
             foreach ($definitions as $definition) {
                 $optionPosition = array_search($definition, $this->rawArguments);
+
                 if ($optionPosition !== false) {
+
+                    // We found the option in the list of given arguments
+                    if (
+                        isset($this->rawArguments[$optionPosition + 1]) &&
+                        substr($this->rawArguments[$optionPosition + 1], 0, strlen('-')) !== '-'
+                    ) {
+                        // We also found a value for the option
+                        // We remove the value of the option from the argument list
+                        $optionValue = $this->rawArguments[$optionPosition + 1];
+                        $this->setOption($option->getName(), $optionValue);
+                        array_splice($this->rawArguments, $optionPosition + 1, 1);
+
+                    } else {
+
+                        $this->setOption($option->getName(), $option->getDefault());
+                    }
+
                     array_splice($this->rawArguments, $optionPosition, 1);
-                    $this->setOption($option->getName());
                     break;
                 }
             }
         }
 
-        // Now we loop all arguments and me sure they are present
+        // Now we loop all arguments and make sure they are present
         foreach ($this->getSignature()->getArguments() as $position => $argument) {
             if (isset($this->rawArguments[$position])) {
                 $this->setArgument($argument->getName(), $this->rawArguments[$position]);

diff --git a/src/Console/Input/Input.php b/src/Console/Input/Input.php
@@ -106,9 +106,9 @@ final public function getOption(string $name)
      * Sets an option
      *
      * @param string $name
-     * @param bool $value
+     * @param mixed $value
      */
-    public function setOption(string $name, $value = true)
+    public function setOption(string $name, $value)
     {
         $this->options[$name] = $value;
     }

diff --git a/src/Console/Kernel.php b/src/Console/Kernel.php
@@ -24,10 +24,9 @@ class Kernel extends Command implements KernelInterface
     private $registeredCommands = [];
 
     /**
-     * Handle the incoming input
-     *
      * @param InputInterface $input
      * @param OutputInterface $output
+     * @throws \Exception
      */
     public function handle(InputInterface $input, OutputInterface $output)
     {
@@ -61,12 +60,13 @@ protected function createSignature(Signature $signature): Signature
     {
         return $signature->setName('oak')
             ->addOption(Option::create('version', 'v')->setDescription('Display the version of Oak framework'))
-            ;
+        ;
     }
 
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
+     * @throws \Exception
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {

diff --git a/src/Contracts/Console/InputInterface.php b/src/Contracts/Console/InputInterface.php
@@ -23,7 +23,7 @@ public function setArgument(string $name, $value);
 
 	public function getOptions();
 	public function getOption(string $name);
-	public function setOption(string $name, $value = true);
+	public function setOption(string $name, $value);
 
 	public function hasSubCommand(): bool;
 	public function getSubCommand();

diff --git a/src/Migration/Console/DowndateCommand.php b/src/Migration/Console/DowndateCommand.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Oak\Migration\Console;
+
+use Oak\Console\Command\Command;
+use Oak\Console\Command\Option;
+use Oak\Console\Command\Signature;
+use Oak\Contracts\Console\InputInterface;
+use Oak\Contracts\Console\OutputInterface;
+use Oak\Contracts\Container\ContainerInterface;
+use Oak\Migration\MigrationManager;
+
+class DowndateCommand extends Command
+{
+    /**
+     * @var MigrationManager $manager
+     */
+    private $manager;
+
+    /**
+     * MigrationManagerCommand constructor.
+     * @param MigrationManager $manager
+     * @param ContainerInterface $app
+     */
+    public function __construct(MigrationManager $manager, ContainerInterface $app)
+    {
+        $this->manager = $manager;
+        parent::__construct($app);
+    }
+
+    protected function createSignature(Signature $signature): Signature
+    {
+        return $signature
+            ->setName('downdate')
+            ->addOption(
+                Option::create('migrator', 'm')
+                    ->setDescription('Specify a specific migrator')
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        foreach ($this->manager->getMigrators() as $migrator) {
+
+            if (
+                ! ($migratorName = $input->getOption('migrator')) ||
+                $migrator->getName() === $migratorName
+            ) {
+                $migrator->downdate();
+
+                if ($migratorName) {
+                    break;
+                }
+            }
+        }
+    }
+}
diff --git a/...ion/Console/Manager/MigrateAllCommand.php → src/Migration/Console/ListCommand.php b/...ion/Console/Manager/MigrateAllCommand.php → src/Migration/Console/ListCommand.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Oak\Migration\Console\Manager;
+namespace Oak\Migration\Console;
 
 use Oak\Console\Command\Command;
 use Oak\Console\Command\Signature;
@@ -9,7 +9,7 @@
 use Oak\Contracts\Container\ContainerInterface;
 use Oak\Migration\MigrationManager;
 
-class MigrateAllCommand extends Command
+class ListCommand extends Command
 {
     /**
      * @var MigrationManager $manager
@@ -30,15 +30,19 @@ public function __construct(MigrationManager $manager, ContainerInterface $app)
     protected function createSignature(Signature $signature): Signature
     {
         return $signature
-            ->setName('migrate-all')
-            ;
+            ->setName('list')
+        ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        if (! count($this->manager->getMigrators())) {
+            $output->writeLine('No migrators registered', OutputInterface::TYPE_ERROR);
+            return;
+        }
+
         foreach ($this->manager->getMigrators() as $migrator) {
-            $output->writeLine('Start '.$migrator->getName().' migrator ('.$migrator->getVersion().'/'.$migrator->getMaxVersion().')', OutputInterface::TYPE_INFO);
-            $migrator->migrate();
+            $output->writeLine($migrator->getName().' ('.$migrator->getVersion().'/'.$migrator->getMaxVersion().')');
         }
     }
 }
diff --git a/src/Migration/Console/Manager/MigrationManagerCommand.php b/src/Migration/Console/Manager/MigrationManagerCommand.php
diff --git a/src/Migration/Console/MigrateCommand.php b/src/Migration/Console/MigrateCommand.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace Oak\Migration\Console;
+
+use Oak\Console\Command\Command;
+use Oak\Console\Command\Option;
+use Oak\Console\Command\Signature;
+use Oak\Contracts\Console\InputInterface;
+use Oak\Contracts\Console\OutputInterface;
+use Oak\Contracts\Container\ContainerInterface;
+use Oak\Migration\MigrationManager;
+
+class MigrateCommand extends Command
+{
+    /**
+     * @var MigrationManager $manager
+     */
+    private $manager;
+
+    /**
+     * MigrationManagerCommand constructor.
+     * @param MigrationManager $manager
+     * @param ContainerInterface $app
+     */
+    public function __construct(MigrationManager $manager, ContainerInterface $app)
+    {
+        $this->manager = $manager;
+        parent::__construct($app);
+    }
+
+    protected function createSignature(Signature $signature): Signature
+    {
+        return $signature
+            ->setName('migrate')
+            ->addOption(
+                Option::create('migrator', 'm')
+                    ->setDescription('Specify a specific migrator')
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        foreach ($this->manager->getMigrators() as $migrator) {
+
+            if (
+                ! ($migratorName = $input->getOption('migrator')) ||
+                $migrator->getName() === $migratorName
+            ) {
+                $migrator->migrate();
+
+                if ($migratorName) {
+                    break;
+                }
+            }
+        }
+    }
+}