streamio-ffmpeg 0.4.3 → 0.5.0

data/CHANGELOG

@@ -1,8 +1,12 @@
-== 0.4.3 20010-04-06
+== 0.5.0 2010-04-28
+
+* Added logging capabilities 
+
+== 0.4.3 2010-04-06
 
 * Correctly identify invalid movies on latest ffmpeg build (r22811)
 
-== 0.4.2 20010-04-06
+== 0.4.2 2010-04-06
 
 * Escape the path to handle spaces in filenames and avoid CLI injection attacks (thanks J. Weir!)
 

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = %Q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
     gem.description = %Q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
     gem.email = "duztdruid@gmail.com"
-    gem.homepage = "http://github.com/dbackeus/streamio-ffmpeg"
+    gem.homepage = "http://github.com/streamio/streamio-ffmpeg"
     gem.authors = ["David Backeus"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
   end

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/lib/ffmpeg/transcoder.rb

@@ -19,15 +19,19 @@ module FFMPEG
     
     def run
       command = "ffmpeg -y -i '#{@movie.path}' #{@raw_options} '#{@output_file}'"
+      FFMPEG.logger.info("Running transcoding...\n#{command}")
+      output = ""
       last_output = nil
       Open3.popen3(command) do |stdin, stdout, stderr|
         stderr.each("r") do |line|
+          output << line
           if line =~ /time=(\d+.\d+)/
             time = $1.to_f
             progress = time / @movie.duration
             yield(progress) if block_given?
           end
           if line =~ /Unsupported codec/
+            FFMPEG.logger.error "Failed encoding...\nCommand\n#{command}\nOutput\n#{output}"
             raise "Failed encoding: #{line}"
           end
           last_output = line
@@ -35,9 +39,12 @@ module FFMPEG
       end
 
       if encoding_succeeded?
+        FFMPEG.logger.info "Transcoding of #{@movie.path} to #{@output_file} succeeded"
         yield(1.0) if block_given?
       else
-        raise "Failed encoding. Last output: #{last_output}. Errors: #{@errors.join(", ")}"
+        errors = @errors.empty? ? "" : "Errors: #{@errors.join(", ")}"
+        FFMPEG.logger.error "Failed encoding...\n#{command}\n\n#{output}\n#{errors}"
+        raise "Failed encoding. Last output: #{last_output}. #{errors}"
       end
       
       encoded

data/lib/streamio-ffmpeg.rb

@@ -1,9 +1,30 @@
 $LOAD_PATH.unshift File.dirname(__FILE__)
 
+require 'logger'
+
 require 'ffmpeg/movie'
 require 'ffmpeg/transcoder'
 require 'ffmpeg/encoding_options'
  
 module FFMPEG
-  VERSION = '0.4.3'
-end
+  VERSION = '0.5.0'
+  
+  # FFMPEG logs information about its progress when it's transcoding.
+  # Jack in your own logger through this method if you wish to.
+  #
+  # @param [Logger] log your own logger
+  # @return [Logger] the logger you set
+  def self.logger=(log)
+    @logger = log
+  end
+  
+  # Get FFMPEG logger.
+  #
+  # @return [Logger]
+  def self.logger
+    return @logger if @logger
+    logger = Logger.new(STDOUT)
+    logger.level = Logger::INFO
+    @logger = logger
+  end
+end

data/spec/ffmpeg/transcoder_spec.rb

@@ -26,6 +26,10 @@ module FFMPEG
     end
     
     describe "transcoding" do
+      before(:each) do
+        FFMPEG.logger.should_receive(:info).at_least(:once)
+      end
+      
       it "should transcode the movie with progress given an awesome movie" do
         FileUtils.rm_f "#{tmp_path}/awesome.flv"
         
@@ -67,6 +71,7 @@ module FFMPEG
       end
       
       it "should fail when given an invalid movie" do
+        FFMPEG.logger.should_receive(:error)
         movie = Movie.new(__FILE__)
         transcoder = Transcoder.new(movie, "#{tmp_path}/fail.flv")
         lambda { transcoder.run }.should raise_error(RuntimeError, /no output file created/)

data/spec/spec_helper.rb

@@ -5,8 +5,9 @@ require 'spec'
 require 'spec/autorun'
 require 'fileutils'
 
+FFMPEG.logger = Logger.new(nil)
+
 Spec::Runner.configure do |config|
-  
 end
 
 def fixture_path
@@ -17,4 +18,4 @@ def tmp_path
   @tmp_path ||= File.join(File.dirname(__FILE__), "..", "tmp")
 end
 
-FileUtils.mkdir_p tmp_path
+FileUtils.mkdir_p tmp_path

data/spec/stremio-ffmpeg_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe FFMPEG do
+  describe "logger" do
+    after(:each) do
+      FFMPEG.logger = Logger.new(nil)
+    end
+    
+    it "should be a Logger" do
+      FFMPEG.logger.should be_instance_of(Logger)
+    end
+    
+    it "should be at info level" do
+      FFMPEG.logger = nil # Reset the logger so that we get the default
+      FFMPEG.logger.level.should == Logger::INFO
+    end
+    
+    it "should be assignable" do
+      new_logger = Logger.new(STDOUT)
+      FFMPEG.logger = new_logger
+      FFMPEG.logger.should == new_logger
+    end
+  end
+end

data/streamio-ffmpeg.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{streamio-ffmpeg}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Backeus"]
-  s.date = %q{2010-04-06}
+  s.date = %q{2010-04-28}
   s.description = %q{Simple wrapper around ffmpeg to get metadata from movies and do transcoding}
   s.email = %q{duztdruid@gmail.com}
   s.extra_rdoc_files = [
@@ -34,9 +34,10 @@ Gem::Specification.new do |s|
      "spec/fixtures/movies/awesome movie.mov",
      "spec/spec.opts",
      "spec/spec_helper.rb",
+     "spec/stremio-ffmpeg_spec.rb",
      "streamio-ffmpeg.gemspec"
   ]
-  s.homepage = %q{http://github.com/dbackeus/streamio-ffmpeg}
+  s.homepage = %q{http://github.com/streamio/streamio-ffmpeg}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
@@ -45,7 +46,8 @@ Gem::Specification.new do |s|
     "spec/ffmpeg/encoding_options_spec.rb",
      "spec/ffmpeg/movie_spec.rb",
      "spec/ffmpeg/transcoder_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "spec/stremio-ffmpeg_spec.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - David Backeus
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-06 00:00:00 +02:00
+date: 2010-04-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,9 +58,10 @@ files:
 - spec/fixtures/movies/awesome movie.mov
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/stremio-ffmpeg_spec.rb
 - streamio-ffmpeg.gemspec
 has_rdoc: true
-homepage: http://github.com/dbackeus/streamio-ffmpeg
+homepage: http://github.com/streamio/streamio-ffmpeg
 licenses: []
 
 post_install_message: 
@@ -94,3 +95,4 @@ test_files:
 - spec/ffmpeg/movie_spec.rb
 - spec/ffmpeg/transcoder_spec.rb
 - spec/spec_helper.rb
+- spec/stremio-ffmpeg_spec.rb