ffsplitter 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75ccb4a65d9a207ef81daa79288ea34b9826a404
-  data.tar.gz: f91bfe2e5ded7782bbe6ebe35655409ec8fc7aea
+  metadata.gz: ee4772b49ecaa9deb93540af0873470e56b95693
+  data.tar.gz: c644abe550b1e941b8b4508c1ffae21cfe823e63
 SHA512:
-  metadata.gz: 340c7b9e80b5e1e7de02a89d84ad1adaa4cb8b98fd1fea1b1bc1aceebdfafb95f2b5028b50ae8685287074268883defd63c68df99910850c57bd6c35d3f9857b
-  data.tar.gz: 980a74e9f398eee31e6fa8f696bb85a90ec9b41f37d851f6c520953367f60637c595c94103adb5aa0ca4558f46664ec83691a2b1312be00c492304f9f91f4b90
+  metadata.gz: cb614a070fed6e3fc482f0af492d973b19b57ad0ef260d4f7017b5fae75451eb692ab55043ebd268de401d013f0380b937b1ab48874d62272c6807e6e72a460c
+  data.tar.gz: e4b4db244fd584642041470eb250c0dbc56456d6bd7bcb73120d0d570d1291a68cce7ef2bb29e16560b4a5934cf85c852fbe750a3c0a26949790ef39f896ba2f

data/lib/ffsplitter.rb

@@ -1,6 +1,7 @@
 require "ffsplitter/version"
 require "ffsplitter/metadata_parser"
 require "ffsplitter/chapter"
+require "ffsplitter/chapter_list"
 require "ffsplitter/command_runner"
 require "ffsplitter/ffmpeg"
 require "ffsplitter/splitter"

data/lib/ffsplitter/chapter.rb

@@ -1,24 +1,6 @@
 require 'virtus'
 
 module FFSplitter
-  class ChapterList
-
-    include Enumerable
-
-    def initialize
-      @chapters = []
-    end
-
-    def each(&block)
-      @chapters.each { |c| yield c }
-    end
-
-    def add(chapter)
-      chapter.list = self
-      @chapters << chapter
-    end
-  end
-
   class Chapter
     include Virtus.model
 
@@ -37,6 +19,10 @@ module FFSplitter
       timebase * end_frames
     end
 
+    def duration
+      end_time - start_time
+    end
+
     def filename
       "#{track} #{title.gsub(/[';:\\]/, '').lstrip}"
     end
@@ -50,4 +36,4 @@ module FFSplitter
       (index + 1).to_s.rjust(2, '0')
     end
   end
-end
+end

data/lib/ffsplitter/chapter_list.rb

@@ -0,0 +1,19 @@
+module FFSplitter
+  class ChapterList
+
+    include Enumerable
+
+    def initialize
+      @chapters = []
+    end
+
+    def each(&block)
+      @chapters.each { |c| yield c }
+    end
+
+    def add(chapter)
+      chapter.list = self
+      @chapters << chapter
+    end
+  end
+end

data/lib/ffsplitter/ffmpeg.rb

@@ -1,5 +1,6 @@
 module FFSplitter
   class FFMpeg
+    CODEC_OPTIONS= "-c copy -movflags faststart"
     attr_accessor :filename, :output_directory, :runner
 
     def initialize(filename, output_directory=nil)
@@ -14,12 +15,12 @@ module FFSplitter
 
     def encode(chapters)
       commands = chapters.collect { |c| chapter_command(c) }
-      runner.run("ffmpeg #{commands.join(' ')}")
+      runner.run("#{commands.join(' && ')}")
     end
 
     def chapter_command(chapter)
       output_file = File.expand_path(chapter.filename, output_directory)
-      "-i '#{filename}' -ss #{chapter.start_time} -to #{chapter.end_time} -c copy -movflags faststart '#{output_file}.mp4'"
+      "ffmpeg -ss #{chapter.start_time} -i '#{filename}' -t #{chapter.duration} #{CODEC_OPTIONS} '#{output_file}.mp4'"
     end
   end
 end

data/lib/ffsplitter/version.rb

@@ -1,3 +1,3 @@
 module FFSplitter
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/chapter_list_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+module FFSplitter
+  describe ChapterList do
+    describe "#add" do
+      let(:chapter_list) { ChapterList.new }
+      let!(:chapter1) { Chapter.new(title: "Chapter One") }
+      let!(:chapter2) { Chapter.new(title: "Chapter Two") }
+      before do
+        chapter_list.add(chapter1)
+        chapter_list.add(chapter2)
+      end
+      it "adds chapters to its collection" do
+        expect(chapter_list.count).to eq(2)
+        expect(chapter_list).to include(chapter1)
+        expect(chapter_list).to include(chapter2)
+      end
+      it "sets the chapter's list" do
+        expect(chapter1.list).to eq(chapter_list)
+      end
+    end
+  end
+end

data/spec/chapter_spec.rb

@@ -1,26 +1,6 @@
 require 'spec_helper'
 
 module FFSplitter
-  describe ChapterList do
-    describe "#add" do
-      let(:chapter_list) { ChapterList.new }
-      let!(:chapter1) { Chapter.new(title: "Chapter One") }
-      let!(:chapter2) { Chapter.new(title: "Chapter Two") }
-      before do
-        chapter_list.add(chapter1)
-        chapter_list.add(chapter2)
-      end
-      it "adds chapters to its collection" do
-        expect(chapter_list.count).to eq(2)
-        expect(chapter_list).to include(chapter1)
-        expect(chapter_list).to include(chapter2)
-      end
-      it "sets the chapter's list" do
-        expect(chapter1.list).to eq(chapter_list)
-      end
-    end
-  end
-
   describe Chapter do
     describe "#start_time, #end_time" do
       let(:chapter){ Chapter.new(start_frames: 100, end_frames: 200, timebase: 0.5) }
@@ -65,5 +45,12 @@ module FFSplitter
         end
       end
     end
+
+    describe "#duration" do
+      let(:chapter){ Chapter.new(start_frames: 100, end_frames: 200, timebase: 0.5) }
+      it "is the difference of start and end times" do
+        expect(chapter.duration).to eq 50
+      end
+    end
   end
-end
+end

data/spec/ffmpeg_spec.rb

@@ -16,7 +16,7 @@ module FFSplitter
       context "with a single chapter" do
         before { chapter_list.add(chapter1) }
         it "encodes the chapter" do
-          expect(runner).to receive(:run).with("ffmpeg #{ffmpeg.chapter_command(chapter1)}")
+          expect(runner).to receive(:run).with("#{ffmpeg.chapter_command(chapter1)}")
           ffmpeg.encode(chapter_list)
         end
       end
@@ -27,8 +27,8 @@ module FFSplitter
           chapter_list.add(chapter2)
         end
         it "encodes the chapters with a single ffmpeg command" do
-          commands = "#{ffmpeg.chapter_command(chapter1)} #{ffmpeg.chapter_command(chapter2)}"
-          expect(runner).to receive(:run).once.with("ffmpeg #{commands}")
+          commands = "#{ffmpeg.chapter_command(chapter1)} && #{ffmpeg.chapter_command(chapter2)}"
+          expect(runner).to receive(:run).once.with("#{commands}")
           ffmpeg.encode(chapter_list)
         end
       end
@@ -36,16 +36,15 @@ module FFSplitter
 
     describe "#chapter_command" do
       let(:command) { ffmpeg.chapter_command(chapter) }
-      let(:chapter) { Chapter.new(start_frames: 10, end_frames: 20, timebase: 1, title: "test title") }
+      let(:chapter) { Chapter.new(start_frames: 10, end_frames: 30, timebase: 1, title: "test title") }
 
       context "without an output directory" do
         let(:output_directory) { nil }
         it "creates a chapter command" do
-          expect(command).to match("-i 'test.mp4'")
-          expect(command).to match("-ss 10.0")
-          expect(command).to match("-to 20.0")
-          expect(command).to match("-c copy")
-          expect(command).to match("-movflags faststart")
+          expect(command).to match("-ss #{chapter.start_time}")
+          expect(command).to match("-i '#{filename}'")
+          expect(command).to match("-t #{chapter.duration}")
+          expect(command).to match(FFSplitter::FFMpeg::CODEC_OPTIONS)
           expect(command).to match("#{File.expand_path(chapter.filename)}")
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffsplitter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Kevin Rockwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -83,11 +83,13 @@ files:
 - ffsplitter.gemspec
 - lib/ffsplitter.rb
 - lib/ffsplitter/chapter.rb
+- lib/ffsplitter/chapter_list.rb
 - lib/ffsplitter/command_runner.rb
 - lib/ffsplitter/ffmpeg.rb
 - lib/ffsplitter/metadata_parser.rb
 - lib/ffsplitter/splitter.rb
 - lib/ffsplitter/version.rb
+- spec/chapter_list_spec.rb
 - spec/chapter_spec.rb
 - spec/end_to_end_spec.rb
 - spec/ffmpeg_spec.rb
@@ -121,6 +123,7 @@ signing_key:
 specification_version: 4
 summary: ffsplitter will split a video file by its chapters
 test_files:
+- spec/chapter_list_spec.rb
 - spec/chapter_spec.rb
 - spec/end_to_end_spec.rb
 - spec/ffmpeg_spec.rb