mediakit 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbb72318968740f4dc55511f596e1b2a5ab06364
-  data.tar.gz: 2db7ef39eab4355479fbd4a2f4d2903a28e3d2c1
+  metadata.gz: e8c1d2feb0c883e753a129e9604a25a51d30f200
+  data.tar.gz: ee908ed8e9b9d53feb99d7f421521f8a98552b44
 SHA512:
-  metadata.gz: e395df8b6ea131f34896d810d6e7deb4d2361664a453c058a76781cb227c8695487b1a79a318d84cc2898264d61d482278712c98b0a525f26bb8f2e7cecc0699
-  data.tar.gz: 699f2b179503f82b1159fea3fa3cae8359407cb4a767e74d09897a7d62e112b86700f821e426e60e286ac33d3544bd1d8356a1d3a1c364dbd4e9c5f9c9cc90ec
+  metadata.gz: 8a74f24782c40f1a5aff0765c4ec36866daac73222b9ab39cb4d1fa94add35bd4dde103c55c62c655b3569b97e1a1e91ad657d052a64d711a5f88a2aaaf576bd
+  data.tar.gz: a9d135f3fc6c6e0ed555da249d0a82a32eacc245cc7624b78ad2e9fcfa8bc62fc1f1c459797ce7e951c396c017edb4a4bb3c031ef8132390389036b2eaffb120

data/README.md

@@ -61,15 +61,10 @@ but can pass certain it.
 driver = Mediakit::Drivers::FFmpeg.new()
 ffmpeg = Mediakit::FFmpeg.new(driver)
 
-options = Mediakit::FFmpeg::Options.new(
-  Mediakit::FFmpeg::Options::GlobalOption.new(
-    't' => 100,
-    'y' => true,
-  ),
-  Mediakit::FFmpeg::Options::InputFileOption.new(
-    options: nil,
-    path:    input,
-  ),
+options = Mediakit::FFmpeg::Options.new
+options.add_option(Mediakit::FFmpeg::Options::GlobalOption.new('t' => 100))
+options.add_option(Mediakit::FFmpeg::Options::InputFileOption.new(options: nil, path: input))
+options.add_option(
   Mediakit::FFmpeg::Options::OutputFileOption.new(
     options: {
       'vf' => 'crop=320:320:0:0',
@@ -77,7 +72,7 @@ options = Mediakit::FFmpeg::Options.new(
       'ab' => '128k',
     },
     path:    output,
-  ),
+  )
 )
 puts "$ #{ffmpeg.command(options)}"
 puts ffmpeg.run(options, timeout: 30, nice: 0)

data/lib/mediakit/drivers.rb

@@ -35,7 +35,7 @@ module Mediakit
         options, rest_args = parse_options(args.dup)
         runner = Mediakit::Process::Runner.new(options)
         begin
-          stdout, stderr, exit_status = runner.run(bin, *rest_args)
+          exit_status, stdout, stderr = runner.run(bin, *rest_args)
           raise(FailError, stderr) unless exit_status
           stdout
         rescue Mediakit::Process::Runner::CommandNotFoundError => e

data/lib/mediakit/ffmpeg.rb

@@ -7,6 +7,11 @@ module Mediakit
     class FFmpegError < StandardError;
     end
 
+    class << self
+      attr_accessor(:default_global_option)
+    end
+    self.default_global_option = Options::GlobalOption.new('y' => true)
+
     attr_reader(:codecs, :formats, :decoders, :encoders)
 
     def self.create(driver = Mediakit::Drivers::FFmpeg.new)
@@ -26,12 +31,12 @@ module Mediakit
     #
     # @param [Mediakit::Runners::FFmpeg::Options] options options to create CLI argument
     def run(options, driver_options = {})
-      args = options.compose
+      args = options.compose(self.class.default_global_option)
       @driver.run(args, driver_options)
     end
 
     def command(options, driver_options = {})
-      args = options.compose
+      args = options.compose(self.class.default_global_option)
       @driver.command(args, driver_options)
     end
 

data/lib/mediakit/ffmpeg/options.rb

@@ -36,9 +36,10 @@ module Mediakit
         end
       end
 
-      def compose
+      def compose(default_global = GlobalOption.new)
+        merged_global = global ? default_global.merge(global) : default_global
         composed_string = ''
-        composed_string << "#{global}" if global
+        composed_string << "#{merged_global}"
         composed_string << " #{inputs.map(&:compose).join(' ')}" if inputs && !inputs.empty?
         composed_string << " #{output}" if output
         composed_string
@@ -155,7 +156,7 @@ module Mediakit
         end
 
         def to_s
-          "\"#{@string}\""
+          "'#{@string}'"
         end
       end
 

data/lib/mediakit/initializers/ffmpeg.rb

@@ -59,7 +59,7 @@ module Mediakit
 
         def raw_items
           options = Mediakit::FFmpeg::Options.new(Mediakit::FFmpeg::Options::GlobalOption.new('formats' => true))
-          output, _, _ = @command.run(options, logger: nil)
+          output = @command.run(options, logger: nil)
           return [] if output.nil? || output.empty?
           output.split(DELIMITER_FOR_FORMATS)[1].each_line.to_a
         end
@@ -101,7 +101,7 @@ module Mediakit
 
         def raw_items
           options = Mediakit::FFmpeg::Options.new(Mediakit::FFmpeg::Options::GlobalOption.new('decoders' => true))
-          output, _, _ = @command.run(options, logger: nil)
+          output = @command.run(options, logger: nil)
           return [] if output.nil? || output.empty?
           output.split(DELIMITER_FOR_CODER)[1].each_line.to_a
         end
@@ -159,7 +159,7 @@ module Mediakit
 
         def raw_items
           options = Mediakit::FFmpeg::Options.new(Mediakit::FFmpeg::Options::GlobalOption.new('encoders' => true))
-          output, _, _ = @command.run(options, logger: nil)
+          output = @command.run(options, logger: nil)
           return [] if output.nil? || output.empty?
           output.split(DELIMITER_FOR_CODER)[1].each_line.to_a
         end
@@ -209,7 +209,7 @@ module Mediakit
 
         def raw_items
           options = Mediakit::FFmpeg::Options.new(Mediakit::FFmpeg::Options::GlobalOption.new('codecs' => true))
-          output, _, _ = @command.run(options, logger: nil)
+          output = @command.run(options, logger: nil)
           return [] if output.nil? || output.empty?
           output.split(DELIMITER_FOR_CODECS)[1].each_line.to_a
         end

data/lib/mediakit/process/runner.rb

@@ -29,28 +29,28 @@ module Mediakit
       # @overload run(command, args)
       #   @param command [String] command name
       #   @param args [Array] args as string
-      # @return out [String] stdout of command
-      # @return err [String] stderr of command
+      # @return out [String] stdout and stderr of command
       # @return exit_status [Boolean] is succeeded
       def run(bin, *args)
         command = build_command(bin, *args)
         begin
           stdin, stdout, stderr, wait_thread = Open3.popen3(command)
           stdin.close
-          output, error_output, exit_status = wait(stdout, stderr, wait_thread)
+          exit_status, output, error_output = wait(stdout, stderr, wait_thread)
         rescue Errno::ENOENT => e
           raise(CommandNotFoundError, "Can't find command - #{command}, #{e.meessage}")
         end
 
-        [output, error_output, exit_status]
+        [exit_status, output, error_output]
       end
 
       def wait(stdout, stderr, wait_thread)
         begin
-          setup_watchers(stdout, stderr)
+          setup_watchers(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)
@@ -59,7 +59,7 @@ module Mediakit
           loop_thread.join if loop_thread
         end
 
-        [@out_watcher.data, @err_watcher.data, exit_status]
+        [exit_status, output, @out_watcher.data]
       end
 
       def build_command(bin, *args)
@@ -76,13 +76,11 @@ module Mediakit
         "#{bin} #{escaped_args}"
       end
 
-      def setup_watchers(stdout, stderr)
+      def setup_watchers(stderr)
         @timer = @timeout ? TimeoutTimer.new(@timeout, Thread.current) : nil
-        @out_watcher = IOWatcher.new(stdout) { |data| @timer.update if @timer; logger.info(data) }
-        @err_watcher = IOWatcher.new(stderr) { |data| @timer.update if @timer; logger.error(data) }
+        @out_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
 
@@ -90,7 +88,6 @@ module Mediakit
         @loop.run
       rescue => e
         # workaround for ambiguous RuntimeError
-        # TODO: replace logger method
         logger.warn(e.message)
         logger.warn(e.backtrace.join("\n"))
       end
@@ -98,7 +95,6 @@ module Mediakit
       def teardown_watchers
         @loop.watchers.each { |w| w.detach  if w.attached? }
         @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)

data/lib/mediakit/version.rb

@@ -1,3 +1,3 @@
 module Mediakit
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

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