carrierwave-video 0.2.0 → 0.2.1

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.rdoc

@@ -1,7 +1,8 @@
 = CarrierWave Video Converter
 
+{<img src="https://secure.travis-ci.org/rheaton/carrierwave-video.png?branch=master" alt="Build Status" />}[http://travis-ci.org/rheaton/carrierwave-video]
+
 This gem adds a video converter using ffmpeg and the streamio-ffmpeg rubygem.
-Note: for watermarking to work, there a fork of the streamio-ffmpeg gem that must be used.
 
 = Installation
 
@@ -16,7 +17,7 @@ Using bundler:
     class VideoUploader < CarrierWave::Uploader::Base
       include CarrierWave::VideoConverter
 
-      process encode_video: [:mp4, after_transcode: :set_success ]
+      process encode_video: [:mp4, callbacks: { after_transcode: :set_success } ]
     end
 
     class Video

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  # Put spec opts in a file named .rspec in root
+end

data/carrierwave-video.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
   s.add_development_dependency "rspec"
+  s.add_development_dependency "rake"
 
-  s.add_runtime_dependency 'streamio-ffmpeg'#, :git => 'git://github.com/stakach/streamio-ffmpeg.git'
+  s.add_runtime_dependency 'streamio-ffmpeg'
   s.add_runtime_dependency 'carrierwave'
   s.requirements << 'ruby, version 1.9 or greater'
   s.requirements << 'ffmpeg, version 0.10 or greater with libx256, libfaac, libtheora, libvorbid, libvpx enabled'

data/lib/carrierwave-video/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Video
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/lib/carrierwave/video.rb

@@ -45,7 +45,7 @@ module CarrierWave
             end
           end
 
-          raise CarrierWave::ProcessingError.new("Failed to transcode with FFmpeg. Check ffmpeg imstall and verify video is not corrupt or cut short. Original error: #{e}")
+          raise CarrierWave::ProcessingError.new("Failed to transcode with FFmpeg. Check ffmpeg install and verify video is not corrupt or cut short. Original error: #{e}")
         ensure
           reset_logger
           send_callback(callbacks[:ensure])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: carrierwave-video
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-12 00:00:00.000000000 Z
+date: 2012-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70360829717480 !ruby/object:Gem::Requirement
+  requirement: &70099877315660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70360829717480
+  version_requirements: *70099877315660
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70099877314880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70099877314880
 - !ruby/object:Gem::Dependency
   name: streamio-ffmpeg
-  requirement: &70360829716900 !ruby/object:Gem::Requirement
+  requirement: &70099877313960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70360829716900
+  version_requirements: *70099877313960
 - !ruby/object:Gem::Dependency
   name: carrierwave
-  requirement: &70360829716180 !ruby/object:Gem::Requirement
+  requirement: &70099877312940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70360829716180
+  version_requirements: *70099877312940
 description: Transcodes to html5-friendly videos.
 email:
 - rachelmheaton@gmail.com
@@ -52,6 +63,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - README.rdoc
 - Rakefile