ridgepole 0.6.5.beta5 → 0.6.5.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21fa98bc837610d82369574a6b91ba5a15d166f9
-  data.tar.gz: 09fda9b7559d215577b5d3bb4f88752430ca6f06
+  metadata.gz: 328944b78c0416fb7b8f655ff3a7fcdea7618d5f
+  data.tar.gz: d4563c5e15ded1438ef097ed4e814c37d3fa6ef0
 SHA512:
-  metadata.gz: 3d36ce28a343c134734b381ad56872c6e98c193cf46f5588a608902f302da995a14c260e7853acffdd635ba9b1aa4a132625d87b0ae88735055e7c28baf87bb8
-  data.tar.gz: 6eb7adbec627ea39c793e588e8dc2703e21d1879f147ce7cc881b7bb134dd1307b5b8635f8b1c5547907d6262bd227566f4c3de48b579eda563e9fdb56ca2d1b
+  metadata.gz: dfeec2bd9d398f44c0b3ba3c12aad02c104161ecc6246c15237b83d659a53c91b2045716e26926e8e9c65de9e0ef3b386fdc98add24064b618f2e4e58d8cb838
+  data.tar.gz: 0fbe2f2211d480363d2921f1451057dc97ca74c48cff35de99198acfb94b830e4bb4939d405a381f7ebe77ee3a613b86da993d68c6d0bc0ad1db1aeddba9f34b

data/lib/ridgepole/external_sql_executer.rb

@@ -11,25 +11,29 @@ class Ridgepole::ExternalSqlExecuter
 
     Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
       stdin.close_write
+      files = [stdout, stderr]
 
       begin
-        loop do
-          IO.select([stdout, stderr]).flatten.compact.each do |io|
-            io.each do |line|
-              next if line.nil?
-              line.strip!
+        until files.empty?
+          ready = IO.select(files)
 
-              if io == stderr
-                @logger.warn("[WARNING] #{script_basename}: #{line}")
-              else
-                @logger.info("#{script_basename}: #{line}")
+          if ready
+            readable = ready[0]
+
+            readable.each do |f|
+              begin
+                data = f.read_nonblock(1024)
+
+                if f == stderr
+                  @logger.warn("[WARNING] #{script_basename}: #{data}")
+                else
+                  @logger.info("#{script_basename}: #{data}")
+                end
+              rescue EOFError => e
+                files.delete f
               end
             end
           end
-
-          if stdout.eof? and stderr.eof?
-            break
-          end
         end
       rescue EOFError
       end

data/lib/ridgepole/version.rb

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

metadata

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