mediakit 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739026ab070097e01f9e544c1838bbf532559641
-  data.tar.gz: bec5a0d43369988119be0a84d1999d781cdc4859
+  metadata.gz: 7435ac359f8e6bd85841a8e6d9aa40b4f9984250
+  data.tar.gz: f73d0dcf7d9b077eaf702b46844a5f255ca5f94f
 SHA512:
-  metadata.gz: 34b726d533096261e10df0dc11c79b737247b4c3eab3b6b6f9d94558e20166574735fd1c83660a0725e350c76c7be4c6129f2509015c4015b3b7866b1ebf2c30
-  data.tar.gz: aece0527121a414e45f4b46d4efb3ae6610cae4a43e134963d1ba4dc810f5c51565c001a3b0ef7b409706d406ff65ba65a926060f92f1728577750d753b43989
+  metadata.gz: 991f5cf8db3564fe37f20a61601318bbf120cf0e66100402850adac03b4cc429fb78ed09ce67cca7e02cfad5c53f3c3da504806c39fb75217e10ffe11a48b520
+  data.tar.gz: 66356ffb1faccd86054c39f5680356bc3fadf9e606e3054dd2eb4680e9ebf2a36fa65ff7f8bee8bc69887d31ec6824e9c3adbf312f82c86c032f81e4d07570d4

data/lib/mediakit/utils/process_runner.rb

@@ -32,29 +32,44 @@ module Mediakit
         command = build_command(bin, *args)
         exit_status = nil
         begin
-          stdin, stdout, stderr, wait_thr = Open3.popen3(command)
+          stdin, stdout, stderr, wait_thread = Open3.popen3(command)
           stdin.close
-          pid = wait_thr.pid
-          begin
-            loop = Coolio::Loop.new
-            timer, out_watcher, err_watcher = setup_watchers(loop, stdout, stderr)
-            loop_thread = Thread.new { loop.run }
-            wait_thr.join
-            exit_status = (wait_thr.value.exitstatus == 0)
-          rescue Timeout::Error => error
-            force_kill_process(pid)
-            raise(error)
-          ensure
-            out_watcher.close unless out_watcher && out_watcher.closed?
-            err_watcher.close unless err_watcher && err_watcher.closed?
-            timer.detach if timer
-            loop_thread.join if loop_thread
-          end
+          output, error_output, exit_status = if @timeout
+                                                wait_with_timeout(stdout, stderr, wait_thread)
+                                              else
+                                                wait_without_timeout(stdout, stderr, wait_thread)
+                                              end
         rescue Errno::ENOENT => e
           raise(CommandNotFoundError, "Can't find command - #{command}, #{e.meessage}")
         end
 
-        [out_watcher.data, err_watcher.data, exit_status]
+        [output, error_output, exit_status]
+      end
+
+      def wait_without_timeout(stdout, stderr, wait_thread)
+        wait_thread.join
+        exit_status = (wait_thread.value.exitstatus == 0)
+        [stdout.read, stderr.read, exit_status]
+      end
+
+      def wait_with_timeout(stdout, stderr, wait_thread)
+        begin
+          loop = Coolio::Loop.new
+          timer, out_watcher, err_watcher = setup_watchers(loop, stdout, stderr)
+          loop_thread = Thread.new { loop.run }
+          wait_thread.join
+          exit_status = (wait_thread.value.exitstatus == 0)
+        rescue Timeout::Error => error
+          force_kill_process(wait_thread.pid)
+          raise(error)
+        ensure
+          out_watcher.close if out_watcher && !out_watcher.closed?
+          err_watcher.close if err_watcher && !err_watcher.closed?
+          timer.detach if timer && timer.attached?
+          loop_thread.join if loop_thread
+        end
+
+        [out_watcher.data, err_watcher.data,exit_status]
       end
 
       def build_command(bin, *args)

data/lib/mediakit/version.rb

@@ -1,3 +1,3 @@
 module Mediakit
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mediakit
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - ainame