video_converter 0.6.7 → 0.6.8

data/lib/video_converter/command.rb

@@ -14,9 +14,16 @@ module VideoConverter
 
     attr_accessor :command
 
-    def initialize command, params = {}
-      self.command = command.gsub(/%\{(\w+?)\}/) { |m| params[$1.to_sym] }
-      raise ArgumentError.new("Command is not parsed '#{self.command}'") if self.command.match(/%{[\w\-.]+}/)
+    def initialize command, *params
+      self.command = command.dup
+      if params.any?
+        if params[0].is_a?(Hash)
+          self.command.gsub!(/%\{(\w+?)\}/) { |m| params[0][$1.to_sym] }
+        else
+          self.command.gsub!('?') { params.shift }
+        end
+      end
+      raise ArgumentError.new("Command is not parsed '#{self.command}'") if self.command.include?('?') || self.command.match(/%{[\w\-.]+}/)
     end
 
     def execute params = {}

data/lib/video_converter/version.rb

@@ -1,3 +1,3 @@
 module VideoConverter
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

data/test/video_converter_test.rb

@@ -101,8 +101,8 @@ class VideoConverterTest < Test::Unit::TestCase
         (@c = VideoConverter.new(
           :input => ["test/fixtures/test (1).mp4", "test/fixtures/test (2).mp4"], 
           :output => [
-            {:filename=>"q1.m3u8", :path=>"test/fixtures/test (1).mp4", :type=>"segmented", :one_pass=>true, :video_codec=>"copy", :audio_codec=>"copy", :bitstream_format=>"h264_mp4toannexb"}, 
-            {:filename=>"q2.m3u8", :path=>"test/fixtures/test (2).mp4", :type=>"segmented", :one_pass=>true, :video_codec=>"copy", :audio_codec=>"copy", :bitstream_format=>"h264_mp4toannexb"}, 
+            {:filename=>"q1.m3u8", :path=>"test/fixtures/test (1).mp4", :type=>"segmented", :one_pass=>true, :video_codec=>"copy", :audio_codec=>"copy", 'bsf:v'=>"h264_mp4toannexb"}, 
+            {:filename=>"q2.m3u8", :path=>"test/fixtures/test (2).mp4", :type=>"segmented", :one_pass=>true, :video_codec=>"copy", :audio_codec=>"copy", 'bsf:v'=>"h264_mp4toannexb"}, 
             {:filename=>"playlist.m3u8", :type=>"playlist", :streams=>[
               {:path=>"q1.m3u8", :bandwidth=>464}, {:path=>"q2.m3u8", :bandwidth=>928}
             ]}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: video_converter
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: video_screenshoter
@@ -140,7 +140,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -687398470917858121
+      hash: -1396491590226390857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -687398470917858121
+      hash: -1396491590226390857
 requirements:
 - ffmpeg, version 1.2 or greated configured with libx264 and libfaac
 - live_segmenter to convert to hls