feat: add option to docker:create command to configure project

carlalexander · carlalexander · commit 3e6a20faadf4 · 2021-09-06T17:41:49.000-04:00
diff --git a/src/Command/Docker/CreateDockerfileCommand.php b/src/Command/Docker/CreateDockerfileCommand.php
@@ -16,6 +16,7 @@
 use Symfony\Component\Console\Exception\RuntimeException;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Filesystem\Filesystem;
 use Ymir\Cli\ApiClient;
 use Ymir\Cli\CliConfiguration;
@@ -73,7 +74,8 @@ protected function configure()
         $this
             ->setName(self::NAME)
             ->setDescription('Create a new Dockerfile')
-            ->addArgument('environment', InputArgument::OPTIONAL, 'The name of the environment to create the Dockerfile for');
+            ->addArgument('environment', InputArgument::OPTIONAL, 'The name of the environment to create the Dockerfile for')
+            ->addOption('configure-project', null, InputOption::VALUE_NONE, 'Configure project\'s ymir.yml file');
     }
 
     /**
@@ -108,5 +110,15 @@ protected function perform(InputInterface $input, ConsoleOutput $output)
         }
 
         $output->info($message);
+
+        if (!$this->getBooleanOption($input, 'configure-project') && !$output->confirm('Would you like to configure your project for container image deployment?')) {
+            return;
+        }
+
+        $options = [
+            'deployment' => 'image',
+        ];
+
+        empty($environment) ? $this->projectConfiguration->addOptionsToEnvironments($options) : $this->projectConfiguration->addOptionsToEnvironment($environment, $options);
     }
 }
diff --git a/src/Command/Project/InitializeProjectCommand.php b/src/Command/Project/InitializeProjectCommand.php
@@ -144,11 +144,7 @@ protected function perform(InputInterface $input, ConsoleOutput $output)
             }
 
             if ($output->confirm('Will you deploy this project using a container image?', false)) {
-                $this->invoke($output, CreateDockerfileCommand::NAME);
-
-                $this->projectConfiguration->addOptionsToEnvironments([
-                    'deployment' => 'image',
-                ]);
+                $this->invoke($output, CreateDockerfileCommand::NAME, ['--configure-project']);
             }
         }, 'Do you want to try creating a project again?', $output);
     }
diff --git a/src/ProjectConfiguration.php b/src/ProjectConfiguration.php
@@ -76,13 +76,21 @@ public function addEnvironment(string $name, ?array $options = null)
         $this->configuration['environments'][$name] = $options;
     }
 
+    /**
+     * Add the given options to the given project environment.
+     */
+    public function addOptionsToEnvironment(string $environment, array $options)
+    {
+        $this->configuration['environments'][$environment] = array_merge((array) $this->configuration['environments'][$environment], $options);
+    }
+
     /**
      * Add the given options to all project environments.
      */
     public function addOptionsToEnvironments(array $options)
     {
-        foreach ($this->configuration['environments'] as $name => $environment) {
-            $this->configuration['environments'][$name] = array_merge((array) $environment, $options);
+        foreach ($this->getEnvironments() as $environment) {
+            $this->addOptionsToEnvironment($environment, $options);
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,7 @@ protected function perform(InputInterface $input, ConsoleOutput $output)`
`144`	`144`	`}`
`145`	`145`
`146`	`146`	`if ($output->confirm('Will you deploy this project using a container image?', false)) {`
`147`		`- $this->invoke($output, CreateDockerfileCommand::NAME);`
`148`		`-`
`149`		`- $this->projectConfiguration->addOptionsToEnvironments([`
`150`		`- 'deployment' => 'image',`
`151`		`- ]);`
	`147`	`+ $this->invoke($output, CreateDockerfileCommand::NAME, ['--configure-project']);`
`152`	`148`	`}`
`153`	`149`	`}, 'Do you want to try creating a project again?', $output);`
`154`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -76,13 +76,21 @@ public function addEnvironment(string $name, ?array $options = null)`
`76`	`76`	`$this->configuration['environments'][$name] = $options;`
`77`	`77`	`}`
`78`	`78`
	`79`	`+ /**`
	`80`	`+ * Add the given options to the given project environment.`
	`81`	`+ */`
	`82`	`+ public function addOptionsToEnvironment(string $environment, array $options)`
	`83`	`+ {`
	`84`	`+ $this->configuration['environments'][$environment] = array_merge((array) $this->configuration['environments'][$environment], $options);`
	`85`	`+ }`
	`86`	`+`
`79`	`87`	`/**`
`80`	`88`	`* Add the given options to all project environments.`
`81`	`89`	`*/`
`82`	`90`	`public function addOptionsToEnvironments(array $options)`
`83`	`91`	`{`
`84`		`- foreach ($this->configuration['environments'] as $name => $environment) {`
`85`		`- $this->configuration['environments'][$name] = array_merge((array) $environment, $options);`
	`92`	`+ foreach ($this->getEnvironments() as $environment) {`
	`93`	`+ $this->addOptionsToEnvironment($environment, $options);`
`86`	`94`	`}`
`87`	`95`	`}`
`88`	`96`