joumae 0.2.4 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c697de02d12f82cff623f3c5b32529e4e3f98507
-  data.tar.gz: 93872db6a95f5070a74a05c237b3123307616513
+  metadata.gz: 23733726cd6b1593664ad3f5d45a4feddf9ddb76
+  data.tar.gz: 0d83a648e087441e265f42e7848a11c65a0fe9d9
 SHA512:
-  metadata.gz: f30e70813a4ba74f99b930e9854768ed1d3c0545d32d2fcccb33f5334e3da8f5740445362a0b47f65973dcc2d9cb8b207019926673e4b935df83be6d69d0af08
-  data.tar.gz: 47846145224e929adf014e08b6d5641fceeb9e371144f2d8793c07e7ffb3494e1e63c52921a4949f0f51e3816fccdc0883e5623d570d2d09ebc29b63853f379f
+  metadata.gz: 9a137e7ae4d8af192ed4aa1e8c9ca5814e0352fb9189cf53c7f0ffd5ff0c40e949782e69a154f52f317ce707f53900600d8eae7fc6b8cd06932ea70e8ab83e44
+  data.tar.gz: 7b97fda2118205053ea627e2bbabde5990c465a745a472806aaa9cad15414dc846ee4c678f71205ae973dc87443b66a8e3b7e2fb49ce5738c648f3dd49d12f79

data/Gemfile.lock

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

data/lib/joumae/command.rb

@@ -29,12 +29,7 @@ module Joumae
     def run!
       status = Joumae::Transaction.run!(resource_name: @resource_name, client: @client) do
         Open3.popen3(cmd) do |i, o, e, w|
-          unless STDIN.tty?
-            redirect(STDIN => i)
-          end
-          i.close
-
-          redirect(o => STDOUT, e => STDERR)
+          redirect(STDIN => i, o => STDOUT, e => STDERR)
 
           debug w.value
 
@@ -47,25 +42,61 @@ module Joumae
     private
 
     def redirect(mapping)
-      files = mapping.keys
-
-      until files.all?(&:eof) do
-        ready = IO.select(files)
-
-        continue unless ready
+      inputs = mapping.keys
+      ios_ready_for_eof_check = []
+
+      debug "Joumae::Command#redirect: mapping: " + mapping.inspect
+
+      # Calling IO#eof against an IO which is not `select`ed previous blocks the current thread.
+      # So you can't do something like :
+      #   until inputs.all?(&:eof) do
+      # Or:
+      #   until (inputs - [STDIN]).all?(&:eof) do
+      until inputs.empty? || (inputs.size == 1 && inputs.first == STDIN) do
+        debug 'starting `select`'
+
+        readable_inputs, = IO.select(inputs, [], [])
+        ios_ready_for_eof_check = readable_inputs
+
+        debug 'finished `select`'
+
+        # We can safely call `eof` without blocking against previously selected IOs.
+        debug 'starting eof check'
+        ios_ready_for_eof_check.select(&:eof).each do |src|
+          debug "Stopping redirection from an IO in EOF: " + src.inspect
+          # `select`ing an IO which has reached EOF blocks forever.
+          # So you have to delete such IO from the array of IOs to `select`.
+          inputs.delete src
+
+          # You must close the child process' STDIN immeditely after the parent's STDIN reached EOF,
+          # or some kinds of child processes never exit.
+          # e.g.) echo foobar | joumae run -- cat
+          # After the `echo` finished outputting `foobar`, you have to tell `cat` about that or `cat` will wait for more inputs forever.
+          mapping[src].close if src == STDIN
+        end
 
-        readable = ready[0]
+        break if inputs.empty? || (inputs.size == 1 && inputs.first == STDIN)
 
-        readable.each do |f|
+        readable_inputs.each do |input|
           begin
-            data = f.read_nonblock(1024)
-
-            mapping[f].write(data)
-            mapping[f].flush
+            data = input.read_nonblock(1024)
+            output = mapping[input]
+            output.write(data)
+            output.flush
           rescue EOFError => e
-            debug e.to_s;
+            debug "Reached EOF: #{e}"
+            inputs.delete input
+          rescue Errno::EPIPE => e
+            # How to produce this error:
+            # 1. Run the command:
+            #   cat | bin/joumae run --resource-name test -- bundle exec ruby -v
+            # 2. Press Enter several times
+            debug "Handled error: #{e}: io: #{input.inspect}"
+            inputs.delete input
           end
         end
+
+        ios_ready_for_eof_check = inputs & readable_inputs
       end
     end
 

data/lib/joumae/version.rb

@@ -1,3 +1,3 @@
 module Joumae
-  VERSION = "0.2.4"
+  VERSION = "0.2.7"
 end

metadata

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