mediakit 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6bce22e6bb5655d6ef5522dfb86cd95660b56119
-  data.tar.gz: 4ae5b7f5a0c1348aa22de26b0da11a80c47f0f05
+  metadata.gz: b89173bcea5b5f50317e32e2034f49d28826f241
+  data.tar.gz: df29a2019137bc3524e5936eb240edc8694b9910
 SHA512:
-  metadata.gz: 67789568de47730bc876c7be8971d45bfa6e69179cb227abd4052a390e41aea7eb52939932b144a27bcc2752abe02c690361e88c8e8b9f5973ae3a2897d8ed54
-  data.tar.gz: 8db964b6558ceec920bc45833bcb7e57cccc1a5f6891c69540c40b3934a35761feb7d02f440f0abb0bbfda304bf463c02de0b20b3d21cab73f8854032dc751ef
+  metadata.gz: 4277da4ec46a39da0570ad8d06380103890fa7e3fc80b11d2a257b514bf00fccc3c68a3feb7c6aaa48c7a543b266da2302e8ec2ab3340cac256a027d0062fa20
+  data.tar.gz: ca904cac4f9c3d92911db53dd344610bf06616b9c76ff982790230c24fde0e00c608cebe755406b50bdc97b9ca4a22ea14a0deffccf77c54be0474af44efa7cb

data/.travis.yml

@@ -1,7 +1,8 @@
 language: ruby
+cache:
+  bundler: true
 rvm:
   - 2.2.0
 before_install:
-  - gem update --system
-  - gem update bundler
-  - gem --version
+  - bundler --version
+  - gem --version

data/lib/mediakit/utils/process_runner.rb

@@ -2,7 +2,7 @@ require 'shellwords'
 require 'open3'
 require 'thread'
 require 'timeout'
-
+require 'cool.io'
 
 module Mediakit
   module Utils
@@ -12,8 +12,9 @@ module Mediakit
       class TimeoutError < StandardError;
       end
 
-      def initialize(timeout: nil)
+      def initialize(timeout: nil, nice: 0)
         @timeout = timeout
+        @nice = nice
       end
 
       # @overload run(command, *args)
@@ -26,37 +27,51 @@ module Mediakit
       # @return err [String] stderr of command
       # @return exit_status [Boolean] is succeeded
       def run(bin, *args)
-        command = self.class.command(bin, *args)
-
-        pid, out, err, exit_status = nil
+        command = build_command(bin, *args)
+        pid, exit_status = nil
         out_reader, err_reader = nil
-        watch = TimeoutWatch.new(@timeout)
+        loop = Coolio::Loop.new
         begin
           stdin, stdout, stderr, wait_thr = Open3.popen3(command)
           stdin.close
           pid = wait_thr.pid
-          watch.start(Thread.current)
-          out_reader = IOReader.new(stdout) { |chunk| watch.update }
-          err_reader = IOReader.new(stderr) { |chunk| watch.update }
-
+          timer = TimeoutTimer.new(@timeout, Thread.current)
+          timer.attach(loop)
+          out_watcher = IOWatcher.new(stdout) { timer.update }
+          out_watcher.attach(loop)
+          err_watcher = IOWatcher.new(stderr) { timer.update }
+          err_watcher.attach(loop)
+          loop_thread = Thread.new do
+            loop.run
+          end
           wait_thr.join
           exit_status = (wait_thr.value.exitstatus == 0)
         rescue Errno::ENOENT => e
           raise(CommandNotFoundError, "Can't find command - #{command}, #{e.meessage}")
         rescue Timeout::Error => error
-          Process.kill('SIGKILL', pid)
+          safe_kill_process(pid)
           raise(error)
         ensure
-          out_reader.finish
-          err_reader.finish
-          watch.finish
+          out_watcher.close if out_watcher
+          err_watcher.close if err_watcher
+          timer.detach if timer
+          loop_thread.join
         end
 
-        [out_reader.data, err_reader.data, exit_status]
+        [out_watcher.data, err_watcher.data, exit_status]
       end
 
-      def self.command(bin, *args)
-        escaped_args = escape(*args)
+      def build_command(bin, *args)
+        command = build_command_without_options(bin, *args)
+        unless @nice == 0
+          "nice -n #{@nice} sh -c \"#{command}\""
+        else
+          command
+        end
+      end
+
+      def build_command_without_options(bin, *args)
+        escaped_args = self.class.escape(*args)
         "#{bin} #{escaped_args}"
       end
 
@@ -77,69 +92,42 @@ module Mediakit
         splits.join(' ')
       end
 
-      class IOReader
+      def safe_kill_process(pid)
+        Process.kill('SIGKILL', pid)
+      rescue Errno::ESRCH
+        warn 'already killedd'
+      end
+
+      class IOWatcher < Coolio::IO
         attr_reader(:data)
 
         def initialize(io, &block)
-          raise(ArgumentError) unless block_given?
-          @io = io
-          @data = ''
           @block = block
-          start
-        end
-
-        def finish
-          @thread.join
-          @thread.kill
+          @data = ''
+          super
         end
 
-        private
-        def start
-          @thread = Thread.new { read }
-          nil
-        end
-
-        def read
-          return if @io.closed?
-          begin
-            while chunk = @io.gets
-              @data << chunk
-              @block.call(chunk) if @block
-            end
-          rescue IOError => e
-            warn "[WARN] IOError #{e.message}"
-          ensure
-            @io.close unless @io.closed?
-          end
+        def on_read(data)
+          @data << data
+          @block.call(self)
         end
       end
 
-      # watch process progress by io.
-      # when wait time exceed duration, then kill process.
-      class TimeoutWatch
-        attr_reader(:duration)
+      class TimeoutTimer < Coolio::TimerWatcher
+        DEFAULT_CHECK_INTERVAL = 0.1
 
-        def initialize(duration)
-          @duration   = duration
+        def initialize(duration, current_thread)
+          @mutex = Mutex.new
+          @duration = duration
           @watched_at = Time.now
-          @mutex      = Mutex.new
-        end
-
-        def start(current_thread, &block)
           @current_thread = current_thread
-          @watch_thread = Thread.new do
-            loop do
-              if timeout?
-                @current_thread.raise(Timeout::Error, "wait timeout error with #{duration} sec.")
-              end
-              sleep(0.1)
-            end
-          end
-          nil
+          super(DEFAULT_CHECK_INTERVAL, true)
         end
 
-        def finish
-          @watch_thread.kill
+        def on_timer
+          if timeout?
+            @current_thread.raise(Timeout::Error, "wait timeout error with #{@duration} sec.")
+          end
         end
 
         def update
@@ -151,7 +139,8 @@ module Mediakit
         private
 
         def timeout?
-          (Time.now - @watched_at) > duration
+          # compare duration into first decimal place by integer
+          ((Time.now - @watched_at) * 10).floor >= (@duration * 10).floor
         end
       end
     end

data/lib/mediakit/version.rb

@@ -1,3 +1,3 @@
 module Mediakit
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/mediakit.gemspec

@@ -24,6 +24,7 @@ EOS
 
   spec.add_runtime_dependency "cocaine", "~> 0.5.7"
   spec.add_runtime_dependency "activesupport", "~> 4"
+  spec.add_runtime_dependency "cool.io", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry", '~> 0.10'
   spec.add_development_dependency "ruby-debug-ide", "~> 0.4"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mediakit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - ainame
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cocaine
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
+- !ruby/object:Gem::Dependency
+  name: cool.io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: mediakit is the libraries for ffmpeg and sox backed media manipulation something.