Commit 110450d

committed

fix settings env var priority

1 parent 522d2b8 commit 110450dCopy full SHA for 110450d

File tree

+16

-16

lines changed

+16

-16

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,9 @@ RSpec/SpecFilePathFormat:`
`37`	`37`	`- 'spec/bashly/concerns/completions_command_spec.rb'`
`38`	`38`	`- 'spec/bashly/concerns/completions_flag_spec.rb'`
`39`	`39`
`40`		`-# Allow longer integration examples as they are more complex by nature`
	`40`	`+# Allow longer examples in some cases`
`41`	`41`	`RSpec/ExampleLength:`
`42`	`42`	`Exclude:`
`43`	`43`	`- 'spec/bashly/integration/*/'`
`44`	`44`	`- 'spec/bashly/libraries/render*'`
	`45`	`+ - 'spec/bashly/script/command_spec.rb'`

Lines changed: 14 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -160,29 +160,29 @@ def var_aliases`
`160`	`160`	`private`
`161`	`161`
`162`	`162`	`def get(key)`
`163`		`- value_from_env(key) \|\| value_from_config(key)`
	`163`	`+ ENV.has_key?(env_var_name(key)) ? value_from_env(key) : value_from_config(key)`
	`164`	`+ end`
	`165`	`+`
	`166`	`+ def env_var_name(key)`
	`167`	`+ "BASHLY_#{key.upcase}"`
`164`	`168`	`end`
`165`	`169`
`166`	`170`	`def value_from_config(key)`
`167`		`- if key != :env`
`168`		`- config["#{key}_#{env}"] \|\| config["#{key}"]`
`169`		`- else`
`170`		`- config["#{key}"]`
`171`		`- end`
	`171`	`+ return config[key.to_s] if key == :env`
	`172`	`+`
	`173`	`+ result = config["#{key}_#{env}"]`
	`174`	`+ result.nil? ? config[key.to_s] : result`
`172`	`175`	`end`
`173`	`176`
`174`	`177`	`def value_from_env(key)`
`175`		`- case env_value key`
`176`		`- when '0', 'false', 'no' then false`
`177`		`- when '1', 'true', 'yes' then true`
`178`		`- else env_value key`
	`178`	`+ result = ENV[env_var_name(key)]`
	`179`	`+ case result&.strip&.downcase`
	`180`	`+ when '0', 'false', 'no' then false`
	`181`	`+ when '1', 'true', 'yes' then true`
	`182`	`+ else result`
`179`	`183`	`end`
`180`	`184`	`end`
`181`	`185`
`182`		`- def env_value(key)`
`183`		`- ENV["BASHLY_#{key.upcase}"]`
`184`		`- end`
`185`		`-`
`186`	`186`	`def config`
`187`	`187`	`@config \|\|= default_settings.merge user_settings`
`188`	`188`	`end`

Lines changed: 0 additions & 1 deletion

Comments

(0)