specinfra 2.56.0 → 2.56.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9429ca965d17ba4ca766d75e6839bf2741a24225
-  data.tar.gz: 3b102cffe931678ad7bf622fe2fe42e73b6b4da9
+  metadata.gz: bf74716f2704ffcad67d6e36dcf2c6bb6f0c5707
+  data.tar.gz: f405ec5ca49edb1c800b7ba736bef4b3e2be22d1
 SHA512:
-  metadata.gz: 5e7955571f708b9c474766f76fb88974f3b8a1d82595f03a1321638cc864f37e4badd4092d95180385524a6ded8a8d25d256446b0a2caa792e6f09b36a4ae902
-  data.tar.gz: 54eff11f532dc35fd75278ff7f064916a68406835979a64da5ac5494be56f612033741fea6d2e5eca1613652864565792ab8f728ea7f8e679c22849d4cf234b1
+  metadata.gz: a6cc4ed26aed76e9a1279edaccff02cec490b441931f82cd565b0e79f682cc849bbbd7e4789e7f4f3724fe2a9f264bc80abf3d6829fb25c5a64e767aac8290b7
+  data.tar.gz: b5cbb014f685f4fcc8be9079f950e789fb4668ff02b3319c00db3c260548224d2259dea620df282b5d88c85ec67139af3dd633ccc22fb24ca0f937e628d84839

data/lib/specinfra/backend/exec.rb

@@ -95,6 +95,21 @@ module Specinfra
               end
             rescue EOFError
             ensure
+              # Consume remained stdout and stderr from buffer
+              output.keys.each do |fd|
+                loop do
+                  begin
+                    out = fd.read_nonblock(4096)
+                    output[fd] << out
+
+                    handlers[fd].call(out) if handlers[fd]
+                  rescue Errno::EAGAIN, EOFError
+                    # Ruby 2.2 has more specific exception class IO::EAGAINWaitReadable
+                    break
+                  end
+                end
+              end
+
               stdout = output[out_r]
               stderr = output[err_r]
               quit_r.close unless quit_r.closed?

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.56.0"
+  VERSION = "2.56.1"
 end

data/spec/backend/exec/consume_exited_process_spec.rb

@@ -0,0 +1,36 @@
+require 'spec_helper'
+
+context 'when executed process had exited before read stdout and stderr,' do
+  let(:backend) { Specinfra::Backend::Exec.new }
+
+  it 'can consume stdout and stderr from buffer' do
+    allow(IO).to receive(:select).and_wrap_original { |m, *args| sleep 1; m.call(*args) }
+    result = backend.run_command("ruby -e 'STDOUT.puts \"stdout\"; STDERR.puts \"stderr\"'")
+    expect(result.stdout.chomp).to eq('stdout')
+    expect(result.stderr.chomp).to eq('stderr')
+  end
+end
+
+context 'when executed process has exited between reading stdout and stderr,' do
+  let(:backend) { Specinfra::Backend::Exec.new }
+
+  it 'can consume stdout and stderr from buffer' do
+    backend.stdout_handler = proc { |o| sleep 1 }
+    result = backend.run_command("ruby -e 'STDOUT.puts \"stdout\"; STDOUT.close; STDERR.puts \"stderr\"'")
+    expect(result.stdout.chomp).to eq('stdout')
+    expect(result.stderr.chomp).to eq('stderr')
+  end
+end
+
+context 'Output of stderr_handler' do
+  let(:backend) { Specinfra::Backend::Exec.new }
+  subject(:stderr) do
+    allow(IO).to receive(:select).and_wrap_original { |m, *args| sleep 1; m.call(*args) }
+    err = ''
+    backend.stderr_handler = proc { |e| err += e }
+    backend.run_command('echo foo 1>&2')
+    err
+  end
+
+  it { expect(stderr).to eq "foo\n" }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.56.0
+  version: 2.56.1
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -468,6 +468,7 @@ files:
 - lib/specinfra/version.rb
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/child_process_spec.rb
+- spec/backend/exec/consume_exited_process_spec.rb
 - spec/backend/exec/env_spec.rb
 - spec/backend/exec/read_noblock_spec.rb
 - spec/backend/exec/stdxxx_handler_spec.rb
@@ -577,6 +578,7 @@ summary: Common layer for serverspec and itamae
 test_files:
 - spec/backend/exec/build_command_spec.rb
 - spec/backend/exec/child_process_spec.rb
+- spec/backend/exec/consume_exited_process_spec.rb
 - spec/backend/exec/env_spec.rb
 - spec/backend/exec/read_noblock_spec.rb
 - spec/backend/exec/stdxxx_handler_spec.rb