specinfra 2.36.15 → 2.36.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52825f59df9dc1d9c3221a068fd18605b16bc598
-  data.tar.gz: 6147f9e0d9d8b7fffebb60207a01666c2c695929
+  metadata.gz: 31f0678bd739fd583fa966de880fbaa598e472dc
+  data.tar.gz: 1320a5fa3d67768f37014a5543b19170b3fa5edb
 SHA512:
-  metadata.gz: 70428f446ddfdd373775273b763964614a9acb3b2cf93edafd3af7a1027f1f4497e80e7dcabe19c0d3b0e7442ce6fd7b5ffcab95b9ccdefa52b9f18ec38158c1
-  data.tar.gz: b92aa57e6661bf6bb332fc3527be3d70af8207e324026093f103397e23401d49890a1d14b6e7005de9517c4c76ca3f80692f64ab268fe0b091d9c2215b1180c1
+  metadata.gz: 369339a197697ee26e44a5bba33329a88c95aa4889f9d7f818b510bf54ed14687314fbcf003d27f60475de5ecaf5b3277acc325fb14cd437706a12a5c1404860
+  data.tar.gz: 4f74f36d6b8cb24e53d02a045f9fee4b411a9b91c15db355709ccd7b644a9f9318265b26e4fa09058a85dd51b383e8252d3c870f70ef822b3a2fa57d9668b992

data/lib/specinfra/backend/exec.rb

@@ -1,7 +1,6 @@
 require 'singleton'
 require 'fileutils'
 require 'shellwords'
-require 'sfl'
 
 module Specinfra
   module Backend
@@ -9,16 +8,18 @@ module Specinfra
       def run_command(cmd, opts={})
         cmd = build_command(cmd)
         cmd = add_pre_command(cmd)
-        stdout, stderr, exit_status = with_env do
-          spawn_command(cmd)
+        stdout = with_env do
+          `#{cmd} 2>&1`
         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, :stderr => stderr, :exit_status => exit_status
+        CommandResult.new :stdout => stdout, :exit_status => $?.exitstatus
       end
 
       def send_file(from, to)
@@ -43,59 +44,6 @@ 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
-        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.15"
+  VERSION = "2.36.16"
 end

data/specinfra.gemspec

@@ -22,7 +22,6 @@ 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.15
+  version: 2.36.16
 platform: ruby
 authors:
 - Gosuke Miyashita
@@ -52,20 +52,6 @@ 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