specinfra 2.37.3 → 2.37.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7f05059b7054bc5fcb9c5458ccc852b10e7fd9a
-  data.tar.gz: 7884725fe7da07f96078b4b6784bcb9f7647f14d
+  metadata.gz: f954e83409c50756d2719dd0b3dfbb3d5e2a546a
+  data.tar.gz: 271125a6999b22a34db25105a758607819f27634
 SHA512:
-  metadata.gz: 2f62ce638f8898da682d2fe75eaaced5b5ee1de55eff032cc50c4dc97c78f253b0cb6fb3eaa3e222881dc97389129af01f12e192339e44fcd66a2db38e1986c3
-  data.tar.gz: 1b5417957402247b243ded63ea65c45d6fca86c6c5602cce47ad97d86ff23b2b326ccdab78104ed055b76ea1efe8f35d23e668558778f1903237fa687ee6e1ed
+  metadata.gz: 1ac530ecba58a2c09e016d1479001dfcb7d557d01b590235f88f08920a70cb93b00a2fd825178f06101cc9a6f28ab622bd6bd95d819944a4f7dc120a03f116fa
+  data.tar.gz: 87d5af2f525c5242241d80b029e6668f6c4e0416d162f9a2624c7a6f1a7c82349981f8d885333e9de998d48428d502ec9970de50bbc24060b826f88305288a71

data/lib/specinfra/backend/exec.rb

@@ -45,35 +45,48 @@ module Specinfra
       private
       def spawn_command(cmd)
         stdout, stderr = '', ''
-
         begin
           quit_r, quit_w = IO.pipe
           out_r,  out_w  = IO.pipe
           err_r,  err_w  = IO.pipe
 
           th = Thread.new do
+            output = {
+              quit_r => "",
+              out_r => "",
+              err_r => ""
+            }
+
+            handlers = {
+              quit_r => nil,
+              out_r => @stdout_handler,
+              err_r => @stderr_handler
+            }
+
             begin
               loop do
-                readable_ios, = IO.select([quit_r, out_r, err_r])
-
-                if readable_ios.include?(out_r)
-                  out = out_r.read_nonblock(4096)
-                  stdout += out
-                  @stdout_handler.call(out) if @stdout_handler
+                readable_ios, = IO.select(output.keys)
+
+                readable_ios.each do |fd|
+                  loop do
+                    begin
+                      out = fd.read_nonblock(4096)
+                      output[fd] << out
+
+                      handlers[fd].call(out) if handlers[fd]
+                    rescue Errno::EAGAIN
+                      # Ruby 2.2 has more specific exception class IO::EAGAINWaitReadable
+                      break
+                    end
+                  end
                 end
 
-                if readable_ios.include?(err_r)
-                  err = err_r.read_nonblock(4096)
-                  stderr += err
-                  @stderr_handler.call(err) if @stderr_handler
-                end
-
-                if readable_ios.include?(quit_r)
-                  break
-                end
+                break unless output[quit_r].empty?
               end
             rescue EOFError
             ensure
+              stdout = output[out_r]
+              stderr = output[err_r]
               quit_r.close unless quit_r.closed?
               out_r.close  unless out_r.closed?
               err_r.close  unless err_r.closed?

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.37.3"
+  VERSION = "2.37.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.37.3
+  version: 2.37.4
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -572,3 +572,4 @@ test_files:
 - spec/host_inventory/openbsd/filesystem_spec.rb
 - spec/host_inventory/solaris/filesystem_spec.rb
 - spec/spec_helper.rb
+has_rdoc: