formatting

laravel · Feb 23, 2021 · b78093b · b78093b
1 parent ef2b3f9
commit b78093b
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 11 deletions.
diff --git a/bin/sail b/bin/sail
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -11,7 +11,7 @@ class InstallCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'sail:install';
+    protected $signature = 'sail:install {--services= : The services that should be included in the installation}';
 
     /**
      * The console command description.
@@ -27,21 +27,37 @@ class InstallCommand extends Command
      */
     public function handle()
     {
-        $services = $this->choice('Which services would you like to install?', [
-            'mysql',
-            'pgsql',
-            'redis',
-            'selenium',
-            'mailhog',
-            'meilisearch',
-        ], 0, null, true);
+        if ($this->option('services')) {
+            $services = $this->option('services') == 'none' ? [] : explode(',', $this->option('services'));
+        } elseif ($this->option('no-interaction')) {
+            $services = ['mysql', 'redis', 'selenium', 'mailhog'];
+        } else {
+            $services = $this->gatherServicesWithSymfonyMenu();
+        }
 
         $this->buildDockerCompose($services);
         $this->replaceEnvVariables($services);
 
         $this->info('Sail scaffolding installed successfully.');
     }
 
+    /**
+     * Gather the desired Sail services using a Symfony menu.
+     *
+     * @return array
+     */
+    protected function gatherServicesWithSymfonyMenu()
+    {
+        return $this->choice('Which services would you like to install?', [
+             'mysql',
+             'pgsql',
+             'redis',
+             'selenium',
+             'mailhog',
+             'meilisearch',
+         ], 0, null, true);
+    }
+
     /**
      * Build the Docker Compose file.
      *
@@ -74,10 +90,13 @@ protected function buildDockerCompose(array $services)
 
         $dockerCompose = file_get_contents(__DIR__ . '/../../stubs/docker-compose.stub');
 
-        $dockerCompose = str_replace('{{depends}}', $depends, $dockerCompose);
+        $dockerCompose = str_replace('{{depends}}', empty($depends) ? '' : '        '.$depends, $dockerCompose);
         $dockerCompose = str_replace('{{services}}', $stubs, $dockerCompose);
         $dockerCompose = str_replace('{{volumes}}', $volumes, $dockerCompose);
 
+        // Remove empty lines...
+        $dockerCompose = preg_replace("/(^[\r\n]*|[\r\n]+)[\s\t]*[\r\n]+/", "\n", $dockerCompose);
+
         file_put_contents($this->laravel->basePath('docker-compose.yml'), $dockerCompose);
     }
 

diff --git a/stubs/docker-compose.stub b/stubs/docker-compose.stub
@@ -17,7 +17,7 @@ services:
             - '.:/var/www/html'
         networks:
             - sail
-        {{depends}}
+{{depends}}
 {{services}}
 networks:
     sail: