polly-ffmpeg 0.1.7 → 0.1.8

data/README.textile

@@ -0,0 +1,30 @@
+h2. FFMpeg
+
+A DSL for building and executing ffmpeg commands.
+
+h2. Requirements
+
+It requires that you already have ffmpeg installed, obviously :)
+
+h2. Install
+
+gem install polly-ffmpeg --source http://gems.github.com
+
+h2. Usage
+
+To build and execute a command you would use the FFMpeg::convert method and then call the FFMpeg::run method like this:
+
+include FFMpeg
+
+convert "file.ext", :to => "new_file.ext" do
+<span>&nbsp;&nbsp;&nbsp;&nbsp;seek     "00:01:13"</span>
+<span>&nbsp;&nbsp;&nbsp;&nbsp;duration "00:10:01"</span>
+end.run
+
+For more information checkout the "documentation":http://polly.github.com/ffmpeg/
+
+
+h2. 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,20 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ffmpeg}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Patrik Hedman"]
   s.date = %q{2009-07-03}
-  s.description = %q{Need to write one}
+  s.description = %q{A DSL for building and executing ffmpeg commands}
   s.email = %q{patrik@moresale.se}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.textile"
   ]
   s.files = [
      "LICENSE",
-     "README.rdoc",
+     "README.textile",
      "Rakefile",
      "ffmpeg.gemspec",
      "lib/ffmpeg.rb",

data/lib/ffmpeg.rb

@@ -1,5 +1,6 @@
 require 'ffmpeg/class_methods'
 require 'ffmpeg/main_options'
+require 'ffmpeg/file_extensions'
 require 'ffmpeg/video_options'
 require 'ffmpeg/audio_options'
 require 'ffmpeg/ffmpeg_command'
@@ -45,7 +46,10 @@ module FFMpeg
       disable_method_checking!
       raise exception
     end
-    FFMpegCommand << "#{to_file[:to]}" unless to_file[:to].nil?
+    
+    build_output_file_name(from_file, to_file[:to]) do |file_name|
+      FFMpegCommand << file_name
+    end
   end
   
   #
@@ -56,7 +60,7 @@ module FFMpeg
   end
 
   #
-  # Ru§ns ffmpeg
+  # Runs ffmpeg
   #
   def run
     @@ffmpeg_path ||= locate_ffmpeg
@@ -70,6 +74,15 @@ module FFMpeg
   
   private
   
+  def build_output_file_name(from_file, to_file)
+    return if to_file.nil?
+    if FileExtensions::EXT.include?(to_file.to_s)
+      yield "#{from_file.delete(File.extname(from_file))}.#{to_file}"
+    else
+      yield "#{to_file}"
+    end
+  end
+
   #
   # Checks if the thread local varialble 'method checking disabled'
   # is true or false

data/spec/ffmpeg_spec.rb

@@ -17,6 +17,18 @@ describe "FFMpeg" do
     
     FFMpegCommand.command("ffmpeg").should eql("ffmpeg -i #{@from_file} #{@to_file}")
   end
+
+  it "should generate a valid command when fed only an extensions as :to" do
+    convert @from_file, :to => :mp4
+
+    FFMpegCommand.command("ffmpeg").should eql("ffmpeg -i #{@from_file} #{@from_file.delete(File.extname(@from_file))}.mp4")
+  end
+
+  it "should generate a valid command without specifying :to" do
+    convert @from_file
+
+    FFMpegCommand.command("ffmpeg").should eql("ffmpeg -i #{@from_file}")
+  end
 end
 
 describe "FFMpeg Main Options" do
@@ -144,4 +156,4 @@ describe "FFMpeg Main Options" do
     
     FFMpegCommand.command("ffmpeg").should eql("ffmpeg -i #{@from_file} -scodec copy #{@to_file}")
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: polly-ffmpeg
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Patrik Hedman
@@ -13,7 +13,7 @@ date: 2009-07-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
-description: Need to write one
+description: A DSL for building and executing ffmpeg commands
 email: patrik@moresale.se
 executables: []
 
@@ -21,10 +21,10 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.textile
 files: 
 - LICENSE
-- README.rdoc
+- README.textile
 - Rakefile
 - ffmpeg.gemspec
 - lib/ffmpeg.rb

data/README.rdoc

@@ -1,46 +0,0 @@
-= FFMpeg
-
-  A DSL for building and executing ffmpeg commands.
-
-== Requirements
-
-  It requires that you already have ffmpeg installed, obviously :)
-
-== Install
-
-  gem install polly-ffmpeg --source http://gems.github.com
-
-== Usage
-	
-  To build and execute a command you would use the FFMpeg::convert method and then call the FFMpeg::run method like this:
-
-    include FFMpeg
-
-    convert "file.ext", :to => "new_file.ext" do
-      seek     "00:01:13"
-      duration "00:10:01"
-    end.run
-
-== Extending
-
-  FFMpeg takes a lot of options, I mean alot ;), so I haven't been able to add methods for wrapping them all yet.
-  Luckily it's really easy to add your own wrapper methods, just add them to the class that's including the FFMpeg module.
-  So if you wanted to add a method for say, setting the video quantizer scale blur for example, here's how you could do it:
-
-    def quantizer_scale_blur(blur)
-      FFMpegCommand << "-qblur #{blur}"
-    end
-
-  You would then call it inside the convert block just like any other method:
-
-    convert "file.ext", :to => "new_file.ext" do
-      quantizer_scale_blur "0.5"
-    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.
-
-== 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.