childprocess 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77e7009c5202bfecb17e331b56d15c79b92d33b0
-  data.tar.gz: 343d119d1130d05fe395d5ee2631aeb1a50866a0
+  metadata.gz: 5ff6c21571973bc86342b2e8f604487ead0ac6d5
+  data.tar.gz: f6603ff7e7c6244d3f740a045b505e5b2b7f4d9e
 SHA512:
-  metadata.gz: f84deda774210ec0d133c08095389c212770ed6afa58b37bddef82a7ca0513e76fcdcd3aaeb0ea4ca0e878329c160a7d9ba4770f19faceb472d9dbe9333cc45a
-  data.tar.gz: 7ded6c7fa7364c4c5fe423c7a06e671dce947e6290e62fb3d4be7d62554be1339e0e706159ee9fc4350c0a3a1fc4f5f608122c2c281780485793523d42dcfb5f
+  metadata.gz: e275ff71f12bef3f8fc39657bfa4bd1ac350bcd98fadd1dc12794da8abf62d83acda8b21e244acfefa5f11c42937792e1d7b3b23cbcd97d5ecaf4aa77e7d13e0
+  data.tar.gz: c3ed5e6312b4457066585d02487b7bbf7a887702a89ea66bfc99f9bc3710e37d4c25a92af6496cf4ddbc1311035102bf975b2627e0d3417fd9e2fc774a4e2f7e

data/lib/childprocess/jruby/process.rb

@@ -113,13 +113,20 @@ module ChildProcess
       end
 
       def set_env(env)
-        ENV.to_hash.merge(@environment).each do |k,v|
+        merged = ENV.to_hash
+
+        @environment.each { |k, v| merged[k.to_s] = v }
+
+        merged.each do |k, v|
           if v
-            env.put(k.to_s, v.to_s)
-          else
-            env.remove(k.to_s) if env.key?(k.to_s)
+            env.put(k, v.to_s)
+          elsif env.has_key? k
+            env.remove(k)
           end
         end
+
+        removed_keys = env.key_set.to_a - merged.keys
+        removed_keys.each { |k| env.remove(k) }
       end
 
       def create_stdin

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/spec/childprocess_spec.rb

@@ -124,6 +124,19 @@ describe ChildProcess do
     end
   end
 
+  it 'does not see env vars unset in parent' do
+    Tempfile.open('env-spec') do |file|
+      ENV['CHILDPROCESS_UNSET'] = nil
+      process = write_env(file.path)
+      process.start
+
+      process.wait
+
+      child_env = eval rewind_and_read(file)
+      expect(child_env).to_not have_key('CHILDPROCESS_UNSET')
+    end
+  end
+
 
   it "passes arguments to the child" do
     args = ["foo", "bar"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: childprocess
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Jari Bakken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-30 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec