lorisleiva#52 Optimized initialization command

Andrey Helldar · Andrey Helldar · commit 06823d598f90 · 2018-10-03T15:49:16.000+03:00
diff --git a/src/LaravelDeployer/Commands/DeployInit.php b/src/LaravelDeployer/Commands/DeployInit.php
@@ -141,35 +141,44 @@ public function defineDeployementPath()
     public function defineAdditionalHooks()
     {
         $npm = $this->choice(
-            'Do you want to compile your asset during deployment with NPM?',
-            ['No', 'Yes using `npm run production`', 'Yes using `npm run development`'], 1
+            'Do you want to compile your asset during deployment with npm/yarn?',
+            [
+                'No',
+                'Yes using `npm run production`',
+                'Yes using `npm run development`',
+                'Yes using `yarn production`',
+                'Yes using `yarn development`',
+            ], 1
         );
 
-        if ($npm !== 'No') {
-            $build = $npm === 'Yes using `npm run production`' ? 'production' : 'development';
-            $this->builder->add('hooks.build', 'npm:install');
-            $this->builder->add('hooks.build', "npm:$build");
+        if ($npm === 'Yes using `npm run production`') {
+            $this->addHooksCompileAssets('npm', 'production');
         }
 
-        if ($npm === 'No') {
-            $yarn = $this->choice(
-                'Do you want to compile your asset during deployment with YARN?',
-                ['No', 'Yes using `yarn production`', 'Yes using `yarn development`'], 1
-            );
+        if ($npm === 'Yes using `npm run development`') {
+            $this->addHooksCompileAssets('npm', 'development');
+        }
 
-            if ($yarn !== 'No') {
-                $build = $yarn === 'Yes using `yarn production`' ? 'production' : 'development';
-                $this->builder->add('hooks.build', 'yarn:install');
-                $this->builder->add('hooks.build', "yarn:$build");
-            }
+        if ($npm === 'Yes using `yarn production`') {
+            $this->addHooksCompileAssets('yarn', 'production');
         }
-        
+
+        if ($npm === 'Yes using `yarn development`') {
+            $this->addHooksCompileAssets('yarn', 'development');
+        }
+
         if ($this->confirm('Do you want to migrate during deployment?', true)) {
             $this->builder->add('hooks.ready', 'artisan:migrate');
         }
-        
+
         if ($this->confirm('Do you want to terminate horizon after each deployment?')) {
             $this->builder->add('hooks.ready', 'artisan:horizon:terminate');
         }
     }
+
+    private function addHooksCompileAssets($manager, $environment)
+    {
+        $this->builder->add('hooks.build', "$manager:install");
+        $this->builder->add('hooks.build', "$manager:$environment");
+    }
 }
