polly-ffmpeg 0.1.2 → 0.1.3

data/README.rdoc

@@ -38,4 +38,9 @@
     end
 
   If you where to add a method with the same name as one already defined in the library your method will take precedence
-  over the predefined one, a warning message informing you about the conflict will be printed out through $stderr however.
+  over the predefined one, a warning message informing you about the conflict will be printed out through $stderr however.
+
+== Credit where credit's due
+	
+	Thank's to jwthompson2 (http://github.com/jwthompson2), there's now support for all of the standard video and 
+	audio options from the ffmpeg documentation as well as improved and refactored specs.

data/ffmpeg.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffmpeg}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrik Hedman"]

data/lib/ffmpeg.rb

@@ -18,7 +18,7 @@ module FFMpeg
   def self.included(klass)
     klass.extend ClassMethods
     
-    # 
+    #
     # Everytime a method is added to the
     # class, check for conflicts with existing
     # module methods
@@ -42,28 +42,48 @@ module FFMpeg
     begin
       yield if block_given?
     rescue Exception => exception
-      Thread.current[:'method checking disabled'] = true
+      disable_method_checking!
       raise exception
     end
     FFMpegCommand << "#{to_file[:to]}" unless to_file[:to].nil?
   end
   
   #
-  # Runs ffmpeg
+  # Explicitly set ffmpeg path
+  #
+  def ffmpeg_path(path)
+    @ffmpeg_path = path
+  end
+
+  #
+  # Ru§ns ffmpeg
   #
   def run
-    execute_command FFMpegCommand.command(locate_ffmpeg)
+    if path = @ffmpeg_path ? @ffmpeg_path : FFMpegCommand.command(locate_ffmpeg)
+      execute_command path
+    else
+      $stderr.puts "Couldn't locate ffmpeg, try to specify an explicit path 
+                    with the ffmpeg_path(path) method"
+    end
   end
   
   private
   
   #
-  # 
+  # Checks if the thread local varialble 'method checking disabled'
+  # is true or false
   #
   def method_checking_enabled?
     !Thread.current[:'method checking disabled']
   end
   
+  #
+  # Turns off the method checking functionality
+  #
+  def disable_method_checking!
+    Thread.current[:'method checking disabled'] = true
+  end
+
   #
   # Tries to locate the FFmpeg executable
   #
@@ -79,4 +99,4 @@ module FFMpeg
     %x[#{cmd}]
     puts $?.success?
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polly-ffmpeg
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Patrik Hedman
@@ -36,6 +36,7 @@ files:
 - lib/ffmpeg/video_options.rb
 has_rdoc: false
 homepage: http://github.com/polly/ffmpeg
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Need to write one