Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor environment variable merging method #66

Merged
merged 1 commit into from
Sep 23, 2024
Merged

refactor environment variable merging method #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Simplify how we merge environment variables
  • Loading branch information
@dorianmariecom @nickcharlton
dorianmariecom authored and nickcharlton committed Sep 23, 2024
commit 4fbbbeaeef390ca9855a2126574bbf590e57f942
26 changes: 11 additions & 15 deletions lib/climate_control.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ module ClimateControl
private_constant :SEMAPHORE

def modify(environment_overrides = {}, &block)
environment_overrides = environment_overrides.transform_keys(&:to_s)

SEMAPHORE.synchronize do
previous = ENV.to_hash

Expand All @@ -24,17 +22,11 @@ def modify(environment_overrides = {}, &block)
block.call
ensure
after = ENV
(previous.keys | middle.keys | after.keys).each do |key|
if previous[key] != after[key] && middle[key] == after[key]
ENV[key] = previous[key]
end
end
merge(ENV, previous: previous, middle: middle, after: after)
end
end

def unsafe_modify(environment_overrides = {}, &block)
environment_overrides = environment_overrides.transform_keys(&:to_s)

previous = ENV.to_hash

begin
Expand All @@ -46,11 +38,7 @@ def unsafe_modify(environment_overrides = {}, &block)
block.call
ensure
after = ENV
(previous.keys | middle.keys | after.keys).each do |key|
if previous[key] != after[key] && middle[key] == after[key]
ENV[key] = previous[key]
end
end
merge(ENV, previous: previous, middle: middle, after: after)
end

def env
Expand All @@ -62,11 +50,19 @@ def env
private

def copy(overrides)
overrides.each do |key, value|
overrides.transform_keys(&:to_s).each do |key, value|
ENV[key] = value
rescue TypeError => e
raise UnassignableValueError,
"attempted to assign #{value} to #{key} but failed (#{e.message})"
end
end

def merge(env, previous:, middle:, after:)
(previous.keys | middle.keys | after.keys).each do |key|
if previous[key] != after[key] && middle[key] == after[key]
env[key] = previous[key]
end
end
end
end
Loading