mediakit 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c160825c9e2f9c658e27deba0c1b85901d1a26b3
-  data.tar.gz: 9fda675bcda6a2640361e713c0fe8a3ed2caf40e
+  metadata.gz: 107e031c77eff9e854d35d6f1645b3e934ca9136
+  data.tar.gz: e4f10d51c9f694e06576dc17ce55ae8a39b00d9e
 SHA512:
-  metadata.gz: a2898c825709b0544492c17bc1e82ac8a10c93c3dfea9abd4105ac158071449da26032125195c1d0467052d5604dacf043f14e388d2f4ba6d322be1411f4c409
-  data.tar.gz: e02a33b4ff394e976fcd1aee61de63cebbb1a21df6833395c9371d824f9576939c37461ceca395790cdae72e48706b9958ddb84517da2a5f808c4107c9baae87
+  metadata.gz: 9380bfc22cb3c72d33af11864bd2e67ec4be24865dd1360695a981f0eac683bd150071806234ca61eb97b2d08c787e12eacbdcde9355f5be7617a9defb2bf848
+  data.tar.gz: 8510cf29d66fa761e936beea7456e0d8b2e7e247bdf86a2e7cd5f2b7f266b53070715e88a5391ae9fe31b260f76472c17596e277a3ebbbefd57479387fe99fed

data/lib/mediakit/process/runner.rb

@@ -46,20 +46,21 @@ module Mediakit
 
       def wait(stdout, stderr, wait_thread)
         begin
-          setup_watchers(stderr)
+          setup_watchers(stdout, stderr)
           loop_thread = Thread.new { run_loop }
           wait_thread.join
           exit_status = (wait_thread.value.exitstatus == 0)
-          output = stdout.read
         rescue Timeout::Error => error
           force_kill_process(wait_thread.pid)
           raise(error)
         ensure
           teardown_watchers
           loop_thread.join if loop_thread
+          @out_watcher.read
+          @err_watcher.read
         end
 
-        [exit_status, output, @out_watcher.data]
+        [exit_status, @out_watcher.data, @err_watcher.data]
       end
 
       def build_command(bin, *args)
@@ -76,11 +77,13 @@ module Mediakit
         "#{bin} #{escaped_args}"
       end
 
-      def setup_watchers(stderr)
+      def setup_watchers(stdout, stderr)
         @timer = @timeout ? TimeoutTimer.new(@timeout, Thread.current) : nil
-        @out_watcher = IOWatcher.new(stderr) { |data| @timer.update if @timer; logger.info(data); }
+        @out_watcher = IOWatcher.new(stdout) { |data| @timer.update if @timer; logger.info(data); }
+        @err_watcher = IOWatcher.new(stderr) { |data| @timer.update if @timer; logger.info(data); }
         @loop = Coolio::Loop.new
         @out_watcher.attach(@loop)
+        @err_watcher.attach(@loop)
         @timer.attach(@loop) if @timer
       end
 
@@ -94,7 +97,6 @@ module Mediakit
 
       def teardown_watchers
         @loop.watchers.each { |w| w.detach  if w.attached? }
-        @out_watcher.close if @out_watcher && !@out_watcher.closed?
         @loop.stop if @loop.has_active_watchers?
       rescue RuntimeError => e
         logger.warn(e.message)
@@ -108,9 +110,10 @@ module Mediakit
       end
 
       class IOWatcher < Coolio::IO
-        attr_reader(:data)
+        attr_reader(:io, :data)
 
         def initialize(io, &block)
+          @io = io
           @block = block
           @data = ''
           super
@@ -124,6 +127,11 @@ module Mediakit
         def on_close
           @block = nil
         end
+
+        def read
+          @data << @io.read unless @io.closed?
+          @io.close unless @io.closed?
+        end
       end
 
       class TimeoutTimer < Coolio::TimerWatcher

data/lib/mediakit/version.rb

@@ -1,3 +1,3 @@
 module Mediakit
-  VERSION = '0.1.5'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediakit
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - ainame
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport