childprocess 0.3.5 → 0.3.6

data/lib/childprocess/jruby/process.rb

@@ -90,6 +90,10 @@ module ChildProcess
         if duplex?
           stdin = @process.getOutputStream.to_io
           stdin.sync = true
+          stdin.instance_variable_set(:@java_stream, @process.getOutputStream)
+          def stdin.__flushit; @java_stream.flush; end #The stream provided is a BufferedeOutputStream, so we have to flush it to make the bytes flow to the process
+          def stdin.flush; super; self.__flushit; end
+          def stdin.puts(*args); super(*args); self.__flushit; end
 
           io._stdin = stdin
         else

data/lib/childprocess/jruby/pump.rb

@@ -25,7 +25,7 @@ module ChildProcess
       def pump
         buffer = Java.byte[BUFFER_SIZE].new
 
-        until @stop
+        until @stop && (@input.available == 0)
           read, avail = 0, 0
 
           while read != -1

data/lib/childprocess/version.rb

@@ -1,3 +1,3 @@
 module ChildProcess
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

data/spec/io_spec.rb

@@ -54,6 +54,26 @@ describe ChildProcess do
     end
   end
 
+  it "pumps all output" do
+    10.times do |i|
+      process = echo
+      
+      out = Tempfile.new("duplex")
+      
+      begin
+        process.io.stdout = out
+        
+        process.start
+        process.poll_for_exit(exit_timeout)
+        
+        out.rewind
+        out.read.should == "hello\n"
+      ensure
+        out.close
+      end
+    end
+  end
+
   it "can write to stdin if duplex = true" do
     process = cat
 
@@ -78,6 +98,40 @@ describe ChildProcess do
     end
   end
 
+  it "can write to stdin interactively if duplex = true" do
+    process = cat
+
+    out = Tempfile.new("duplex")
+    out.sync = true
+
+    out_receiver = File.open(out.path, "rb")
+    begin
+      process.io.stdout = out
+      process.io.stderr = out
+      process.duplex = true
+
+      process.start
+      process.io.stdin.puts "hello"
+      sleep 0.1
+      out_receiver.read.should == "hello\n"
+      process.io.stdin.puts "new"
+      sleep 0.1
+      out_receiver.read.should == "new\n"
+      process.io.stdin.write "world\n"
+      process.io.stdin.flush
+      sleep 0.1
+      out_receiver.read.should == "world\n"
+      process.io.stdin.close
+      process.poll_for_exit(exit_timeout)
+
+      out_receiver.rewind
+      out_receiver.read.should == "hello\nnew\nworld\n"
+     ensure
+      out_receiver.close
+      out.close
+    end
+  end
+
   #
   # this works on JRuby 1.6.5 on my Mac, but for some reason
   # hangs on Travis (running 1.6.5.1 + OpenJDK).

data/spec/spec_helper.rb

@@ -107,6 +107,19 @@ module ChildProcessSpecHelper
     end
   end
 
+  def echo
+    if ChildProcess.os == :windows
+      ruby(<<-CODE)
+            STDIN.sync  = true
+            STDOUT.sync = true
+
+            puts "hello"
+          CODE
+    else
+      ChildProcess.build("echo", "hello")
+    end
+  end
+
   def ruby(code)
     ruby_process(tmp_script(code))
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: childprocess
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec