fix settings env var priority

Author: DannyBen

.rubocop.yml

@@ -37,8 +37,9 @@ RSpec/SpecFilePathFormat:
     - 'spec/bashly/concerns/completions_command_spec.rb'
     - 'spec/bashly/concerns/completions_flag_spec.rb'
 
-# Allow longer integration examples as they are more complex by nature
+# Allow longer examples in some cases
 RSpec/ExampleLength:
   Exclude:
     - 'spec/bashly/integration/**/*'
     - 'spec/bashly/libraries/render*'
+    - 'spec/bashly/script/command_spec.rb'

lib/bashly/settings.rb

@@ -160,29 +160,29 @@ def var_aliases
     private
 
       def get(key)
-        value_from_env(key) || value_from_config(key)
+        ENV.has_key?(env_var_name(key)) ? value_from_env(key) : value_from_config(key)
+      end
+
+      def env_var_name(key)
+        "BASHLY_#{key.upcase}"
       end
 
       def value_from_config(key)
-        if key != :env
-          config["#{key}_#{env}"] || config["#{key}"]
-        else
-          config["#{key}"]
-        end
+        return config[key.to_s] if key == :env
+
+        result = config["#{key}_#{env}"]
+        result.nil? ? config[key.to_s] : result
       end
 
       def value_from_env(key)
-        case env_value key
-        when '0', 'false', 'no'  then false
-        when '1', 'true', 'yes'  then true
-        else env_value key
+        result = ENV[env_var_name(key)]
+        case result&.strip&.downcase
+        when '0', 'false', 'no' then false
+        when '1', 'true', 'yes' then true
+        else result
         end
       end
 
-      def env_value(key)
-        ENV["BASHLY_#{key.upcase}"]
-      end
-
       def config
         @config ||= default_settings.merge user_settings
       end

spec/bashly/settings_spec.rb

@@ -95,7 +95,6 @@
         end
       end
     end
-
   end
 
   describe '::env' do