childprocess 0.2.9 → 0.3.0

data/README.md

@@ -20,8 +20,11 @@ process.io.inherit!
 # ...or pass an IO
 process.io.stdout = Tempfile.new("child-output")
 
-# start the process
+# modify the environment for the child
+process.environment["a"] = "b"
+process.environment["c"] = nil
 
+# start the process
 process.start
 
 # check process status

data/lib/childprocess/jruby/process.rb

@@ -111,8 +111,9 @@ module ChildProcess
       end
 
       def set_env(env)
-        ENV.each { |k,v| env.put(k, v) } # not sure why this is needed
-        @environment.each { |k,v| env.put(k.to_s, v.to_s) }
+        ENV.to_hash.merge(@environment).each do |k,v|
+          env.put(k.to_s, v.to_s) if v
+        end
       end
 
     end # Process

data/lib/childprocess/unix/fork_exec_process.rb

@@ -52,7 +52,7 @@ module ChildProcess
       end
 
       def set_env
-        @environment.each { |k, v| ENV[k.to_s] = v.to_s }
+        @environment.each { |k, v| ENV[k.to_s] = v.nil? ? nil : v.to_s }
       end
 
     end # Process

data/lib/childprocess/unix/posix_spawn_process.rb

@@ -100,12 +100,14 @@ module ChildProcess
       class Envp
         def initialize(env)
           @ptrs = env.map do |key, val|
+            next if val.nil?
+
             if key =~ /=|\0/ || val.include?("\0")
               raise InvalidEnvironmentVariable, "#{key.inspect} => #{val.inspect}"
             end
 
             FFI::MemoryPointer.from_string("#{key}=#{val}")
-          end
+          end.compact
 
           @ptrs << nil
         end

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.2.9"
+  VERSION = "0.3.0"
 end

data/lib/childprocess/windows/process_builder.rb

@@ -44,12 +44,12 @@ module ChildProcess
       def create_environment_pointer
         return unless @environment.kind_of?(Hash) && @environment.any?
 
-        # inherited env
-        strings = ENV.map { |k,v| "#{k}=#{v}\0" }
+        strings = []
 
-        # extras
-        @environment.each do |key, val|
-          if key =~ /=|\0/ || val.include?("\0")
+        ENV.to_hash.merge(@environment).each do |key, val|
+          next if val.nil?
+
+          if key.to_s =~ /=|\0/ || val.to_s.include?("\0")
             raise InvalidEnvironmentVariable, "#{key.inspect} => #{val.inspect}"
           end
 

data/spec/childprocess_spec.rb

@@ -101,6 +101,22 @@ describe ChildProcess do
     end
   end
 
+  it "can unset env vars" do
+    Tempfile.open("env-spec") do |file|
+      ENV['CHILDPROCESS_UNSET'] = '1'
+      process = write_env(file.path)
+      process.environment['CHILDPROCESS_UNSET'] = nil
+      process.start
+
+      process.wait
+      file.rewind
+
+      child_env = eval(file.read)
+      child_env.should_not have_key('CHILDPROCESS_UNSET')
+    end
+  end
+
+
   it "passes arguments to the child" do
     args = ["foo", "bar"]
 
@@ -122,11 +138,14 @@ describe ChildProcess do
       process = ruby("print Dir.pwd")
       process.io.stdout = process.io.stderr = file
 
-      process.start
+      Dir.chdir(Dir.tmpdir) do
+        process.start
+      end
+
       process.wait
 
       file.rewind
-      file.read.should == Dir.pwd
+      file.read.should == Dir.tmpdir
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: childprocess
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 9
-  version: 0.2.9
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jari Bakken
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-12 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec