mediakit 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 575608c79c6aefb71acac345ee3216f2ce8291d6
-  data.tar.gz: 0fdf5b24e11a8b2f9218a1e63b3b9473ca2a0884
+  metadata.gz: e69a57c2b1c2be72c69e94c1b49a7039a1942dbf
+  data.tar.gz: f384688fb09a6175228e424ec1700273b5831978
 SHA512:
-  metadata.gz: f79fbba7a247c1fc51b31c906e96b98cc28331e7a6cd68e6eb76a93dba763384966c0f2ec1fab2afde66da7e5d71398d5dd6a4527cedc135fcb190391e44e60e
-  data.tar.gz: 24e596222c852222c8a1fd5366b2225c1e0360524975fb4f7539ef2c3ed79bd520f4f83103bdc9abf15bf55aff7670e490aaa250a8b2186b0a2573d9f2ac2634
+  metadata.gz: 4447c23bfcc32517c129afc8214516ee3b9eee786acec729f31b34c37ea1b7136b0cd70f78dabe98ccccf47a5cf4df303b9a9dec228c37561ad481404d8c4cdd
+  data.tar.gz: 3400a0614adf0534f43b2965053b1bba5e0d89c1758cd5e8572e46a15e4d01f5c05a21fffa91753bf4a271f9e7ec866604cbfba723b36fd3bc49ba465c6ca9d3

data/README.md

@@ -12,14 +12,15 @@ I've design this library for following purpose.
 
 Currently you can use low-level inteface of mediakit!
 
-* [ ] low-level interface
+* [x] low-level interface
   * [x] execute command for ffmpeg
   * [x] unit testing supports (fake driver)
   * [x] nice command setting
   * [x] read timeout setting
   * [x] shell escape for security
-  * [ ] logger support
-  * [ ] ffmpeg instropection (support formats, codecs, encoders, decoders..)
+  * [x] ffmpeg instropection (retrive supported formats, codecs, encoders and decoders)
+  * [x] logger support
+* [ ] low-level ffprobe interface
 * [ ] high-level interface for ffmpeg
 * [ ] low-level interface for sox
 * [ ] high-level interface for sox

data/lib/mediakit/utils/process_runner.rb

@@ -2,6 +2,7 @@ require 'open3'
 require 'thread'
 require 'timeout'
 require 'cool.io'
+require 'logger'
 require 'mediakit/utils/shell_escape'
 
 module Mediakit
@@ -14,9 +15,12 @@ module Mediakit
 
       DEFAULT_READ_TIMEOUT_INTERVAL = 30
 
-      def initialize(timeout: nil, nice: 0)
+      attr_reader(:logger)
+
+      def initialize(timeout: nil, nice: 0, logger: nil)
         @timeout = timeout
         @nice = nice
+        @logger = logger || Logger.new(STDOUT)
       end
 
       # @overload run(command, *args)
@@ -62,7 +66,6 @@ module Mediakit
           raise(error)
         ensure
           teardown_watchers
-          loop_thread.join if loop_thread
         end
 
         [@out_watcher.data, @err_watcher.data, exit_status]
@@ -84,9 +87,8 @@ module Mediakit
 
       def setup_watchers(stdout, stderr)
         @timer = TimeoutTimer.new(@timeout, Thread.current)
-        @out_watcher = IOWatcher.new(stdout) { @timer.update }
-        @err_watcher = IOWatcher.new(stderr) { @timer.update }
-
+        @out_watcher = IOWatcher.new(stdout) { |data| @timer.update; logger.info(data) }
+        @err_watcher = IOWatcher.new(stderr) { |data| @timer.update; logger.error(data) }
         @loop = Coolio::Loop.new
         @out_watcher.attach(@loop)
         @err_watcher.attach(@loop)
@@ -98,8 +100,8 @@ module Mediakit
       rescue => e
         # workaround for ambiguous RuntimeError
         # TODO: replace logger method
-        warn(e.message)
-        warn(e.backtrace)
+        logger.warn(e.message)
+        logger.warn(e.backtrace.join("\n"))
       end
 
       def teardown_watchers
@@ -107,12 +109,15 @@ module Mediakit
         @out_watcher.close if @out_watcher && !@out_watcher.closed?
         @err_watcher.close if @err_watcher && !@err_watcher.closed?
         @loop.stop if @loop.has_active_watchers?
+      rescue RuntimeError => e
+        logger.warn(e.message)
+        logger.warn(e.backtrace.join("\n"))
       end
 
       def force_kill_process(pid)
         Process.kill('SIGKILL', pid)
-      rescue Errno::ESRCH
-        warn 'already killedd'
+      rescue Errno::ESRCH => e
+        logger.warn("fail SIGKILL pid=#{pid} - #{e.message}, #{e.backtrace.join("\n")}")
       end
 
       class IOWatcher < Coolio::IO
@@ -126,7 +131,7 @@ module Mediakit
 
         def on_read(data)
           @data << data
-          @block.call(self)
+          @block.call(data)
         end
 
         def on_close

data/lib/mediakit/version.rb

@@ -1,3 +1,3 @@
 module Mediakit
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

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