ffsplitter 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9544a8a00210da89af516422706274002610c6eb
-  data.tar.gz: 4d0f063c8deb2fd37ca5c697743a644f073626ea
+  metadata.gz: 06995073fdeefca7864c22bde674d1e8875dc8f9
+  data.tar.gz: 183886a0825bcf850fb4507a691fa9466c742bf6
 SHA512:
-  metadata.gz: cbb8063f2907f1e776e7f95c09685e73f96642e216adb7a0247e964546fff7bc9e935e565d0795fc6e3c6bdfde7e10afa56db95eae197105eb947df8304d2cb1
-  data.tar.gz: a0192b0d962f4ae8aee208dacf7a719db6b2852d8ae870858164ea431775abad24ac2d98398493f60eeedb2d000bb3a352dd8157ab89a919f09c87820597f119
+  metadata.gz: 8e4da0bc89ff46aafe84820de193c9b778a82c89d2a2959ee7b31e45d20cef6170e8506a62d9236b1a598c2bd57b5701065e67dbc22f19fab5c7c5c836eb9a70
+  data.tar.gz: f07368ae40a95c886faa05f4283725b71d0518b36eb02da939383ab761f2b1ec4d87c39252372050a05823fd6d6c286a56658e30d293a68529313f87dcc5fd73

data/README.md

@@ -1,9 +1,8 @@
 # FFSplitter
 
-TODO: Write a gem description
-
 ## Installation
 
+    brew install ffmpeg
     gem install ffsplitter
 
 ## Usage

data/lib/ffsplitter/ffmpeg.rb

@@ -1,26 +1,25 @@
 module FFSplitter
   class FFMpeg
-    attr_accessor :filename, :runner
+    attr_accessor :filename, :output_directory, :runner
 
-    def initialize(filename)
-      self.filename = filename
-      self.runner = CommandRunner
+    def initialize(filename, output_directory=nil)
+      @filename = filename
+      @output_directory = output_directory
+      @runner = CommandRunner
     end
 
     def encode(chapters)
-      chapters.each do |chapter|
-        runner.run(chapter_command(chapter))
-      end
+      commands = chapters.collect { |c| chapter_command(c) }
+      runner.run("ffmpeg #{commands.join(" ")}")
     end
 
     def read_metadata
-      runner.run("ffmpeg -i #{filename} -v quiet -f ffmetadata -")
+      runner.run("ffmpeg -i '#{filename}' -v quiet -f ffmetadata -")
     end
 
-    private
-
     def chapter_command(chapter)
-      "ffmpeg -ss #{chapter.start_time} -i #{filename} -to #{chapter.end_time} -c copy '#{chapter.filename}.mp4'"
+      output_file = File.expand_path(chapter.filename, output_directory)
+      "-i '#{filename}' -ss #{chapter.start_time} -to #{chapter.end_time} -c copy -v error '#{output_file}.mp4'"
     end
   end
 end

data/lib/ffsplitter/splitter.rb

@@ -1,7 +1,7 @@
 module FFSplitter
   class Splitter
-    def self.split_via_ffmpeg(filename)
-      split(FFMpeg.new(filename))
+    def self.split_via_ffmpeg(filename, output_directory)
+      split(FFMpeg.new(filename, output_directory))
     end
 
     def self.split(codec)

data/lib/ffsplitter/version.rb

@@ -1,3 +1,3 @@
 module FFSplitter
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ffsplitter.rb

@@ -20,7 +20,7 @@ module FFSplitter
         puts "WTF mate?"
         exit(1)
       else
-        Splitter.split_via_ffmpeg(@argv[0])
+        Splitter.split_via_ffmpeg(@argv[0], @argv[1])
       end
     end
   end

data/spec/end_to_end_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+module FFSplitter
+  describe "End to end" do
+    before { Dir.mkdir("tmp") unless Dir.exist?("tmp") }
+
+    describe "split" do
+      before { `bundle exec ruby -Ilib bin/ffsplitter 'spec/fixtures/test video.mp4' tmp` }
+      let(:file_list) { Dir.glob("tmp/*")  }
+      it "creates files" do
+        expect(file_list).to include("tmp/01 Chapter 1.mp4")
+        expect(file_list).to include("tmp/02 - Chapter 2.mp4")
+        expect(file_list).to include("tmp/03 Chapter 3.mp4")
+      end
+    end
+
+    after { FileUtils.rm(file_list) }
+  end
+end

data/spec/ffmpeg_spec.rb

@@ -2,23 +2,65 @@ require 'spec_helper'
 
 module FFSplitter
   describe FFMpeg do
-    let(:ffmpeg){ FFMpeg.new("test.mp4") }
+    let(:filename) { "test.mp4" }
+    let(:output_directory) { nil }
+    let(:ffmpeg){ FFMpeg.new(filename, output_directory) }
     let(:runner) { double("runner") }
     before { ffmpeg.runner = runner }
 
     describe "#encode" do
       let(:chapter_list) { ChapterList.new }
-      let(:chapter) { Chapter.new(start_frames: 10, end_frames: 20, timebase: 1, title: "title") }
-      before { chapter_list.add(chapter) }
-      it "encodes the chapters" do
-        expect(runner).to receive(:run).with "ffmpeg -ss 10.0 -i test.mp4 -to 20.0 -c copy '01 title.mp4'"
-        ffmpeg.encode(chapter_list)
+      let(:chapter1) { Chapter.new(title: "Chapter 1") }
+      let(:chapter2) { Chapter.new(title: "Chapter 2") }
+
+      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)}")
+          ffmpeg.encode(chapter_list)
+        end
+      end
+
+      context "with multiple chapters" do
+        before do
+          chapter_list.add(chapter1)
+          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}")
+          ffmpeg.encode(chapter_list)
+        end
+      end
+    end
+
+    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") }
+
+      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("-v error")
+          expect(command).to match("#{File.expand_path(chapter.filename)}")
+        end
+      end
+
+      context "with an output directory" do
+        let(:output_directory) { "test_dir" }
+        it "creates returns the path to that directory" do
+          expect(command).to match("#{File.expand_path(chapter.filename, "test_dir")}")
+        end
       end
     end
 
     describe "#read_metadata" do
       it "reads the metadata" do
-        expect(runner).to receive(:run).with("ffmpeg -i test.mp4 -v quiet -f ffmetadata -")
+        expect(runner).to receive(:run).with("ffmpeg -i 'test.mp4' -v quiet -f ffmetadata -")
         ffmpeg.read_metadata
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffsplitter
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Kevin Rockwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -89,8 +89,10 @@ files:
 - lib/ffsplitter/splitter.rb
 - lib/ffsplitter/version.rb
 - spec/chapter_spec.rb
+- spec/end_to_end_spec.rb
 - spec/ffmpeg_spec.rb
 - spec/fixtures/metadata_fixtures.rb
+- spec/fixtures/test video.mp4
 - spec/metadata_parser_spec.rb
 - spec/spec_helper.rb
 - spec/splitter_spec.rb
@@ -120,8 +122,10 @@ specification_version: 4
 summary: ffsplitter will split a video file by its chapters
 test_files:
 - spec/chapter_spec.rb
+- spec/end_to_end_spec.rb
 - spec/ffmpeg_spec.rb
 - spec/fixtures/metadata_fixtures.rb
+- spec/fixtures/test video.mp4
 - spec/metadata_parser_spec.rb
 - spec/spec_helper.rb
 - spec/splitter_spec.rb