ffsplitter 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee4772b49ecaa9deb93540af0873470e56b95693
-  data.tar.gz: c644abe550b1e941b8b4508c1ffae21cfe823e63
+  metadata.gz: 6fb73758a42682d9201bd6caf2162ededcabcd8c
+  data.tar.gz: 65ce4c8b8095c4b2b0eb2bf92e6ccfeb40d862ff
 SHA512:
-  metadata.gz: cb614a070fed6e3fc482f0af492d973b19b57ad0ef260d4f7017b5fae75451eb692ab55043ebd268de401d013f0380b937b1ab48874d62272c6807e6e72a460c
-  data.tar.gz: e4b4db244fd584642041470eb250c0dbc56456d6bd7bcb73120d0d570d1291a68cce7ef2bb29e16560b4a5934cf85c852fbe750a3c0a26949790ef39f896ba2f
+  metadata.gz: b9da2d2e7b5e9d3aa745e2a749b353ffb87ab599e6bba2245f4254126acf0c88b2a1fb67c0651af3e8230f24364e01d6e165e4136e5913bc17c6f179674b7f16
+  data.tar.gz: 6db5c5acb233d025be1508ecd4b0c5492430f013827052e5694c3268416826b0b71fce29cf9f37a560981fbbb21acea50c82441cdabe569925114999a2e3e698

data/.rspec

@@ -0,0 +1 @@
+--color

data/README.md

@@ -9,10 +9,18 @@
 
 `ffsplitter my-video.mp4`
 
-or 
+or
 
 `ffsplitter my-video.mp4 output-directory/`
 
+Output files will use the same extension as the input file. For custom output
+extensions, pass the -e option
+
+`ffsplitter my-video.mp4 -e .aac`
+
+This will produce audio-only .aac files for each chapter. NOTE: codecs are copied
+from the source file, so you must use an compatible extension
+
 ## Testing
 
 `bundle exec rspec`

data/lib/ffsplitter/args_parser.rb

@@ -0,0 +1,28 @@
+require 'optparse'
+require 'ostruct'
+
+class ArgsParser
+  DEFAULT_OPTIONS = {
+    audio_only: false
+  }
+
+  def self.parse!(args)
+    options = OpenStruct.new(DEFAULT_OPTIONS)
+    options.filename = args[0]
+
+    parser = OptionParser.new do |opts|
+      opts.banner = "Usage: ffsplitter test.mp4 [options]"
+
+      opts.on("-e", "--output-extension EXTENSION", "Output extension") do |ext|
+        options.output_extension = ext
+      end
+
+      opts.on("-o", "--output-path PATH", "Output path") do |dir|
+        options.output_path = File.expand_path(dir)
+      end
+    end
+
+    parser.parse!(args)
+    options
+  end
+end

data/lib/ffsplitter/ffmpeg.rb

@@ -1,11 +1,12 @@
 module FFSplitter
   class FFMpeg
     CODEC_OPTIONS= "-c copy -movflags faststart"
-    attr_accessor :filename, :output_directory, :runner
+    attr_accessor :filename, :output_path, :runner, :output_extension
 
-    def initialize(filename, output_directory=nil)
-      @filename = filename
-      @output_directory = output_directory
+    def initialize(options)
+      @filename         = options[:filename]
+      @output_path      = options[:output_path]
+      @output_extension = options[:output_extension] || File.extname(@filename)
       @runner = CommandRunner
     end
 
@@ -19,8 +20,8 @@ module FFSplitter
     end
 
     def chapter_command(chapter)
-      output_file = File.expand_path(chapter.filename, output_directory)
-      "ffmpeg -ss #{chapter.start_time} -i '#{filename}' -t #{chapter.duration} #{CODEC_OPTIONS} '#{output_file}.mp4'"
+      output_file = File.expand_path(chapter.filename, output_path)
+      "ffmpeg -ss #{chapter.start_time} -i '#{filename}' -t #{chapter.duration} #{CODEC_OPTIONS} '#{output_file}#{output_extension}'"
     end
   end
 end

data/lib/ffsplitter/splitter.rb

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

data/lib/ffsplitter/version.rb

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

data/lib/ffsplitter.rb

@@ -1,4 +1,5 @@
 require "ffsplitter/version"
+require "ffsplitter/args_parser"
 require "ffsplitter/metadata_parser"
 require "ffsplitter/chapter"
 require "ffsplitter/chapter_list"
@@ -21,7 +22,8 @@ module FFSplitter
         puts "WTF mate?"
         exit(1)
       else
-        Splitter.split_via_ffmpeg(@argv[0], @argv[1])
+        options = ArgsParser.parse!(@argv)
+        Splitter.split_via_ffmpeg(options)
       end
     end
   end

data/spec/args_parser_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe ArgsParser do
+  let(:options) { ArgsParser.parse!(args) }
+
+  context "with an input file" do
+    let(:args) { ["test.mp4"] }
+    specify do
+      expect(options.filename).to eq("test.mp4")
+    end
+  end
+
+  describe "output_extension" do
+    let(:args) { ["-e", ".mp3"] }
+    specify do
+      expect(options.output_extension).to eq(".mp3")
+    end
+  end
+
+  describe "output_file" do
+    let(:args) { ["-o", "test/"] }
+    specify do
+      expect(options.output_path).to eq(File.expand_path("test/"))
+    end
+  end
+end

data/spec/end_to_end_spec.rb

@@ -5,15 +5,26 @@ module FFSplitter
     before { Dir.mkdir("tmp") unless Dir.exist?("tmp") }
 
     describe "split" do
-      before { `bundle exec ruby -Ilib bin/ffsplitter 'spec/fixtures/test video.mp4' tmp 2>&1` }
-      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")
+      context "with audio and video" do
+        before { `bundle exec ruby -Ilib bin/ffsplitter 'spec/fixtures/test video.mp4' -o tmp 2>&1` }
+        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
-    end
 
-    after { FileUtils.rm(file_list) }
+      context "with audio only" do
+        before { `bundle exec ruby -Ilib bin/ffsplitter 'spec/fixtures/test video.mp4' -e .aac -o tmp 2>&1` }
+        let(:file_list) { Dir.glob("tmp/*")  }
+        it "creates files" do
+          expect(file_list).to include("tmp/01 Chapter 1.aac")
+          expect(file_list).to include("tmp/02 - Chapter 2.aac")
+          expect(file_list).to include("tmp/03 Chapter 3.aac")
+        end
+      end
+      after { FileUtils.rm(file_list) }
+    end
   end
-end
+end

data/spec/ffmpeg_spec.rb

@@ -2,13 +2,12 @@ require 'spec_helper'
 
 module FFSplitter
   describe FFMpeg do
-    let(:filename) { "test.mp4" }
-    let(:output_directory) { nil }
-    let(:ffmpeg){ FFMpeg.new(filename, output_directory) }
+    let(:ffmpeg){ FFMpeg.new(options) }
     let(:runner) { double("runner") }
     before { ffmpeg.runner = runner }
 
     describe "#encode" do
+      let(:options) { {filename: "test.mp4"} }
       let(:chapter_list) { ChapterList.new }
       let(:chapter1) { Chapter.new(title: "Chapter 1") }
       let(:chapter2) { Chapter.new(title: "Chapter 2") }
@@ -35,22 +34,22 @@ module FFSplitter
     end
 
     describe "#chapter_command" do
-      let(:command) { ffmpeg.chapter_command(chapter) }
       let(:chapter) { Chapter.new(start_frames: 10, end_frames: 30, timebase: 1, title: "test title") }
-
+      let(:command) { ffmpeg.chapter_command(chapter) }
       context "without an output directory" do
-        let(:output_directory) { nil }
+        let(:options) { {filename: "test.mp4", output_extension: ".m4v"} }
         it "creates a chapter command" do
           expect(command).to match("-ss #{chapter.start_time}")
-          expect(command).to match("-i '#{filename}'")
+          expect(command).to match("-i 'test.mp4'")
           expect(command).to match("-t #{chapter.duration}")
+          expect(command).to match("test title.m4v")
           expect(command).to match(FFSplitter::FFMpeg::CODEC_OPTIONS)
           expect(command).to match("#{File.expand_path(chapter.filename)}")
         end
       end
 
       context "with an output directory" do
-        let(:output_directory) { "test_dir" }
+        let(:options) { {filename: "test.mp4", output_path: File.expand_path("test_dir/")} }
         it "creates returns the path to that directory" do
           expect(command).to match("#{File.expand_path(chapter.filename, "test_dir")}")
         end
@@ -58,9 +57,10 @@ module FFSplitter
     end
 
     describe "#read_metadata" do
+      let(:options) { {filename: "test.mp4"} }
       it "reads the metadata" do
-        expect(runner).to receive(:run).with("ffmpeg -i 'test.mp4' -v quiet -f ffmetadata -")
-        ffmpeg.read_metadata
+        expect(runner).to receive(:run).with("ffmpeg -i 'test.mp4' -v quiet -f ffmetadata -").and_return "meta"
+        expect(ffmpeg.read_metadata).to eq("meta")
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffsplitter
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Kevin Rockwood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-02 00:00:00.000000000 Z
+date: 2014-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -75,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,6 +83,7 @@ files:
 - bin/ffsplitter
 - ffsplitter.gemspec
 - lib/ffsplitter.rb
+- lib/ffsplitter/args_parser.rb
 - lib/ffsplitter/chapter.rb
 - lib/ffsplitter/chapter_list.rb
 - lib/ffsplitter/command_runner.rb
@@ -89,6 +91,7 @@ files:
 - lib/ffsplitter/metadata_parser.rb
 - lib/ffsplitter/splitter.rb
 - lib/ffsplitter/version.rb
+- spec/args_parser_spec.rb
 - spec/chapter_list_spec.rb
 - spec/chapter_spec.rb
 - spec/end_to_end_spec.rb
@@ -123,6 +126,7 @@ signing_key:
 specification_version: 4
 summary: ffsplitter will split a video file by its chapters
 test_files:
+- spec/args_parser_spec.rb
 - spec/chapter_list_spec.rb
 - spec/chapter_spec.rb
 - spec/end_to_end_spec.rb