joumae 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 216773d4a6a9177310fb757fed1d3b80aebd7e8a
-  data.tar.gz: bde3734f5b5513f6a4c18c561655562004001f1e
+  metadata.gz: 0ef042d05aeab5b8c0b04b20bc7d941cb12662f2
+  data.tar.gz: 9db5f0ee408e17c7f6a25d1e1131f908af75ad9d
 SHA512:
-  metadata.gz: 8502d2b2a88ef5ae0d40aec45e9f6ea8bdd9a50d16a5d1ec3d5013fa17ce8f4c697f92af6200f0ab98699f66bded8b45159975c44fae3a634da571cd5649bd89
-  data.tar.gz: 5abc27547003d6807dc566443ff61826edd98b7235001787f9b45cdb069cdc22fc1b271ab2dd89961d42f1bdd4ee3ddef24ebee80c52f35da079b83fe31124cb
+  metadata.gz: ee52c72f005d0debe8829fe4ddbf659fdbc11f4850c4ac08811c84b8c52fdb6684ea73fb09ead5283ca90d1a29d7b031006a9c160815a0904ae42f2948ce0ba7
+  data.tar.gz: e636aec70a610a459cce4c397e5a6d5c73240aef3cd6d05877d47b9e2785a4b8802d9acd1380538c44a513c14ac7a3f9d187c79ae2fb0c274c10e308799af94f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    joumae (0.2.1)
+    joumae (0.2.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/joumae/command.rb

@@ -5,6 +5,8 @@ require 'open3'
 
 module Joumae
   class Command
+    EXIT_STATUS_INTERRUPT = 130
+
     attr_reader :cmd
 
     def initialize(cmd, resource_name:, client:)
@@ -26,19 +28,13 @@ module Joumae
 
     def run!
       status = Joumae::Transaction.run!(resource_name: @resource_name, client: @client) do
-        Open3.popen3("bash") do |i, o, e, w|
-          i.write cmd
-          i.close
-
-          o.each do |line|
-            STDOUT.puts line
-            STDOUT.flush
+        Open3.popen3(cmd) do |i, o, e, w|
+          unless STDIN.tty?
+            redirect(STDIN => i)
           end
+          i.close
 
-          e.each do |line|
-            STDERR.puts line
-            STDERR.flush
-          end
+          redirect(o => STDOUT, e => STDERR)
 
           debug w.value
 
@@ -50,6 +46,37 @@ module Joumae
 
     private
 
+    def redirect(mapping)
+      files = mapping.keys
+
+      until files.all?(&:eof) do
+        ready = IO.select(files)
+
+        continue unless ready
+
+        readable = ready[0]
+
+        readable.each do |f|
+          begin
+            data = f.read_nonblock(1024)
+
+            mapping[f].write(data)
+          rescue EOFError => e
+            debug e.to_s;
+          end
+        end
+      end
+    end
+
+    def all_eof?(files)
+      begin
+        files.all?(&:eof)
+      rescue Interrupt => e
+        warn "You've interrupted while joumae is running a command."
+        EXIT_STATUS_INTERRUPT
+      end
+    end
+
     def info(msg)
       logger.info msg
     end

data/lib/joumae/version.rb

@@ -1,3 +1,3 @@
 module Joumae
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: joumae
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Yusuke KUOKA
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler