rubysh 0.2.2 → 0.2.4

data/lib/rubysh/runner.rb

@@ -1,6 +1,6 @@
 module Rubysh
   class Runner
-    attr_accessor :command, :targets
+    attr_accessor :command, :targets, :parallel_io
 
     def initialize(command)
       @runner_state = :initialized
@@ -288,11 +288,11 @@ module Rubysh
       if on_write = command.opts[:on_write]
         @parallel_io.on_write(on_write)
       else
-        @parallel_io.on_write do |target_name, written, remaining|
+        @parallel_io.on_write do |target_name, data, remaining|
           if data == Subprocess::ParallelIO::EOF
             Rubysh.log.debug("EOF reached on #{target_name.inspect}")
           else
-            Rubysh.log.debug("Just wrote #{written.inspect} on #{target_name.inspect}")
+            Rubysh.log.debug("Just wrote #{data.inspect} on #{target_name.inspect}")
           end
         end
       end

data/lib/rubysh/subprocess/parallel_io.rb

@@ -15,6 +15,14 @@ class Rubysh::Subprocess
       @writer_buffers = {}
     end
 
+    def register_reader(reader, name)
+      @readers[reader] = name
+    end
+
+    def register_writer(writer, name)
+      @writers[writer] = name
+    end
+
     def on_read(method=nil, &blk)
       raise "Can't provide both method and block" if method && blk
       @on_read = method || blk

data/lib/rubysh/version.rb

@@ -1,3 +1,3 @@
 module Rubysh
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

data/test/functional/lib/on_output.rb

@@ -30,5 +30,36 @@ module RubyshTest::Functional
         assert_raises(Rubysh::Error::BaseError) {runner.read}
       end
     end
+
+    describe 'when registering a reader post-hoc' do
+      it 'successfully uses both the existing and new reader' do
+        buffers = {}
+        runner = Rubysh('sh', '-c', '
+echo stdout1
+read _
+echo stdout2
+',
+          Rubysh.>, Rubysh.<,
+          :on_read => Proc.new do |name, bytes|
+            (buffers[name] ||= '') << bytes
+          end
+          ).run_async
+        reader, writer = IO.pipe
+        runner.parallel_io.register_reader(reader, :pipe)
+
+        # run_once may be triggered by sigchld
+        runner.parallel_io.run_once until buffers.length > 0
+        assert_equal(nil, buffers[:pipe])
+        assert_equal("stdout1\n", buffers[:stdout])
+        buffers.clear
+
+        runner.write("stdin\n")
+        writer.write('pipe')
+
+        runner.parallel_io.run_once until buffers[:stdout]
+        assert_equal('pipe', buffers[:pipe])
+        assert_equal("stdout2\n", buffers[:stdout])
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubysh
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -143,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1131101407467327753
+      hash: -1239245545634239752
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1131101407467327753
+      hash: -1239245545634239752
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23