videojoiner 0.0.2 → 0.0.3

data/.rspec

@@ -1 +1 @@
---color
+--color --format doc

data/README.rdoc

@@ -1,7 +1,7 @@
 = videojoiner
 
 A gem with methods for joining a set of video files into a single one.
-Uses FFMpeg for te video concatenation.
+Uses FFMpeg for video concatenation.
 
 == Contributing to videojoiner
  

data/Rakefile

@@ -15,7 +15,7 @@ require 'jeweler'
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "videojoiner"
-  gem.homepage = "https://projects.nosolosoftware.biz/mwengine/videojoiner"
+  gem.homepage = "https://github.com/rcpj/videojoiner"
   gem.license = "GPLv3"
   gem.summary = %Q{Gem to join sets of video files into a single video file using ffmpeg}
   gem.description = %Q{This gem contains modules to create a single video file using a set of videos as input, via ffmpeg concat demuxer.}

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/features/create_joined_video.feature

@@ -9,6 +9,7 @@ Feature: Join a set of videos into a single file
     And the video joiner job has finished
     Then there should be a valid video file
     And it should report all included videos as valid
+    And the destination video size should be correct
 
   Scenario: Create a joined video file from a set of invalid videos
     Given I have a set of invalid videos

data/features/step_definitions/join_steps.rb

@@ -8,7 +8,7 @@ end
 
 When /^I create the video joiner job with id "(.*?)"$/ do | id |
   @joiner_job = Videojoiner::FFMpeg::Joiner.new( id, @video_routes )
-  @joiner_job.create( { filename: "video_root/#{id}_#{Time.now.to_i}" } )
+@joiner_job.create( { filename: "video_root/#{id}_#{Time.now.to_i}" } )
 end
 
 When /^the video joiner job has finished$/ do
@@ -25,7 +25,7 @@ end
 
 Then /^it should report all included videos as valid$/ do
   job = Videojoiner::FFMpeg::Joiner.fetch( @joiner_job.id )
-  job.video_list.each_value{ |value| value.should == "valid" }
+  job.video_list.each_value{ |value| value[ :status ].should == "valid" }
 end
 
 Given /^I have a set of invalid videos$/ do
@@ -57,3 +57,8 @@ end
 Then /^it should report that the job deletion was unsucessful$/ do
   @status.should be_false
 end
+
+Then /^the destination video size should be correct$/ do
+  job = Videojoiner::FFMpeg::Joiner.fetch( @joiner_job.id )
+  job.size.should >= File.size?( job.output_file )
+end

data/lib/videojoiner/joiner.rb

@@ -11,8 +11,8 @@ module Videojoiner
       # @param video_sources [array] An array of video files
       def initialize( id, video_sources )
         @id = id
-        @video_list = self.class.probe_videos( video_sources )
         @output_file = ""
+        @video_list = self.class.probe_videos( video_sources )
         @process = Videojoiner::FFMpeg::JoinerProcess.new
         @process.log_path = "log/"
         # Path to a text file with the list of videos to be used for ffmpeg's concat demuxer
@@ -44,7 +44,7 @@ module Videojoiner
       # @return true if the job removal was sucessful
       # @return false otherwise
       def delete
-        if self.class.exist?( @id )
+        if self.class.exist?( @id ) 
           self.class.remove_job( @id )
           File.delete( "#{@config_file}" ) unless !File.exist?( "#{@config_file}" )
           File.delete( "#{@output_file}" ) unless !File.exist?( "#{@output_file}" )
@@ -61,39 +61,35 @@ module Videojoiner
         output.include?( "No more output streams to write to, finishing." ) && output.include?( "muxing overhead" ) 
       end
 
+      # Method that returns the total file size of the valid input videos
+      # @return the total file size
+      def size
+        total_size = 0
+        @video_list.each_value{ | element | total_size += element[ :size ] unless element[ :status ] == 'invalid' }
+        total_size
+      end
+
       class << self
 
         attr_accessor :config_path
 
-        # Check that the video sources passed has parameters are valid for the joining process
-        # @param video_sources [array] an array with the source videos
-        # @return a hash with the source videos and its validation status
-        def probe_videos( video_sources )
-          video_list = Hash.new
-
-          video_sources.each do |source|
-            inspector = RVideo::Inspector.new( :file => "#{source}" )
-            if ( inspector.valid? ) && ( inspector.duration > 0 )
-              video_list.store( source, 'valid' )
-            else
-              video_list.store( source, 'invalid' )
-            end
-          end
-          video_list
-        end
-
         # Check if the job list is empty
         # @return true if the list is empty
         # @return false otherwise
         def empty?
-          joiner_list.empty?
+          job_list.empty?
         end
 
         # Fetches a job from the job list by it ID
         # @param id [string] the job ID
         # @return the job with that ID
+        # @return false otherwise
         def fetch( id )
-          joiner_list.fetch( id ) unless empty?
+          begin
+            job_list.fetch( id ) unless empty?
+          rescue KeyError
+            false
+          end
         end
 
         # Check if a job exist in the job list
@@ -101,26 +97,51 @@ module Videojoiner
         # @return true if the job exist
         # @return false otherwise
         def exist?( id )
-          joiner_list.has_key?( id ) unless empty?
+          job_list.has_key?( id ) unless empty?
         end
 
         # Clears the job list
         def clear_list
-          joiner_list.clear unless empty?
+          job_list.clear unless empty?
         end
 
         # Adds a video joiner job to the job list
         # @param id [string] the job ID
         # @param joiner  [Videojoiner::FFMpeg::Joiner] the joiner job object
+        # @return false if the job exists already
         def add_job( id, joiner )
-          joiner_list.store( id, joiner )
+          if exist?( id )
+            false
+          else
+            job_list.store( id, joiner )
+          end
         end
 
         # Removes a video joiner job from the job list
         # @param id [string] the job ID
+        # @return false if the job don't exists
         def remove_job( id )
-          joiner_list.fetch( id ).process.stop unless joiner_list.fetch( id ).process.pid == nil
-          joiner_list.delete( id )
+          if exist?( id ) 
+            job_list.delete( id )
+          else
+            false
+          end
+        end
+
+        # Check that the video sources passed has parameters are valid for the joining process
+        # @param video_sources [array] an array with the source videos
+        # @return a hash with the source videos, its validation status and size
+        def probe_videos( video_sources )
+          output = Hash.new
+          video_sources.each do |source|
+            inspector = RVideo::Inspector.new( :file => "#{source}" ) unless !File.exist?( source )
+            if inspector && ( inspector.valid? ) && ( inspector.duration > 0 )
+              output.store( source, { status: 'valid', size: File.size( source ) } )
+            else
+              output.store( source, 'invalid' )
+            end
+          end
+          output
         end
 
         # Yields the current object to configure some required parameters
@@ -132,10 +153,10 @@ module Videojoiner
 
         # Return the joiner job list, or generate an empty list if it don't exist already
         # It requires the setting of the config_path parameter previously
-        def joiner_list
+        def job_list
           raise ConfigurationError, "Missing configuration: please check Joiner.config_path" unless configured?
           raise ConfigPathError, "Config path not exist" unless Dir.exist?( config_path )
-          @joiner_list ||= Hash.new
+          @job_list ||= Hash.new
         end
 
         # Return the configuration status of the object

data/spec/joiner_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Videojoiner::FFMpeg::Joiner do
+
+  before do
+    Videojoiner::FFMpeg::Joiner.configure do |c|
+      c.config_path = "/tmp/"
+    end
+    @joiner = Videojoiner::FFMpeg::Joiner.new( "test", [ "aaa.mp4", "bbb.mp4", "ccc.mp4" ] )
+    Videojoiner::FFMpeg::Joiner.add_job( "test", @joiner )
+  end
+
+  it "should return false when adding an existent joiner job" do
+    Videojoiner::FFMpeg::Joiner.add_job( "test", @joiner ).should be_false
+  end
+
+  it "should return false when deleting an unexistent joiner job" do
+    Videojoiner::FFMpeg::Joiner.remove_job( "unexistent_job" ).should be_false
+  end
+
+  it "should return false when fetching an unexistent joiner job" do
+    Videojoiner::FFMpeg::Joiner.fetch( "unexistent_job" ).should be_false
+  end
+end
+
+

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter 'lib/videojoiner/rvideo_patch.rb'
+end
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require 'rspec'
+require 'videojoiner'
+
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/videojoiner.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "videojoiner"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rafael Perez", "Luis Ciudad"]
-  s.date = "2013-01-24"
+  s.date = "2013-01-25"
   s.description = "This gem contains modules to create a single video file using a set of videos as input, via ffmpeg concat demuxer."
   s.email = ["rperez@nosolosoftware.biz", "lciudad@nosolosoftware.biz"]
   s.extra_rdoc_files = [
@@ -35,10 +35,12 @@ Gem::Specification.new do |s|
     "lib/videojoiner/joiner.rb",
     "lib/videojoiner/rvideo_patch.rb",
     "log/.gitkeep",
+    "spec/joiner_spec.rb",
+    "spec/spec_helper.rb",
     "video_root/.gitkeep",
     "videojoiner.gemspec"
   ]
-  s.homepage = "https://projects.nosolosoftware.biz/mwengine/videojoiner"
+  s.homepage = "https://github.com/rcpj/videojoiner"
   s.licenses = ["GPLv3"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.24"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: videojoiner
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: runnable
@@ -329,9 +329,11 @@ files:
 - lib/videojoiner/joiner.rb
 - lib/videojoiner/rvideo_patch.rb
 - log/.gitkeep
+- spec/joiner_spec.rb
+- spec/spec_helper.rb
 - video_root/.gitkeep
 - videojoiner.gemspec
-homepage: https://projects.nosolosoftware.biz/mwengine/videojoiner
+homepage: https://github.com/rcpj/videojoiner
 licenses:
 - GPLv3
 post_install_message: 
@@ -346,7 +348,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -128888713428271127
+      hash: -3929381644104050705
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: