climate_control 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d6475362f621520ac9b951ad69a1a908e9043a2
-  data.tar.gz: 2d05f1c2f110479042944de906ca2e77ed9f3674
+  metadata.gz: 21d2f4ce1d74f8b2e4650cd7ab4efd3d40dac9d6
+  data.tar.gz: d14c7f5bc3b4ae309682f529c0ada07a9a874d9b
 SHA512:
-  metadata.gz: 3e9aeadc9e0a01b5da958d1d2b46144b6972f50dece9d7d71fc32b841a9cdeb5c187574644c5f471110284522f94019f8d0df6ef11db1e6ebce86adef3750cc9
-  data.tar.gz: 207eb3f8c9c71fc4c646a85580a2504bb630a581e29cb464dd8b0fbb38e9fde40421f8e017d6aac10559374b854ec0b5484baaf24e0e2f1ffb1d99728a40f712
+  metadata.gz: 1c533460213a9e6a4285c3daa7fade227a4a5a5e4eb9a23e41d6bb06362c60468739476dd916be6b9ec3447b3e155dc1594e0fd89597ae58935acef27b850940
+  data.tar.gz: 1a9aefaad845f0cdcb147b77cd176e81c0004d28fa17979aab312d27fe1e5251653902bc6fe05581ccd1ecab49075f122b7d029953c708af350e6ad0809f575d

data/NEWS

@@ -1,3 +1,6 @@
+0.2.0 (May 12, 2017)
+  Allow nested environment changes in the same thread
+
 0.1.0 (January 7, 2017)
   Remove ActiveSupport dependency
 

data/lib/climate_control/environment.rb

@@ -7,10 +7,25 @@ module ClimateControl
 
     def initialize
       @semaphore = Mutex.new
+      @owner = nil
     end
 
     def_delegators :env, :[]=, :to_hash, :[], :delete
-    def_delegator :@semaphore, :synchronize
+
+    def synchronize
+      if @owner == Thread.current
+        return yield if block_given?
+      end
+
+      @semaphore.synchronize do
+        begin
+          @owner = Thread.current
+          yield if block_given?
+        ensure
+          @owner = nil
+        end
+      end
+    end
 
     private
 

data/lib/climate_control/version.rb

@@ -1,3 +1,3 @@
 module ClimateControl
-  VERSION = "0.1.0"
+  VERSION = "0.2.0".freeze
 end

data/spec/acceptance/climate_control_spec.rb

@@ -111,6 +111,19 @@ describe "Climate control" do
     expect(ENV["BAZ"]).to be_nil
   end
 
+  it "is re-entrant" do
+    ret = with_modified_env(FOO: "foo") do
+      with_modified_env(BAR: "bar") do
+        "bar"
+      end
+    end
+
+    expect(ret).to eq("bar")
+
+    expect(ENV["FOO"]).to be_nil
+    expect(ENV["BAR"]).to be_nil
+  end
+
   it "raises when the value cannot be assigned properly" do
     Thing = Class.new
     message = generate_type_error_for_object(Thing.new)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: climate_control
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Joshua Clayton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Modify your ENV easily with ClimateControl