plist4r 0.1.0 → 0.1.1

data/README.rdoc

@@ -10,6 +10,8 @@ Current project status: in alpha
 
 == Quick Start
 
+  require 'plist4r'
+
   Plist4r::Config.default_dir "/Library/LaunchDaemons"
   filename = "com.github.myservice.plist"
   p = Plist4r.open(filename)
@@ -65,20 +67,20 @@ We believe thats allright for most uses, and decided to include `next_step` for
 	module ::Plist4r::Backend::MyPlistReaderWriter
 	  # implement some plist4r api calls here
 	end
-
+  
   # append my backend to the end of the list
 	Plist4r::Config[:backends] << :my_plist_reader_writer
 	
 	# or to the front of the list (executes first)
 	Plist4r::Config[:backends].insert 0 :my_plist_reader_writer
-
+  
 	# The default directory to load / save files from
 	Plist4r::Config.default_path "/Library/Cars"
 	
 	car = Plist4r.new("car.plist")
 	
 	car.load	
-
+  
 	car.file_format :binary
   # car.plist_type  :car # not implemented *yet*
 	
@@ -121,8 +123,32 @@ Plist4r is currently alpha - quality software. Yet to be completed...
 * Fork the project, and create a topic branch as per {these instructions}[http://wiki.opscode.com/display/opscode/Working+with+Git].
 * Make your feature addition or bug fix.
 * Include documentation for it.
-* Include a regression test for it. So I don't break it in a future version unintentionally.
+* Include a regression test for it. So I dont break it in a future version unintentionally.
+
+== Contributors
+
+Popen4
+* Ara T Howard
+
+ActiveSupport::OrderedHash
+* Copyright (c) 2005 David Hansson,
+* Copyright (c) 2007 Mauricio Fernandez, Sam Stephenson
+* Copyright (c) 2008 Steve Purcell, Josh Peek
+* Copyright (c) 2009 Christoffer Sawicki
+
+Mixlib::Config
+* Author:: Adam Jacob
+* Author:: Nuo Yan
+* Author:: Christopher Brown
+* Copyright:: Copyright (c) 2008 Opscode, Inc.
+
+Backends...
+
+Haml, Libxml4r, RubyCocoa
+* Dreamcat4
 
 == Copyright
 
 Copyright (c) 2010 Dreamcat4. See LICENSE for details.
+
+

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/plist4r.rb

@@ -1,23 +1,24 @@
 
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+dir = File.dirname(__FILE__)
+$LOAD_PATH.unshift dir unless $LOAD_PATH.include?(dir)
 
 require 'plist4r/plist'
 
 module Plist4r
   class << self
     def new *args, &blk
-      puts args.inspect
+      # puts args.inspect
       return Plist.new *args, &blk
     end
 
     def open filename, *args, &blk
-      puts args.inspect
-      return Plist.new filename, *args, &blk
+      # puts args.inspect
+      p = Plist.new filename, *args, &blk
+      p.open
     end
     
     def string_detect_format string
-      s.strip!
+      s = string.strip!
       case s[0,1]
       when "{","("
         :next_step

data/lib/plist4r/backend.rb

@@ -1,52 +1,63 @@
 
 require 'plist4r/config'
+require 'plist4r/backend_base'
 require 'plist4r/mixin/ordered_hash'
 
-class Plist4r::Backend
-  ApiMethods = %w[from_string to_xml to_binary to_next_step open save]
+module Plist4r
+  class Backend
+    ApiMethods = %w[from_string to_xml to_binary to_next_step open save]
 
-  def initialize plist, *args, &blk
-    @plist = plist
-    @backends = Config[:backends].collect do |b| 
-      case b
-      when Module
-        b
-      when Symbol, String
-        eval "::Plist4r::Backend::#{b.to_s.camelcase}"
-      else
-        raise "Backend #{b.inspect} is of unsupported type: #{b.class}"
+    def initialize plist, *args, &blk
+      @plist = plist
+      @backends = plist.backends.collect do |b| 
+        case b
+        when Module
+          b
+        when Symbol, String
+          eval "::Plist4r::Backend::#{b.to_s.camelcase}"
+        else
+          raise "Backend #{b.inspect} is of unsupported type: #{b.class}"
+        end
       end
     end
-  end
 
-  def call method_sym, *args, &blk
-    raise "Unsupported api call #{method_sym.inspect}" unless ApiMethods.include? method_sym.to_s
-    exceptions = []
-    @backends.each do |backend|
-      if backend.respond_to? method_sym
-        begin
-          return backend.send(method_sym, @plist, *args, &blk)
-        rescue LoadError
-          exceptions << $!
-        rescue
-          exceptions << $!
+    # vv We also need a version of :call for matrix test harness vv
+
+    def call method_sym, *args, &blk
+      puts "in call"
+      puts "#{method_sym.inspect} #{args.inspect}"
+      raise "Unsupported api call #{method_sym.inspect}" unless ApiMethods.include? method_sym.to_s
+      exceptions = []
+      @backends.each do |backend|
+        if backend.respond_to? method_sym
+          begin
+            result = backend.send(method_sym, @plist, *args, &blk)
+            # puts "result = #{result.inspect}"
+            return result
+            # return backend.send(method_sym, @plist, *args, &blk)
+          rescue LoadError
+            exceptions << $!
+          rescue
+            exceptions << $!
+          end
+        end
+        if Config[:raise_any_failure] && exceptions.first
+          raise exceptions.first
         end
       end
-      if Config[:raise_any_failure] && exceptions.first
-        raise exceptions.first
-      end
-    end
-    if exceptions.empty?
-      raise "Plist4r: No backend found to handle method #{method_sym.inspect}. Could not execute method #{method_sym.inspect} on plist #{@plist.inspect}"
-    else
-      $stderr.puts "Couldn't execute method #{method_sym.inspect} on plist #{@plist.inspect}."
-      exceptions.each do |e|
-        $stderr.puts e.inspect
+      if exceptions.empty?
+        raise "Plist4r: No backend found to handle method #{method_sym.inspect}. Could not execute method #{method_sym.inspect} on plist #{@plist.inspect}"
+      else
+        # $stderr.puts "Failure(s) while executing method #{method_sym.inspect} on plist #{@plist}."
+        exceptions.each do |e|
+          $stderr.puts e.inspect
+          $stderr.puts e.backtrace.collect { |l| "\tfrom #{l}"}.join "\n"
+        end
+        # raise exceptions.first
+        raise "Failure(s) while executing method #{method_sym.inspect} on plist #{@plist}."
       end
-      raise exceptions.first
     end
   end
 end
 
 
-

data/lib/plist4r/backend/example.rb

@@ -1,5 +1,5 @@
 
-require 'plist4r/backend'
+require 'plist4r/backend_base'
 
 module Plist4r::Backend::Example
   class << self

data/lib/plist4r/backend/haml.rb

@@ -1,7 +1,7 @@
 
-require 'plist4r/backend'
+require 'plist4r/backend_base'
 
-module Plist4r::Backend::HamlXmlWriter
+module Plist4r::Backend::Haml
   class << self
     def to_xml_haml
       @to_xml_haml ||= <<-'EOC'
@@ -66,7 +66,7 @@ EOC
       hash = plist.to_hash
       filename = plist.filename_path
       File.open(filename,'w') do |out|
-        out << to_xml plist
+        out << to_xml(plist)
       end
     end
   end

data/lib/plist4r/backend/libxml4r.rb

@@ -1,7 +1,7 @@
 
-require 'plist4r/backend'
+require 'plist4r/backend_base'
 
-module Plist4r::Backend::Libxml4rXmlReader
+module Plist4r::Backend::Libxml4r
   class << self
     def tree_hash n
       hash = ::ActiveSupport::OrderedHash.new
@@ -49,6 +49,7 @@ module Plist4r::Backend::Libxml4rXmlReader
     end
 
     def parse_plist_xml string
+      require 'rubygems'
       require 'libxml4r'
       ::LibXML::XML.default_keep_blanks = false
       doc = string.to_xmldoc
@@ -60,10 +61,9 @@ module Plist4r::Backend::Libxml4rXmlReader
     def from_string plist, string
       plist_format = Plist4r.string_detect_format string
       raise "#{self} - cant convert string of format #{plist_format}" unless plist_format == :xml
-
       hash = parse_plist_xml string
       plist.import_hash hash
-      plist.file_format = file_format
+      plist.file_format plist_format
       return plist
     end
 

data/lib/plist4r/backend/plutil.rb

@@ -1,4 +1,6 @@
 
+require 'plist4r/backend_base'
+
 module Plist4r::Backend::Plutil
   # maybe this should be a helper, included by other backends
   class << self

data/lib/plist4r/backend/ruby_cocoa.rb

@@ -1,5 +1,5 @@
 
-require 'plist4r/backend'
+require 'plist4r/backend_base'
 
 module Plist4r::Backend::RubyCocoa
   class << self
@@ -103,7 +103,7 @@ EOC
       require 'tempfile'
       require 'plist4r/mixin/popen4'
 
-      if @rb_script && File.exists?(@rb_script.path)
+      unless @rb_script && File.exists?(@rb_script.path)
         @rb_script ||= Tempfile.new("ruby_cocoa_wrapper.rb") do |o|
           o << ruby_cocoa_rb
         end
@@ -113,7 +113,7 @@ EOC
       cmd = @rb_script.path
       ordered_hash_rb = File.join(File.dirname(__FILE__), "..", "mixin", "ordered_hash.rb")
 
-      pid, stdin, stdout, stderr = Popen4::popen4 [cmd, ordered_hash_rb]
+      pid, stdin, stdout, stderr = ::Plist4r::Popen4::popen4 cmd, ordered_hash_rb
 
         stdin.puts stdin_str
 

data/lib/plist4r/backend_base.rb

@@ -0,0 +1,3 @@
+
+module Plist4r end
+class Plist4r::Backend; end

data/lib/plist4r/config.rb

@@ -1,18 +1,21 @@
 
 require 'plist4r/mixin/mixlib_config'
+require 'plist4r/backend'
+Dir.glob(File.dirname(__FILE__) + "/backend/**/*.rb").each {|b| require File.expand_path b}
 
-class Plist4r::Config
-  extend Mixlib::Config
+module Plist4r
+  class Config
+    extend Mixlib::Config
 
-  backends [
-    Plist4r::Backend::RubyCocoa,
-    Plist4r::Backend::Haml,
-    Plist4r::Backend::Libxml4r
-  ]
+    backends [
+      ::Plist4r::Backend::RubyCocoa,
+      ::Plist4r::Backend::Haml,
+      ::Plist4r::Backend::Libxml4r
+    ]
 
-  unsupported_keys true
-  raise_any_failure false
-  deafult_format :xml
-  default_path nil
+    unsupported_keys true
+    raise_any_failure false
+    deafult_format :xml
+    default_path nil
+  end
 end
-

data/lib/plist4r/mixin/data_methods.rb

@@ -1,63 +1,65 @@
 
-require 'plist4r/mixins/ordered_hash'
+require 'plist4r/mixin/ordered_hash'
 
-module Plst4r::DataMethods
+module Plist4r
+  module DataMethods
 
-  def classes_for_key_type
-    {
-      :string => [String], 
-      :bool => [TrueClass,FalseClass],
-      :integer => [Fixnum], 
-      :array_of_strings => [Array],
-      :hash_of_bools => [Hash],
-      :hash => [Hash],
-      :bool_or_string_or_array_of_strings => [TrueClass,FalseClass,String,Array]
-    }
-  end
+    def classes_for_key_type
+      {
+        :string => [String], 
+        :bool => [TrueClass,FalseClass],
+        :integer => [Fixnum], 
+        :array_of_strings => [Array],
+        :hash_of_bools => [Hash],
+        :hash => [Hash],
+        :bool_or_string_or_array_of_strings => [TrueClass,FalseClass,String,Array]
+      }
+    end
 
-  def valid_keys
-    {}
-  end
+    def valid_keys
+      {}
+    end
 
-  def method_missing method_symbol, *args, &blk
-    puts "method_missing: #{method_symbol.inspect}, args: #{args.inspect}"
-    valid_keys.each do |key_type, valid_keys_of_those_type|
-      if valid_keys_of_those_type.include?(method_symbol.to_s.camelcase)
-        puts "key_type = #{key_type}, method_symbol.to_s.camelcase = #{method_symbol.to_s.camelcase}, args = #{args.inspect}"
-        return eval("set_or_return key_type, method_symbol.to_s.camelcase, *args, &blk")
+    def method_missing method_symbol, *args, &blk
+      puts "method_missing: #{method_symbol.inspect}, args: #{args.inspect}"
+      valid_keys.each do |key_type, valid_keys_of_those_type|
+        if valid_keys_of_those_type.include?(method_symbol.to_s.camelcase)
+          puts "key_type = #{key_type}, method_symbol.to_s.camelcase = #{method_symbol.to_s.camelcase}, args = #{args.inspect}"
+          return eval("set_or_return key_type, method_symbol.to_s.camelcase, *args, &blk")
+        end
       end
     end
-  end
 
-  def validate_value key_type, key, value
-    unless classes_for_key_type[key_type].include? value.class
-      raise "Key: #{key}, value: #{value.inspect} is of type #{value.class}. Should be: #{classes_for_key_type[key_type].join ", "}"
-    end
-    case key_type
-    when :array_of_strings, :bool_or_string_or_array_of_strings
-      if value.class == Array
-        value.each_index do |i|
-          unless value[i].class == String
-            raise "Element: #{key}[#{i}], value: #{value[i].inspect} is of type #{value[i].class}. Should be: #{classes_for_key_type[:string].join ", "}"
+    def validate_value key_type, key, value
+      unless classes_for_key_type[key_type].include? value.class
+        raise "Key: #{key}, value: #{value.inspect} is of type #{value.class}. Should be: #{classes_for_key_type[key_type].join ", "}"
+      end
+      case key_type
+      when :array_of_strings, :bool_or_string_or_array_of_strings
+        if value.class == Array
+          value.each_index do |i|
+            unless value[i].class == String
+              raise "Element: #{key}[#{i}], value: #{value[i].inspect} is of type #{value[i].class}. Should be: #{classes_for_key_type[:string].join ", "}"
+            end
           end
         end
-      end
-    when :hash_of_bools
-      value.each do |k,v|
-        unless [TrueClass,FalseClass].include? v.class
-          raise "Key: #{key}[#{k}], value: #{v.inspect} is of type #{v.class}. Should be: #{classes_for_key_type[:bool].join ", "}"
+      when :hash_of_bools
+        value.each do |k,v|
+          unless [TrueClass,FalseClass].include? v.class
+            raise "Key: #{key}[#{k}], value: #{v.inspect} is of type #{v.class}. Should be: #{classes_for_key_type[:bool].join ", "}"
+          end
         end
       end
     end
-  end
 
-  def set_or_return key_type, key, value=nil
-    puts "#{method_name}, key_type: #{key_type.inspect}, value: #{value.inspect}"
-    if value
-      validate_value key_type, key, value unless key_type == nil
-      @hash[key] = value
-    else
-      @orig[key]
+    def set_or_return key_type, key, value=nil
+      puts "#{method_name}, key_type: #{key_type.inspect}, value: #{value.inspect}"
+      if value
+        validate_value key_type, key, value unless key_type == nil
+        @hash[key] = value
+      else
+        @orig[key]
+      end
     end
   end
-end
+end

data/lib/plist4r/mixin/popen4.rb

@@ -1,193 +1,199 @@
 
-
-module Plist4r::Popen4
-
-  # This is taken directly from Ara T Howard's Open4 library, and then 
-  # modified to suit the needs of Chef.  Any bugs here are most likely
-  # my own, and not Ara's.
-  #
-  # The original appears in external/open4.rb in its unmodified form. 
-  #
-  # Thanks Ara!
-  def popen4(cmd, args={}, &b)
+require 'fcntl'
+require 'etc'
+require 'io/wait'
+
+module Plist4r
+  module Popen4
+    class << self
+      # This is taken directly from Ara T Howard's Open4 library, and then 
+      # modified to suit the needs of Chef.  Any bugs here are most likely
+      # my own, and not Ara's.
+      #
+      # The original appears in external/open4.rb in its unmodified form. 
+      #
+      # Thanks Ara!
+      def popen4(cmd, args={}, &b)
    
-    # Waitlast - this is magic.  
-    # 
-    # Do we wait for the child process to die before we yield
-    # to the block, or after?  That is the magic of waitlast.
-    #
-    # By default, we are waiting before we yield the block.
-    args[:waitlast] ||= false
+        # Waitlast - this is magic.  
+        # 
+        # Do we wait for the child process to die before we yield
+        # to the block, or after?  That is the magic of waitlast.
+        #
+        # By default, we are waiting before we yield the block.
+        args[:waitlast] ||= false
     
-    args[:user] ||= nil
-    unless args[:user].kind_of?(Integer)
-      args[:user] = Etc.getpwnam(args[:user]).uid if args[:user]
-    end
-    args[:group] ||= nil
-    unless args[:group].kind_of?(Integer)
-      args[:group] = Etc.getgrnam(args[:group]).gid if args[:group]
-    end
-    args[:environment] ||= {}
+        args[:user] ||= nil
+        unless args[:user].kind_of?(Integer)
+          args[:user] = Etc.getpwnam(args[:user]).uid if args[:user]
+        end
+        args[:group] ||= nil
+        unless args[:group].kind_of?(Integer)
+          args[:group] = Etc.getgrnam(args[:group]).gid if args[:group]
+        end
+        args[:environment] ||= {}
 
-    # Default on C locale so parsing commands output can be done
-    # independently of the node's default locale.
-    # "LC_ALL" could be set to nil, in which case we also must ignore it.
-    unless args[:environment].has_key?("LC_ALL")
-      args[:environment]["LC_ALL"] = "C"
-    end
+        # Default on C locale so parsing commands output can be done
+        # independently of the node's default locale.
+        # "LC_ALL" could be set to nil, in which case we also must ignore it.
+        unless args[:environment].has_key?("LC_ALL")
+          args[:environment]["LC_ALL"] = "C"
+        end
     
-    pw, pr, pe, ps = IO.pipe, IO.pipe, IO.pipe, IO.pipe
+        pw, pr, pe, ps = IO.pipe, IO.pipe, IO.pipe, IO.pipe
 
-    verbose = $VERBOSE
-    begin
-      $VERBOSE = nil
-      ps.last.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
+        verbose = $VERBOSE
+        begin
+          $VERBOSE = nil
+          ps.last.fcntl(Fcntl::F_SETFD, Fcntl::FD_CLOEXEC)
 
-      cid = fork {
-        pw.last.close
-        STDIN.reopen pw.first
-        pw.first.close
+          cid = fork {
+            pw.last.close
+            STDIN.reopen pw.first
+            pw.first.close
 
-        pr.first.close
-        STDOUT.reopen pr.last
-        pr.last.close
+            pr.first.close
+            STDOUT.reopen pr.last
+            pr.last.close
 
-        pe.first.close
-        STDERR.reopen pe.last
-        pe.last.close
+            pe.first.close
+            STDERR.reopen pe.last
+            pe.last.close
 
-        STDOUT.sync = STDERR.sync = true
+            STDOUT.sync = STDERR.sync = true
 
-        if args[:group]
-          Process.egid = args[:group]
-          Process.gid = args[:group]
-        end
+            if args[:group]
+              Process.egid = args[:group]
+              Process.gid = args[:group]
+            end
 
-        if args[:user]
-          Process.euid = args[:user]
-          Process.uid = args[:user]
-        end
+            if args[:user]
+              Process.euid = args[:user]
+              Process.uid = args[:user]
+            end
         
-        args[:environment].each do |key,value|
-          ENV[key] = value
-        end
+            args[:environment].each do |key,value|
+              ENV[key] = value
+            end
 
-        if args[:umask]
-          umask = ((args[:umask].respond_to?(:oct) ? args[:umask].oct : args[:umask].to_i) & 007777)
-          File.umask(umask)
-        end
+            if args[:umask]
+              umask = ((args[:umask].respond_to?(:oct) ? args[:umask].oct : args[:umask].to_i) & 007777)
+              File.umask(umask)
+            end
         
-        begin
-          if cmd.kind_of?(Array)
-            exec(*cmd)
-          else
-            exec(cmd)
-          end
-          raise 'forty-two' 
-        rescue Exception => e
-          Marshal.dump(e, ps.last)
-          ps.last.flush
+            begin
+              if cmd.kind_of?(Array)
+                exec(*cmd)
+              else
+                exec(cmd)
+              end
+              raise 'forty-two' 
+            rescue Exception => e
+              Marshal.dump(e, ps.last)
+              ps.last.flush
+            end
+            ps.last.close unless (ps.last.closed?)
+            exit!
+          }
+        ensure
+          $VERBOSE = verbose
         end
-        ps.last.close unless (ps.last.closed?)
-        exit!
-      }
-    ensure
-      $VERBOSE = verbose
-    end
-
-    [pw.first, pr.last, pe.last, ps.last].each{|fd| fd.close}
 
-    begin
-      e = Marshal.load ps.first
-      raise(Exception === e ? e : "unknown failure!")
-    rescue EOFError # If we get an EOF error, then the exec was successful
-      42
-    ensure
-      ps.first.close
-    end
-
-    pw.last.sync = true
+        [pw.first, pr.last, pe.last, ps.last].each{|fd| fd.close}
 
-    pi = [pw.last, pr.first, pe.first]
+        begin
+          e = Marshal.load ps.first
+          raise(Exception === e ? e : "unknown failure!")
+        rescue EOFError # If we get an EOF error, then the exec was successful
+          42
+        ensure
+          ps.first.close
+        end
 
-    if b 
-      begin
-        if args[:waitlast]
-          b[cid, *pi]
-          # send EOF so that if the child process is reading from STDIN
-          # it will actually finish up and exit
-          pi[0].close_write
-          Process.waitpid2(cid).last
-        else
-          # This took some doing.
-          # The trick here is to close STDIN
-          # Then set our end of the childs pipes to be O_NONBLOCK
-          # Then wait for the child to die, which means any IO it
-          # wants to do must be done - it's dead.  If it isn't,
-          # it's because something totally skanky is happening,
-          # and we don't care.
-          o = StringIO.new
-          e = StringIO.new
-
-          pi[0].close
+        pw.last.sync = true
+
+        pi = [pw.last, pr.first, pe.first]
+
+        if b 
+          begin
+            if args[:waitlast]
+              b[cid, *pi]
+              # send EOF so that if the child process is reading from STDIN
+              # it will actually finish up and exit
+              pi[0].close_write
+              Process.waitpid2(cid).last
+            else
+              # This took some doing.
+              # The trick here is to close STDIN
+              # Then set our end of the childs pipes to be O_NONBLOCK
+              # Then wait for the child to die, which means any IO it
+              # wants to do must be done - it's dead.  If it isn't,
+              # it's because something totally skanky is happening,
+              # and we don't care.
+              o = StringIO.new
+              e = StringIO.new
+
+              pi[0].close
           
-          stdout = pi[1]
-          stderr = pi[2]
+              stdout = pi[1]
+              stderr = pi[2]
 
-          stdout.sync = true
-          stderr.sync = true
+              stdout.sync = true
+              stderr.sync = true
 
-          stdout.fcntl(Fcntl::F_SETFL, pi[1].fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
-          stderr.fcntl(Fcntl::F_SETFL, pi[2].fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
+              stdout.fcntl(Fcntl::F_SETFL, pi[1].fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
+              stderr.fcntl(Fcntl::F_SETFL, pi[2].fcntl(Fcntl::F_GETFL) | Fcntl::O_NONBLOCK)
           
-          stdout_finished = false
-          stderr_finished = false
+              stdout_finished = false
+              stderr_finished = false
          
-          results = nil
-
-          while !stdout_finished || !stderr_finished
-            begin
-              channels_to_watch = []
-              channels_to_watch << stdout if !stdout_finished
-              channels_to_watch << stderr if !stderr_finished
-              ready = IO.select(channels_to_watch, nil, nil, 1.0)
-            rescue Errno::EAGAIN
-            ensure
-              results = Process.waitpid2(cid, Process::WNOHANG)
-              if results
-                stdout_finished = true
-                stderr_finished = true 
-              end
-            end
-
-            if ready && ready.first.include?(stdout)
-              line = results ? stdout.gets(nil) : stdout.gets
-              if line
-                o.write(line)
-              else
-                stdout_finished = true
-              end
-            end
-            if ready && ready.first.include?(stderr)
-              line = results ? stderr.gets(nil) : stderr.gets
-              if line
-                e.write(line)
-              else
-                stderr_finished = true
+              results = nil
+
+              while !stdout_finished || !stderr_finished
+                begin
+                  channels_to_watch = []
+                  channels_to_watch << stdout if !stdout_finished
+                  channels_to_watch << stderr if !stderr_finished
+                  ready = IO.select(channels_to_watch, nil, nil, 1.0)
+                rescue Errno::EAGAIN
+                ensure
+                  results = Process.waitpid2(cid, Process::WNOHANG)
+                  if results
+                    stdout_finished = true
+                    stderr_finished = true 
+                  end
+                end
+
+                if ready && ready.first.include?(stdout)
+                  line = results ? stdout.gets(nil) : stdout.gets
+                  if line
+                    o.write(line)
+                  else
+                    stdout_finished = true
+                  end
+                end
+                if ready && ready.first.include?(stderr)
+                  line = results ? stderr.gets(nil) : stderr.gets
+                  if line
+                    e.write(line)
+                  else
+                    stderr_finished = true
+                  end
+                end
               end
+              results = Process.waitpid2(cid) unless results
+              o.rewind
+              e.rewind
+              b[cid, pi[0], o, e]
+              results.last
             end
+          ensure
+            pi.each{|fd| fd.close unless fd.closed?}
           end
-          results = Process.waitpid2(cid) unless results
-          o.rewind
-          e.rewind
-          b[cid, pi[0], o, e]
-          results.last
+        else
+          [cid, pw.last, pr.first, pe.first]
         end
-      ensure
-        pi.each{|fd| fd.close unless fd.closed?}
       end
-    else
-      [cid, pw.last, pr.first, pe.first]
     end
   end
 end