right_popen 1.0.18 → 1.0.19

data/lib/right_popen/linux/process.rb

@@ -28,13 +28,13 @@ module RightScale
     class Process
       attr_reader :pid, :stdin, :stdout, :stderr, :status_fd
       attr_accessor :status
-      
+
       def initialize(parameters={})
         parameters[:locale] = true unless parameters.has_key?(:locale)
         @parameters = parameters
         @status_fd = nil
       end
-      
+
       def fork(cmd)
         @cmd = cmd
         stdin_r, stdin_w = IO.pipe
@@ -58,7 +58,13 @@ module RightScale
 
             status_r.close
             status_w.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
-            
+
+            ObjectSpace.each_object(IO) do |io|
+              if ![STDIN, STDOUT, STDERR, status_w].include?(io)
+            	  io.close unless io.closed?
+            	end
+            end
+
             if group = get_group
               ::Process.egid = group
               ::Process.gid = group
@@ -72,7 +78,7 @@ module RightScale
             Dir.chdir(@parameters[:directory]) if @parameters[:directory]
 
             ENV["LC_ALL"] = "C" if @parameters[:locale]
-          
+
             @parameters[:environment].each do |key,value|
               ENV[key.to_s] = value.to_s
             end if @parameters[:environment]

data/lib/right_popen/version.rb

@@ -23,6 +23,6 @@
 
 module RightScale
   module RightPopen
-    VERSION = "1.0.18"
+    VERSION = "1.0.19"
   end
 end

data/spec/right_popen/linux/accumulator_spec.rb

@@ -96,6 +96,7 @@ module RightScale::RightPopen
           flexmock(::IO).should_receive(:select).with([@input], [@output], nil, 0.1).once.and_return([[], [@output], []])
           @write.should_receive(:call).with().once.and_return(value)
           value.should_receive(:[]).with(30..-1).and_return("")
+          value.should_receive("empty?").and_return(false)
           @output.should_receive(:write_nonblock).with(value).once.and_return(30)
           flexmock(::Process).should_receive(:waitpid2).with(42, ::Process::WNOHANG).once.and_return(nil)
           a.tick.should be_false
@@ -109,6 +110,8 @@ module RightScale::RightPopen
           @write.should_receive(:call).with().once.and_return(value)
           value.should_receive(:[]).with(30..-1).and_return(other)
           other.should_receive(:[]).with(20..-1).and_return("")
+          value.should_receive("empty?").and_return(false)
+          other.should_receive("empty?").and_return(false)
           @output.should_receive(:write_nonblock).with(value).once.and_return(30)
           @output.should_receive(:write_nonblock).with(other).once.and_return(20)
           flexmock(::Process).should_receive(:waitpid2).with(42, ::Process::WNOHANG).and_return(nil)

data/spec/right_popen/linux/utilities_spec.rb

@@ -33,7 +33,7 @@ module RightScale::RightPopen
       end
 
       it 'should handle utilities that expect input' do
-        out, err = Utilities::run("echo foo; read; echo bar >&2")
+        out, err = Utilities::run("echo foo; read unused_input; echo bar >&2")
         out.should == "foo\n"
         err.should == "bar\n"
       end

data/spec/right_popen_spec.rb

@@ -58,6 +58,21 @@ module RightScale
       end
     end
 
+    it 'should close all IO handlers, except STDIN, STDOUT and STDERR' do
+      GC.start
+      command = "\"#{RUBY_CMD}\" \"#{File.expand_path(File.join(File.dirname(__FILE__), 'produce_status.rb'))}\" #{EXIT_STATUS}"
+      runner = Runner.new
+      status = runner.run_right_popen(command)
+      status.status.exitstatus.should == EXIT_STATUS
+      useless_handlers = 0
+      ObjectSpace.each_object(IO) do |io|
+        if ![STDIN, STDOUT, STDERR].include?(io)
+          useless_handlers += 1 unless io.closed?
+        end
+      end
+      useless_handlers.should == 0
+    end
+
     it 'should preserve the integrity of stdout when stderr is unavailable' do
       count = LARGE_OUTPUT_COUNTER
       command = "\"#{RUBY_CMD}\" \"#{File.expand_path(File.join(File.dirname(__FILE__), 'produce_stdout_only.rb'))}\" #{count}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_popen
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 1
   - 0
-  - 18
-  version: 1.0.18
+  - 19
+  version: 1.0.19
 platform: ruby
 authors: 
 - Scott Messier
@@ -17,12 +17,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-02 00:00:00 -08:00
+date: 2012-02-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,11 +32,11 @@ dependencies:
         - 12
         - 11
         version: 0.12.11
+  name: eventmachine
+  prerelease: false
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +47,11 @@ dependencies:
         - 1
         - 3
         version: "1.3"
+  name: rspec
+  prerelease: false
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,11 +63,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
+  name: rake
+  prerelease: false
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: flexmock
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,6 +77,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: flexmock
+  prerelease: false
   type: :development
   version_requirements: *id004
 description: |