climate_control 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 919bb6d645214941bca1f5de4d30732891348bb76a29725e9db8ba00b6274dbc
-  data.tar.gz: 332e9222519c1c6a91d866783d4c3993c4372ffe29242f60759cf9948636d3ff
+  metadata.gz: 1052215413e209a2ce0531a9b293d56f51df36db70688af69ae15e70571a043d
+  data.tar.gz: ed855bfdddc57fc46532edc296d9a8de6a2a3653f5b148ab10849433aeb61026
 SHA512:
-  metadata.gz: 1c5c9c97dcef22aa4923d284f196addeb1ddeb2f87c80785fd5d8a38e3f23ea7e66e11acbe265e225bf3663d36dbe500edc981d5baaf53cc872a19670dfa1878
-  data.tar.gz: c56fb5c40969ed979a485503765b33f7f4adc2d34830309502a2207dad363f4c9a0b04c5dda5cb4c56c001e80c317954a8d19b0b21fce53aa0fd84962d33c091
+  metadata.gz: e292d7055db48aaa3cf664f447c6826d3ccf59cc1142dc71a89e8b8e97dbac26d553ebd2912a1f8b2a15b3f75b71de5f3345244cc0cb2f4dd8970f47b73b12c1
+  data.tar.gz: 96f9e0f2e8193c29d708f94c1cdced3d7a1b305ae0cb781729895b838be70233a0082f767f840a5d943e5b206cc55539606de156e4b301bab787e29ab45507b4

data/README.md

@@ -1,5 +1,7 @@
 # Climate Control
 
+![GitHub Actions CI](https://github.com/thoughtbot/climate_control/actions/workflows/ci.yml/badge.svg)
+
 Easily manage your environment.
 
 ## Installation
@@ -151,3 +153,18 @@ This project uses [StandardRB](https://github.com/testdouble/standard) to ensure
 ## License
 
 climate_control is copyright 2012-2021 Joshua Clayton and thoughtbot, inc. It is free software and may be redistributed under the terms specified in the [LICENSE](https://github.com/thoughtbot/climate_control/blob/main/LICENSE) file.
+
+About thoughtbot
+----------------
+
+![thoughtbot](https://thoughtbot.com/brand_assets/93:44.svg)
+
+climate_control is maintained and funded by thoughtbot, inc.
+The names and logos for thoughtbot are trademarks of thoughtbot, inc.
+
+We love open source software!
+See [our other projects][community] or
+[hire us][hire] to design, develop, and grow your product.
+
+[community]: https://thoughtbot.com/community?utm_source=github
+[hire]: https://thoughtbot.com/hire-us?utm_source=github

data/lib/climate_control/version.rb

@@ -1,3 +1,3 @@
 module ClimateControl
-  VERSION = "1.1.0".freeze
+  VERSION = "1.1.1".freeze
 end

data/lib/climate_control.rb

@@ -13,9 +13,13 @@ module ClimateControl
 
     SEMAPHORE.synchronize do
       previous = ENV.to_hash
-      middle = {}
-      copy environment_overrides
-      middle = ENV.to_hash
+
+      begin
+        copy environment_overrides
+      ensure
+        middle = ENV.to_hash
+      end
+
       block.call
     ensure
       after = ENV

data/spec/acceptance/climate_control_spec.rb

@@ -167,6 +167,21 @@ describe "Climate control" do
     }.to raise_error ClimateControl::UnassignableValueError, /attempted to assign .*Thing.* to FOO but failed \(#{message}\)$/
   end
 
+  it "restores the ENV even when an error was raised when assigning values" do
+    ENV["KEY_TO_OVERRIDE"] = "initial_value_1"
+    ENV["KEY_THAT_WILL_ERROR_OUT"] = "initial_value_2"
+
+    expect {
+      with_modified_env(
+        KEY_TO_OVERRIDE: "overwriten_value_1",
+        KEY_THAT_WILL_ERROR_OUT: :value_that_will_error_out
+      ) {}
+    }.to raise_error ClimateControl::UnassignableValueError
+
+    expect(ENV["KEY_TO_OVERRIDE"]).to eq("initial_value_1")
+    expect(ENV["KEY_THAT_WILL_ERROR_OUT"]).to eq("initial_value_2")
+  end
+
   def with_modified_env(options = {}, &block)
     ClimateControl.modify(options, &block)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: climate_control
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Joshua Clayton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-26 00:00:00.000000000 Z
+date: 2022-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec