specinfra 2.36.16 → 2.36.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31f0678bd739fd583fa966de880fbaa598e472dc
-  data.tar.gz: 1320a5fa3d67768f37014a5543b19170b3fa5edb
+  metadata.gz: 2d39102e5d6b60f2c4e5aa254c95e9559c4ca2f5
+  data.tar.gz: 47387d1f254b6e5e7f96db0d2f3eaf360882c0b2
 SHA512:
-  metadata.gz: 369339a197697ee26e44a5bba33329a88c95aa4889f9d7f818b510bf54ed14687314fbcf003d27f60475de5ecaf5b3277acc325fb14cd437706a12a5c1404860
-  data.tar.gz: 4f74f36d6b8cb24e53d02a045f9fee4b411a9b91c15db355709ccd7b644a9f9318265b26e4fa09058a85dd51b383e8252d3c870f70ef822b3a2fa57d9668b992
+  metadata.gz: bef2820b4f8a57c88a882286a8a93e6ccf0c2e552bfe7f7aa723be3b3474a848f0b302670c3bf45ab462dc40f3a4e0b3f4adfb24985159512470fe0b9fb23050
+  data.tar.gz: 85444779c5f8356f8f8cc0b48e717a68c1aff79f63f60bb942ff8bdc4e9faa66fcd9f313aa342d0f9ea94ca46396f050cbe620237157dd5c39e526c2f60dd63d

data/lib/specinfra/backend/exec.rb

@@ -1,6 +1,7 @@
 require 'singleton'
 require 'fileutils'
 require 'shellwords'
+require 'sfl'
 
 module Specinfra
   module Backend
@@ -8,18 +9,16 @@ module Specinfra
       def run_command(cmd, opts={})
         cmd = build_command(cmd)
         cmd = add_pre_command(cmd)
-        stdout = with_env do
-          `#{cmd} 2>&1`
+        stdout, stderr, exit_status = with_env do
+          spawn_command(cmd)
         end
-        # In ruby 1.9, it is possible to use Open3.capture3, but not in 1.8
-        # stdout, stderr, status = Open3.capture3(cmd)
 
         if @example
           @example.metadata[:command] = cmd
           @example.metadata[:stdout]  = stdout
         end
 
-        CommandResult.new :stdout => stdout, :exit_status => $?.exitstatus
+        CommandResult.new :stdout => stdout, :stderr => stderr, :exit_status => exit_status
       end
 
       def send_file(from, to)
@@ -44,6 +43,61 @@ module Specinfra
       end
 
       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
+            begin
+              loop do
+                readable_ios, = IO.select([quit_r, out_r, err_r])
+
+                if readable_ios.include?(out_r)
+                  stdout += out_r.read_nonblock(1000)
+                end
+
+                if readable_ios.include?(err_r)
+                  stderr +=  err_r.read_nonblock(1000)
+                end
+
+                if readable_ios.include?(quit_r)
+                  break
+                end
+              end
+            rescue EOFError
+            ensure
+              quit_r.close unless quit_r.closed?
+              out_r.close  unless out_r.closed?
+              err_r.close  unless err_r.closed?
+            end
+          end
+
+          th.abort_on_exception = true
+
+          pid = spawn(cmd, :out => out_w, :err => err_w)
+
+          out_w.close
+          err_w.close
+
+          pid, stats = Process.waitpid2(pid)
+
+          begin
+            quit_w.syswrite 1
+          rescue Errno::EPIPE
+          end
+
+          th.value # wait
+        ensure
+          quit_w.close unless quit_w.closed?
+        end
+
+        return stdout, stderr, stats.exitstatus
+      end
+
       def with_env
         keys = %w[BUNDLER_EDITOR BUNDLE_BIN_PATH BUNDLE_GEMFILE
             RUBYOPT GEM_HOME GEM_PATH GEM_CACHE]

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module Specinfra
-  VERSION = "2.36.16"
+  VERSION = "2.36.17"
 end

data/specinfra.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "net-scp"
   spec.add_runtime_dependency "net-ssh"
   spec.add_runtime_dependency "net-telnet"
+  spec.add_runtime_dependency "sfl"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 2.36.16
+  version: 2.36.17
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sfl
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement