Prevent setup to run again if already configured when using bake

Author: lcharette

app/system/Bakery/Command/Bake.php

@@ -56,7 +56,10 @@ protected function execute(InputInterface $input, OutputInterface $output)
     {
         $this->io->writeln("<info>{$this->title}</info>");
 
-        $command = $this->getApplication()->find('setup');
+        $command = $this->getApplication()->find('setup:db');
+        $command->run($input, $output);
+
+        $command = $this->getApplication()->find('setup:smtp');
         $command->run($input, $output);
 
         $command = $this->getApplication()->find('debug');

app/system/Bakery/Command/SetupDbCommand.php

@@ -36,6 +36,7 @@ protected function configure()
         $this->setName("setup:db")
              ->setDescription("UserFrosting Database Configuration Wizard")
              ->setHelp("Helper command to setup the database configuration. This can also be done manually by editing the <comment>app/.env</comment> file or using global server environment variables.")
+             ->addOption('force', null, InputOption::VALUE_NONE, "Force setup if db is already configured")
              ->addOption('db_driver', null, InputOption::VALUE_OPTIONAL, "The database driver {$this->getDatabaseDriversList()}")
              ->addOption('db_name', null, InputOption::VALUE_OPTIONAL, "The database name")
              ->addOption('db_host', null, InputOption::VALUE_OPTIONAL, "The database hostname")
@@ -56,6 +57,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // Display header,
         $this->io->title("UserFrosting's Database Setup Wizard");
+
+        // Check if db is already setup
+        if (!$input->getOption('force') && $this->testDatabase($config["db.default"], false)) {
+            $this->io->note("Database already setup. Use the `php bakery setup:db --force` command to run db setup again.");
+            return;
+        }
+
         $this->io->note("Database credentials will be saved in `{$this->envPath}`");
 
         // Get an instance of the DotenvEditor
@@ -89,7 +97,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $dbParams = $this->askForDatabase($input);
 
         // Test database
-        $this->testDatabase($dbParams);
+        if (!$this->testDatabase($dbParams)) {
+            exit(1);
+        } else {
+            $this->io->success("Database connection successful");
+        }
 
         // Time to save
         $this->io->section("Saving data");
@@ -189,9 +201,10 @@ protected function askForDatabase(InputInterface $args)
      * Test new database connecion
      *
      * @param  array $dbParams Database params
-     * @return void (Exit if fails)
+     * @param  bool $displayMessage Display io message
+     * @return bool Return true if db is successful
      */
-    protected function testDatabase($dbParams)
+    protected function testDatabase($dbParams, $displayMessage = true)
     {
         // Setup a new db connection
         $capsule = new Capsule;
@@ -201,14 +214,17 @@ protected function testDatabase($dbParams)
         try {
             $conn = $capsule->getConnection();
             $conn->getPdo();
-            $this->io->success("Database connection successful");
         } catch (\PDOException $e) {
-            $message  = "Could not connect to the database '{$dbParams['username']}@{$dbParams['host']}/{$dbParams['database']}':".PHP_EOL;
-            $message .= "Exception: " . $e->getMessage() . PHP_EOL.PHP_EOL;
-            $message .= "Please check your database configuration and/or google the exception shown above and run the command again.";
-            $this->io->error($message);
-            exit(1);
+            if ($displayMessage) {
+                $message  = "Could not connect to the database '{$dbParams['username']}@{$dbParams['host']}/{$dbParams['database']}':".PHP_EOL;
+                $message .= "Exception: " . $e->getMessage() . PHP_EOL.PHP_EOL;
+                $message .= "Please check your database configuration and/or google the exception shown above and run the command again.";
+                $this->io->error($message);
+            }
+            return false;
         }
+
+        return true;
     }
 
     /**

app/system/Bakery/Command/SetupSmtpCommand.php

@@ -50,6 +50,7 @@ protected function configure()
         $this->setName('setup:smtp')
              ->setDescription('UserFrosting SMTP Configuration Wizard')
              ->setHelp('Helper command to setup outgoing email configuration. This can also be done manually by editing the <comment>app/.env</comment> file or using global server environment variables.')
+             ->addOption('force', null, InputOption::VALUE_NONE, "Force setup if SMTP appears to be already configured")
              ->addOption('smtp_host', null, InputOption::VALUE_OPTIONAL, 'The SMTP server hostname')
              ->addOption('smtp_user', null, InputOption::VALUE_OPTIONAL, 'The SMTP server user')
              ->addOption('smtp_password', null, InputOption::VALUE_OPTIONAL, 'The SMTP server password');
@@ -67,13 +68,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // Display header,
         $this->io->title("UserFrosting's SMTP Setup Wizard");
-        $this->io->note("SMTP credentials will be saved in `{$this->envPath}`");
 
         // Get an instance of the DotenvEditor
         $dotenvEditor = new DotenvEditor(\UserFrosting\APP_DIR, false);
         $dotenvEditor->load($this->envPath);
         $dotenvEditor->save(); // Save make sure empty file is created if none exist before reading it
 
+        // Check if db is already setup
+        if (!$input->getOption('force') && $this->isSmtpConfigured($dotenvEditor)) {
+            $this->io->note("SMTP already setup. Use the `php bakery setup:smtp --force` command to run SMTP setup again.");
+            return;
+        }
+
         // Get keys
         $keys = [
             'SMTP_HOST' => ($dotenvEditor->keyExists('SMTP_HOST')) ? $dotenvEditor->getValue('SMTP_HOST') : '',
@@ -94,6 +100,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
             }
         }
 
+        $this->io->note("SMTP credentials will be saved in `{$this->envPath}`");
+
         // Ask for SMTP info
         $smtpParams = $this->askForSmtpMethod($input);
 
@@ -206,4 +214,19 @@ protected function askForNone(InputInterface $input)
             $this->askForSmtpMethod($input);
         }
     }
+
+    /**
+     * Check if the app/.env SMTP portion is defined or not.
+     *
+     * @param  DotenvEditor $dotenvEditor
+     * @return bool true if SMTP is configured in .env file
+     */
+    protected function isSmtpConfigured(DotenvEditor $dotenvEditor)
+    {
+        if ($dotenvEditor->keyExists('SMTP_HOST') && $dotenvEditor->keyExists('SMTP_USER') && $dotenvEditor->keyExists('SMTP_PASSWORD')) {
+            return true;
+        } else {
+            return false;
+        }
+    }
 }