lib/paraduct/runner.rb in paraduct-1.0.0.beta1 vs lib/paraduct/runner.rb in paraduct-1.0.0.beta2

@@ -1,20 +1,23 @@
 module Paraduct
   require "pty"
+  require 'specinfra/core'
 
   class Runner
     attr_reader :script, :params, :base_job_dir
 
-    # @param args
-    # @option args :script [String, Array<String>] script file, script(s)
-    # @option args :params [Hash{String => String}] key is capitalized and value is quoted (ex. foo=1 => FOO="1" )
-    # @option args :base_job_dir [String]
-    def initialize(args={})
-      @script       = args[:script]
-      @params       = args[:params]
-      @base_job_dir = args[:base_job_dir]
-      @job_id       = args[:job_id]
+    # @param script [String, Array<String>] script file, script(s)
+    # @param params [Hash{String => String}] value is quoted (ex. FOO=1 => FOO="1" )
+    # @param base_job_dir [String]
+    # @param job_id [String]
+    def initialize(script: nil, params: nil, base_job_dir: nil, job_id: nil)
+      @script       = script
+      @params       = params
+      @base_job_dir = base_job_dir
+      @job_id       = job_id
+
+      @backend = Specinfra::Backend::Exec.new
     end
 
     def setup_dir
       FileUtils.mkdir_p(job_dir) unless job_dir.exist?
       Paraduct::SyncUtils.copy_recursive(Paraduct.config.root_dir, job_dir)
@@ -57,23 +60,23 @@
     end
 
     private
 
     def run_command(command)
-      full_stdout = ""
+      command_result = @backend.run_command(command)
 
-      PTY.spawn(command) do |stdin, _stdout, pid|
-        begin
-          stdin.each do |line|
-            line.strip!
-            logger.info line
-            full_stdout << "#{line}\n"
-          end
-        rescue Errno::EIO
-        end
-        exit_status = PTY.check(pid)
-        raise Paraduct::Errors::ProcessError.new(full_stdout, exit_status) if exit_status && !exit_status.success?
+      full_stdout = ""
+      command_result.stdout.each_line do |line|
+        line = line.strip
+        logger.info line
+        full_stdout << "#{line}\n"
       end
+      command_result.stderr.each_line do |line|
+        line = line.strip
+        logger.info line
+        full_stdout << "#{line}\n"
+      end
+      raise Paraduct::Errors::ProcessError.new(full_stdout, command_result.exit_status) if command_result.failure?
 
       full_stdout
     end
   end
 end