ridgepole 0.6.5.beta4 → 0.6.5.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6eb5cd9b6da53e0af2afd188637a9196f5a59b6c
-  data.tar.gz: c0c798186e1cd37c7e1881278270d82f200020bd
+  metadata.gz: 21fa98bc837610d82369574a6b91ba5a15d166f9
+  data.tar.gz: 09fda9b7559d215577b5d3bb4f88752430ca6f06
 SHA512:
-  metadata.gz: 34b3eca50c3aadbf464e4a23f3c5a16c1f8022709fd02df91992212b083eb3080ed50e06556d216405d462f2288948c617c21e1dfc15a2cea567d5d062692712
-  data.tar.gz: da081d87c9e157c515bfd81acd1363b3586bf532861f480ac627ba1e936e2b65d606b8751220ca2b1917282fc2ccd44f2507a5f1aa4581107f7481674f948abd
+  metadata.gz: 3d36ce28a343c134734b381ad56872c6e98c193cf46f5588a608902f302da995a14c260e7853acffdd635ba9b1aa4a132625d87b0ae88735055e7c28baf87bb8
+  data.tar.gz: 6eb7adbec627ea39c793e588e8dc2703e21d1879f147ce7cc881b7bb134dd1307b5b8635f8b1c5547907d6262bd227566f4c3de48b579eda563e9fdb56ca2d1b

data/lib/ridgepole/external_sql_executer.rb

@@ -7,16 +7,36 @@ class Ridgepole::ExternalSqlExecuter
   def execute(sql)
     cmd = Shellwords.join([@script, sql, JSON.dump(ActiveRecord::Base.connection_config)])
     @logger.info("Execute #{@script}")
+    script_basename = File.basename(@script)
 
-    out, err, status = Open3.capture3(cmd)
-    out.strip!
-    err.strip!
+    Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+      stdin.close_write
 
-    @logger.info("#{@script}: #{out}") unless out.empty?
-    @logger.warn("[WARNING] #{@script}: #{err}") unless err.empty?
+      begin
+        loop do
+          IO.select([stdout, stderr]).flatten.compact.each do |io|
+            io.each do |line|
+              next if line.nil?
+              line.strip!
 
-    unless status.success?
-      raise "`#{@script}` execution failed"
+              if io == stderr
+                @logger.warn("[WARNING] #{script_basename}: #{line}")
+              else
+                @logger.info("#{script_basename}: #{line}")
+              end
+            end
+          end
+
+          if stdout.eof? and stderr.eof?
+            break
+          end
+        end
+      rescue EOFError
+      end
+
+      unless wait_thr.value.success?
+        raise "`#{@script}` execution failed"
+      end
     end
   end
 end

data/lib/ridgepole/version.rb

@@ -1,3 +1,3 @@
 module Ridgepole
-  VERSION = '0.6.5.beta4'
+  VERSION = '0.6.5.beta5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ridgepole
 version: !ruby/object:Gem::Version
-  version: 0.6.5.beta4
+  version: 0.6.5.beta5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-04 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord