dragonfly-ffmpeg 0.0.4 → 0.1.0

data/.gitignore

@@ -5,5 +5,4 @@ Gemfile.lock
 pkg/*
 .rvmrc
 spec/spec.log
-.rspec
 spec/tmp/*

data/.rspec

@@ -0,0 +1,3 @@
+--drb
+--color
+--format Fuubar

data/Gemfile

@@ -1,4 +1,33 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in dragonfly-ffmpeg.gemspec
 gemspec
+
+group :development, :test do
+  platforms :ruby do
+    gem 'spork', '>= 0.9.0.rc9'
+    gem 'guard-spork'
+      
+    unless ENV['TRAVIS']
+      if RbConfig::CONFIG['target_os'] =~ /darwin/i
+        gem 'rb-fsevent', '>= 0.3.9'
+        gem 'growl',      '~> 1.0.3'
+      end
+      if RbConfig::CONFIG['target_os'] =~ /linux/i
+        gem 'rb-inotify', '>= 0.5.1'
+        gem 'libnotify',  '~> 0.1.3'
+      end
+    end
+  end
+
+  platforms :jruby do
+    unless ENV['TRAVIS']
+      if RbConfig::CONFIG['target_os'] =~ /darwin/i
+        gem 'growl',      '~> 1.0.3'
+      end
+      if RbConfig::CONFIG['target_os'] =~ /linux/i
+        gem 'rb-inotify', '>= 0.5.1'
+        gem 'libnotify',  '~> 0.1.3'
+      end
+    end
+  end
+end

data/Guardfile

@@ -0,0 +1,14 @@
+guard 'rspec', :version => 2, :cli => "--format Fuubar --color --drb --drb-port 9089" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+
+guard 'spork', :wait => 60, :cucumber => false, :rspec_env => { 'RAILS_ENV' => 'test' }, :rspec_port => 9089 do
+  watch('config/application.rb')
+  watch('config/environment.rb')
+  watch(%r{^config/environments/.+\.rb$})
+  watch(%r{^config/initializers/.+\.rb$})
+  watch('spec/spec_helper.rb')
+end

data/dragonfly-ffmpeg.gemspec

@@ -19,8 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency 'dragonfly', '>= 0.9'
-  s.add_dependency 'streamio-ffmpeg', '>= 0.8.0'
-  s.add_development_dependency 'rspec', '>= 2.6.0'
-  s.add_development_dependency 'ruby-debug19'
+  s.add_dependency 'dragonfly', '~> 0.9'
+  s.add_dependency 'streamio-ffmpeg', '~> 0.8.0'
+
+  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'guard-rspec', '~> 0.4.2'
+  s.add_development_dependency 'fuubar'
 end

data/lib/dragonfly-ffmpeg.rb

@@ -16,17 +16,18 @@
 # limitations under the License.
 #
 
+require 'dragonfly'
+require 'dragonfly-ffmpeg/errors'
+require 'streamio-ffmpeg'
+
 module EnMasse
   module Dragonfly
-    module FFMPEG
+    module FFMPEG      
+      autoload :Config, 'dragonfly-ffmpeg/config'
+      autoload :Analyser, 'dragonfly-ffmpeg/analyser'
+      autoload :Encoder, 'dragonfly-ffmpeg/encoder'
     end
   end
 end
 
-require 'dragonfly'
-require 'dragonfly-ffmpeg/errors'
-require 'dragonfly-ffmpeg/config'
-require 'dragonfly-ffmpeg/analyser'
-require 'dragonfly-ffmpeg/encoder'
-
 Dragonfly::App.register_configuration(:ffmpeg) { EnMasse::Dragonfly::FFMPEG::Config }

data/lib/dragonfly-ffmpeg/analyser.rb

@@ -24,6 +24,10 @@ module EnMasse
       class Analyser
         
         include ::Dragonfly::Loggable
+        
+        def ext(temp_object)
+          File.extname(temp_object.path)
+        end
       
         def frame_rate(temp_object)
           inspect(:frame_rate, temp_object)

data/lib/dragonfly-ffmpeg/encoder.rb

@@ -16,14 +16,13 @@
 # limitations under the License.
 #
 
-require 'streamio-ffmpeg'
 require 'pathname'
-require 'dragonfly-ffmpeg/encoder/profile'
 
 module EnMasse
   module Dragonfly
     module FFMPEG
       class Encoder
+        autoload :Profile, 'dragonfly-ffmpeg/encoder/profile'
         
         include ::Dragonfly::Configurable
         
@@ -69,6 +68,7 @@ module EnMasse
         
         def encode(temp_object, format, profile = :html5, options = {})
           format = format.to_sym
+          
           raise UnsupportedFormat, "Format not supported - #{format}" unless supported_format?(format)
           unless profile.is_a?(Profile)
             raise UnknownEncoderProfile unless profile_defined?(format, profile.to_sym)
@@ -78,15 +78,21 @@ module EnMasse
           options.merge!(profile.encoding_options)
           
           origin = ::FFMPEG::Movie.new(temp_object.path)
-          tempfile = new_tempfile(format)
-          transcoded = origin.transcode(tempfile.path, options)
-          ::Dragonfly::TempObject.new(File.new(transcoded.path))
+          tempfile = new_tempfile(format, File.basename(temp_object.path, '.*'))
+          transcoded_file = origin.transcode(tempfile.path, options)
+                    
+          [ 
+            ::Dragonfly::TempObject.new(File.new(transcoded_file.path)),
+            :name => File.basename(transcoded_file.path),
+            :format => format,
+            :ext => File.extname(transcoded_file.path)
+          ]
         end
                 
         private
         
-        def new_tempfile(ext = nil)
-          tempfile = ext ? Tempfile.new(["dragonfy-video", ".#{ext}"]) : Tempfile.new("dragonfly-video")
+        def new_tempfile(ext = nil, name = 'dragonfly-video')
+          tempfile = ext ? Tempfile.new(["#{name}-", ".#{ext}"]) : Tempfile.new("#{name}-")
           tempfile.binmode
           tempfile.close
           tempfile

data/lib/dragonfly-ffmpeg/version.rb

@@ -19,7 +19,7 @@
 module EnMasse
   module Dragonfly
     module FFMPEG
-      VERSION = "0.0.4"
+      VERSION = "0.1.0"
     end
   end
 end

data/spec/dragonfly-ffmpeg/analyser_spec.rb

@@ -27,6 +27,10 @@ describe EnMasse::Dragonfly::FFMPEG::Analyser do
     @analyser.log = Logger.new(LOG_FILE)
   end
   
+  it "should return the extension of the file" do
+    @analyser.ext(@video).should == '.mov'
+  end
+  
   it "should return the width" do 
     @analyser.v_width(@video).should == 1280
   end

data/spec/dragonfly-ffmpeg/encoder_spec.rb

@@ -20,46 +20,104 @@ require 'spec_helper'
 
 describe EnMasse::Dragonfly::FFMPEG::Encoder do
   
-  before(:all) do
-    video_path = SAMPLES_DIR + '/test-movie.mov'
-    @video = Dragonfly::TempObject.new(File.new(video_path))
-    @encoder = EnMasse::Dragonfly::FFMPEG::Encoder.new
-    @encoder.output_directory = TMP_DIR
+  subject do
+    encoder = EnMasse::Dragonfly::FFMPEG::Encoder.new
+    encoder.output_directory = TMP_DIR
+    encoder
   end
   
-  it "should encode the video using the default mp4 encoding profile" do
-    video = @encoder.encode(@video, :mp4)
-    video.should have_video_codec(:h264)
+  let(:raw_video) { Dragonfly::TempObject.new(File.new(SAMPLES_DIR + '/test-movie.mov')) }
+  
+  describe "encode with default mp4 profile" do
+    let(:video) { subject.encode(raw_video, :mp4).first }
+    
+    it "should have the h264 video codec" do
+      video.should have_video_codec(:h264)
+    end
+    
+    it "should have a mp4 file extension" do
+      video.should have_file_extension('.mp4')
+    end
   end
   
-  it "should encode the video using the default ogv encoding profile" do
-    video = @encoder.encode(@video, :ogv)
-    video.should have_video_codec(:theora)
+  describe "encode with default mp4 profile" do
+    let(:video) { subject.encode(raw_video, :ogv).first }
+
+    it "should have the theora video codec" do
+      video.should have_video_codec(:theora)
+    end
+    
+    it "should have the ogv file extension" do
+      video.should have_file_extension('.ogv')
+    end
   end
   
-  it "should encode the video using the default webm encoding profile" do
-    video = @encoder.encode(@video, :webm)
-    video.should have_video_codec(:libvpx)
+  describe "encode with default webm profile" do
+    let(:video) { subject.encode(raw_video, :webm).first }
+    
+    it "should have the libvpx video codec" do
+      video.should have_video_codec(:libvpx)
+    end
+    
+    it "should have the webm file extension" do
+      video.should have_file_extension('.webm')
+    end
   end
   
-  it "should encode the video using an encoding profile that is defined inline" do
-    profile = EnMasse::Dragonfly::FFMPEG::Encoder::Profile.new(:webm_720p,
-      :video_codec => "libvpx",
-      :resolution => "1280x720",
-      :frame_rate => 29.97,
-      :video_bitrate => 3072,
-      :audio_codec => "libvorbis",
-      :audio_channels => 2,
-      :audio_sample_rate => 48000,
-      :custom => "-f webm"
-    )
-    video = @encoder.encode(@video, :webm, profile)
-    video.should have_video_codec(:libvpx)
+  describe "encode with an inline defined encoding profile" do
+    let(:profile) do
+      EnMasse::Dragonfly::FFMPEG::Encoder::Profile.new(:webm_720p,
+        :video_codec => "libvpx",
+        :resolution => "1280x720",
+        :frame_rate => 29.97,
+        :video_bitrate => 3072,
+        :audio_codec => "libvorbis",
+        :audio_channels => 2,
+        :audio_sample_rate => 48000,
+        :custom => "-f webm"
+      )
+    end
+    
+    let(:video) { subject.encode(raw_video, :webm, profile).first }
+    
+    it "should have the specified video codec" do
+      video.should have_video_codec(profile.encoding_options[:video_codec])
+    end
+    
+    it "should have the specified resolution" do
+      video.should have_resolution(profile.encoding_options[:resolution])
+    end
+    
+    it "should have the specified frame rate" do
+      video.should have_frame_rate(profile.encoding_options[:frame_rate])
+    end
+    
+    it "should have the specified bitrate" do
+      video.should have_bitrate(profile.encoding_options[:video_bitrate])
+    end
+    
+    it "should have the specified audio codec" do
+      video.should have_audio_codec(profile.encoding_options[:audio_codec])
+    end
+    
+    it "should have the specified number of audio channels" do
+      video.should have_audio_channels(profile.encoding_options[:audio_channels])
+    end
+    
+    it "should have the specified audio sample rate" do
+      video.should have_audio_sample_rate(profile.encoding_options[:audio_sample_rate])
+    end
+  end
+  
+  it "should throw UnsupportedFormat if the format specified is not defined" do
+    lambda {
+      subject.encode(raw_video, :lol264, :html5)
+    }.should raise_error(EnMasse::Dragonfly::FFMPEG::UnsupportedFormat)
   end
   
   it "should throw UnknownEncoderProfile if the encoding profile is not defined" do
     lambda {
-      @encoder.encode(@video, :lol264, :h264_720p)
+      subject.encode(raw_video, :webm, :a_fake_profile)
     }.should raise_error(EnMasse::Dragonfly::FFMPEG::UnknownEncoderProfile)
   end
 

data/spec/spec_helper.rb

@@ -19,26 +19,33 @@
 require 'rubygems'
 require 'bundler'
 Bundler.setup(:default, :test)
+require 'spork'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rspec'
-require 'dragonfly-ffmpeg'
-require 'support/video_matchers'
+Spork.prefork do
+  $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+  $LOAD_PATH.unshift(File.dirname(__FILE__))
+  require 'rspec'
+  require 'dragonfly-ffmpeg'
+  require 'support/video_matchers'
 
-SAMPLES_DIR = File.expand_path(File.dirname(__FILE__) + '/../samples') unless defined?(SAMPLES_DIR)
+  SAMPLES_DIR = File.expand_path(File.dirname(__FILE__) + '/../samples') unless defined?(SAMPLES_DIR)
 
-require 'logger'
-LOG_FILE = File.dirname(__FILE__) + '/spec.log' unless defined?(LOG_FILE)
-TMP_DIR = File.dirname(__FILE__) + '/tmp' unless defined?(TMP_DIR)
-FileUtils.mkdir_p(TMP_DIR)
-FileUtils.rm_rf Dir.glob(TMP_DIR + '/*')
-FileUtils.rm_rf(LOG_FILE)
+  require 'logger'
+  LOG_FILE = File.dirname(__FILE__) + '/spec.log' unless defined?(LOG_FILE)
+  TMP_DIR = File.dirname(__FILE__) + '/tmp' unless defined?(TMP_DIR)
+  FileUtils.mkdir_p(TMP_DIR)
+  FileUtils.rm_rf Dir.glob(TMP_DIR + '/*')
+  FileUtils.rm_rf(LOG_FILE)
 
-logger = Logger.new(LOG_FILE)
-logger.level = Logger::INFO
-FFMPEG.logger = logger
+  logger = Logger.new(LOG_FILE)
+  logger.level = Logger::INFO
+  FFMPEG.logger = logger
+  
+  def test_app
+    Dragonfly::App.send(:new)
+  end
+end
 
-def test_app
-  Dragonfly::App.send(:new)
+Spork.each_run do
+  # code for each spork run
 end

data/spec/support/video_matchers.rb

@@ -22,3 +22,52 @@ RSpec::Matchers.define :have_video_codec do |v_codec|
     analyser.video_codec(given) == v_codec.to_s
   end
 end
+
+RSpec::Matchers.define :have_resolution do |resolution|
+  match do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    analyser.resolution(given) == resolution.to_s
+  end
+end
+
+RSpec::Matchers.define :have_frame_rate do |frame_rate|
+  match do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    analyser.frame_rate(given) == frame_rate.to_s
+  end
+end
+
+RSpec::Matchers.define :have_bitrate do |bitrate|
+  match do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    analyser.bitrate(given) == bitrate.to_s
+  end
+end
+
+RSpec::Matchers.define :have_audio_codec do |audio_codec|
+  match do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    analyser.audio_codec(given) == audio_codec.to_s
+  end
+end
+
+RSpec::Matchers.define :have_audio_channels do |audio_channels|
+  match do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    analyser.audio_channels(given) == audio_channels.to_s
+  end
+end
+
+RSpec::Matchers.define :have_audio_sample_rate do |audio_sample_rate|
+  match do |given|
+    analyser = EnMasse::Dragonfly::FFMPEG::Analyser.new
+    analyser.audio_sample_rate(given) == audio_sample_rate.to_s
+  end
+end
+
+RSpec::Matchers.define :have_file_extension do |file_extension|
+  match do |given|
+    File.extname(given.path) == file_extension
+  end
+end
+

metadata

@@ -1,74 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dragonfly-ffmpeg
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-14 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dragonfly
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70265767650100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: streamio-ffmpeg
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70265767650100
+- !ruby/object:Gem::Dependency
+  name: streamio-ffmpeg
+  requirement: &70265767649420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.8.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70265767649420
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70265767648120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70265767648120
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &70265767647660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.2
   type: :development
-  version_requirements: *id004
-description: FFMPEG libraries for processesing, encoding, analysing and generating videos with Dragonfly
-email: 
+  prerelease: false
+  version_requirements: *70265767647660
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: &70265767647280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70265767647280
+description: FFMPEG libraries for processesing, encoding, analysing and generating
+  videos with Dragonfly
+email:
 - jamie@enmasse.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rspec
 - Gemfile
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -85,35 +94,31 @@ files:
 - spec/dragonfly-ffmpeg/encoder_spec.rb
 - spec/spec_helper.rb
 - spec/support/video_matchers.rb
-has_rdoc: true
 homepage: https://github.com/enmasse-entertainment/dragonfly-ffmpeg
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: dragonfly-ffmpeg
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A video manipulation plugin for Dragonfly
-test_files: 
+test_files:
 - spec/dragonfly-ffmpeg/analyser_spec.rb
 - spec/dragonfly-ffmpeg/encoder_spec.rb
 - spec/spec_helper.rb