cleanup

Author: rabol

src/Console/Commands/SetEnvCommand.php

@@ -6,6 +6,10 @@
 use Jackiedo\DotenvEditor\Exceptions\InvalidValueException;
 use Jackiedo\DotenvEditor\Facades\DotenvEditor;
 
+/**
+ * Class SetEnvCommand
+ * @package Rabol\LaravelSetupLocalDev\Console\Commands
+ */
 class SetEnvCommand extends Command
 {
     /**
@@ -39,33 +43,14 @@ public function __construct()
      */
     public function handle()
     {
-
-        if(!file_exists(base_path() . '/.env'))
-        {
-            copy('.env.example', '.env');
-        }
+        $this->validateOrCopyEnvFile();
+        $default_env_vars_file = $this->validateOrUserEnvFile();
 
         $this->info('Installing default .env vars.');
-
-        if($this->option('file') !== null)
-        {
-            $default_env_vars_file = $this->option('file');
-        }
-        else
-        {
-            $default_env_vars_file = get_home_directory();
-            $default_env_vars_file .= '/.default_vars.env';
-        }
-
-        if(!file_exists($default_env_vars_file))
-        {
-            $this->error('File: \'' . $default_env_vars_file . '\' does not exists.');
-            exit();
-        }
-
         $this->info('Reading from: ' . $default_env_vars_file);
 
         $user_vars = DotenvEditor::load($default_env_vars_file);
+
         try {
             $user_keys = $user_vars->getKeys();
         }
@@ -76,7 +61,6 @@ public function handle()
             exit();
         }
 
-
         // Load the .env
         try {
             $app_env = DotenvEditor::load();
@@ -87,15 +71,14 @@ public function handle()
             exit();
         }
 
-
         // Now apply the user vars
         foreach ($user_keys as $user_key => $user_value)
         {
             $newValue = $user_value['value'];
 
             if($newValue == '[ASK_FOR_VALUE]')
             {
-                $newValue = $this->ask("Please ente value for '$user_key'");
+                $newValue = $this->ask("Please enter a value for '$user_key'");
             }
 
             if($app_env->keyExists($user_key))
@@ -116,4 +99,47 @@ public function handle()
         $this->call('config:clear');
         $this->info('Done!');
     }
+
+    /**
+     *
+     */
+    public function validateOrCopyEnvFile()
+    {
+        if(!file_exists(base_path() . '/.env'))
+        {
+            if(!file_exists('.env.example'))
+            {
+                $this->error('.env or .evn.example does not exists, please create .env and try again');
+                exit();
+
+            }
+            copy('.env.example', '.env');
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function validateOrUserEnvFile(): string
+    {
+        $default_env_vars_file = "";
+
+        if($this->option('file') !== null)
+        {
+            $default_env_vars_file = $this->option('file');
+        }
+        else
+        {
+            $default_env_vars_file = get_home_directory();
+            $default_env_vars_file .= '/.default_vars.env';
+        }
+
+        if(!file_exists($default_env_vars_file))
+        {
+            $this->error('File: \'' . $default_env_vars_file . '\' does not exists.');
+            exit();
+        }
+
+        return $default_env_vars_file;
+    }
 }