scissor 0.2.9 → 0.3.0

data/.gitignore

@@ -0,0 +1,6 @@
+pkg
+coverage
+*.gem
+vendor/bundle
+.bundle
+Gemfile.lock

data/Gemfile

@@ -1,16 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'open4', '>= 1.3.0'
-gem 'ruby-mp3info'
-gem 'riff', '<= 0.3.0'
-gem 'tempdir'
-gem 'streamio-ffmpeg'
-
-group :development do
-  gem 'rspec', '~> 2.3.0'
-  gem 'bundler', '~> 1.0.0'
-  gem 'jeweler', '~> 1.6.4'
-  gem 'rcov', '>= 0'
-  gem 'rdoc'
-  gem 'fakeweb'
-end
+gemspec

data/Rakefile

@@ -1,28 +1,6 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
+#!/usr/bin/env rake
 require 'rake'
-
-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 = "scissor"
-  gem.summary = %Q{utility to chop sound files}
-  gem.description = %Q{utility to chop sound files}
-  gem.email = "youpy@buycheapviagraonlinenow.com"
-  gem.authors = ["youpy"]
-  gem.homepage = "http://github.com/youpy/scissor"
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
+require "bundler/gem_tasks"
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -30,19 +8,4 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
 task :default => :spec
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "scissor #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/lib/scissor.rb

@@ -17,7 +17,9 @@ require 'logger'
 
 module Scissor
   @logger = Logger.new(STDOUT)
-  @logger.level = Logger::INFO
+  @logger.level = Logger::WARN
+
+  FFMPEG.logger = @logger
 
   class << self
     attr_accessor :logger

data/lib/scissor/sound_file.rb

@@ -4,31 +4,66 @@ require 'riff/reader'
 
 module Scissor
   class SoundFile
-    SUPPORTED_FORMATS = %w/mp3 wav/
+    class Mp3 < SoundFile
+      def length
+        info.length
+      end
+
+      def mono?
+        info.channel_mode == 'Single Channel'
+      end
+
+      private
+
+      def info
+        @info ||= Mp3Info.new(@filename.to_s)
+      end
+    end
+
+    class Wav < SoundFile
+      def length
+        data.length / fmt.body.unpack('s2i2')[3].to_f
+      end
+
+      def mono?
+        fmt.body.unpack('s2')[1] == 1
+      end
+
+      private
+
+      def riff
+        @riff ||= Riff::Reader.open(@filename ,"r")
+      end
+
+      def data
+        @data ||= riff.root_chunk['data']
+      end
+
+      def fmt
+        @fmt ||= riff.root_chunk['fmt ']
+      end
+    end
+
+    SUPPORTED_FORMATS = {
+      :mp3 => Mp3,
+      :wav => Wav
+    }
 
     class Error < StandardError; end
     class UnknownFormat < Error; end
 
-    def initialize(filename)
-      @filename = Pathname.new(filename)
-      @ext = @filename.extname.sub(/^\./, '').downcase
+    def self.new_from_filename(filename)
+      ext = filename.extname.sub(/^\./, '').downcase
 
-      unless SUPPORTED_FORMATS.include?(@ext)
+      unless klass = SUPPORTED_FORMATS[ext.to_sym]
         raise UnknownFormat
       end
-    end
 
-    def length
-      case @ext
-      when 'mp3'
-        Mp3Info.new(@filename.to_s).length
-      when 'wav'
-        riff = Riff::Reader.open(@filename ,"r")
-        data = riff.root_chunk['data']
-        fmt = riff.root_chunk['fmt ']
+      klass.new(filename)
+    end
 
-        data.length / fmt.body.unpack('s2i2')[3].to_f
-      end
+    def initialize(filename)
+      @filename = Pathname.new(filename)
     end
   end
 end

data/lib/scissor/tape.rb

@@ -17,7 +17,7 @@ module Scissor
         @fragments << Fragment.new(
           filename,
           0,
-          SoundFile.new(filename).length)
+          SoundFile.new_from_filename(filename).length)
       end
     end
 

data/lib/scissor/writer.rb

@@ -28,10 +28,13 @@ module Scissor
     def join_fragments(fragments, outfile, tmpdir)
       position = 0.0
       cmd = %w/ecasound/
+      is_mono = {}
 
       fragments.each_with_index do |fragment, index|
         fragment_filename = fragment.filename
 
+        is_mono[fragment_filename] ||= mono?(fragment_filename)
+
         if !index.zero? && (index % 28).zero?
           run_command(cmd.join(' '))
           cmd = %w/ecasound/
@@ -44,7 +47,7 @@ module Scissor
           movie.transcode(fragment_outfile.to_s, :audio_sample_rate => 44100)
         end
 
-        cmd << "-a:#{index} -o:#{outfile} -y:#{position}"
+        cmd << "-a:#{index} -o:#{outfile} -y:#{position}#{is_mono[fragment_filename] ? ' -chcopy:1,2' : ''}"
 
         if fragment.stretched? && fragment.pitch.to_f != 100.0
           rubberband_out = tmpdir + (Digest::MD5.hexdigest(fragment_filename.to_s) + "rubberband_#{index}.wav")
@@ -147,5 +150,11 @@ module Scissor
 
       return result
     end
+
+    private
+
+    def mono?(filename)
+      SoundFile.new_from_filename(filename).mono?
+    end
   end
 end

data/scissor.gemspec

@@ -1,42 +1,26 @@
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{scissor}
-  s.version = "0.0.24"
+Gem::Specification.new do |gem|
+  gem.authors       = ["youpy"]
+  gem.email         = ["youpy@buycheapviagraonlinenow.com"]
+  gem.description   = %q{utility to chop sound files}
+  gem.summary       = %q{utility to chop sound files}
+  gem.homepage      = %q{http://github.com/youpy/scissor}
+  gem.homepage      = ""
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["youpy"]
-  s.date = %q{2010-04-28}
-  s.description = %q{utility to chop sound files}
-  s.email = %q{youpy@buycheapviagraonlinenow.com}
-  s.extra_rdoc_files = ["README.rdoc", "ChangeLog"]
-  s.files = ["README.rdoc", "ChangeLog", "Rakefile", "lib/scissor", "lib/scissor/chunk.rb", "lib/scissor/fragment.rb", "lib/scissor/loggable.rb", "lib/scissor/sequence.rb", "lib/scissor/sound_file.rb", "lib/scissor/writer.rb", "lib/scissor.rb", "data/silence.mp3"]
-  s.homepage = %q{http://github.com/youpy/scissor}
-  s.rdoc_options = ["--title", "scissor documentation", "--charset", "utf-8", "--opname", "index.html", "--line-numbers", "--main", "README.rdoc", "--inline-source", "--exclude", "^(examples|extras)/"]
-  s.require_paths = ["lib"]
-  s.rubyforge_project = %q{scissor}
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{utility to chop sound files}
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split("\n")
+  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  gem.name          = %q{scissor}
+  gem.require_paths = ["lib"]
+  gem.version       = "0.3.0"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<open4>, [">= 0"])
-      s.add_runtime_dependency(%q<ruby-mp3info>, [">= 0"])
-      s.add_runtime_dependency(%q<riff>, [">= 0"])
-      s.add_runtime_dependency(%q<tempdir>, [">= 0"])
-    else
-      s.add_dependency(%q<open4>, [">= 0"])
-      s.add_dependency(%q<ruby-mp3info>, [">= 0"])
-      s.add_dependency(%q<riff>, [">= 0"])
-      s.add_dependency(%q<tempdir>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<open4>, [">= 0"])
-    s.add_dependency(%q<ruby-mp3info>, [">= 0"])
-    s.add_dependency(%q<riff>, [">= 0"])
-    s.add_dependency(%q<tempdir>, [">= 0"])
-  end
+  gem.add_dependency('open4', '>= 1.3.0')
+  gem.add_dependency('ruby-mp3info')
+  gem.add_dependency('riff', '<= 0.3.0')
+  gem.add_dependency('tempdir')
+  gem.add_dependency('streamio-ffmpeg')
+  gem.add_development_dependency('rspec', ['~> 2.8.0'])
+  gem.add_development_dependency('rake')
+  gem.add_development_dependency('fakeweb')
 end

data/spec/scissor_spec.rb

@@ -8,8 +8,6 @@ include FileUtils
 
 describe Scissor do
   before do
-    FFMPEG.logger.level = Logger::WARN
-
     @mp3 = Scissor(fixture('sample.mp3'))
     mkdir '/tmp/scissor-test'
 
@@ -20,6 +18,12 @@ describe Scissor do
     rm_rf '/tmp/scissor-test'
   end
 
+  it "should set default logger level to Logger::WARN" do
+    [Scissor, FFMPEG].each do |mod|
+      mod.logger.level.should eql(Logger::WARN)
+    end
+  end
+
   it "should create from url" do
     url = 'http://example.com/sample_mp3'
     FakeWeb.register_uri(:get, url, :body => fixture('sample.mp3'), :content_type => 'audio/mpeg')

data/spec/sound_file_spec.rb

@@ -7,8 +7,8 @@ include FileUtils
 
 describe Scissor::SoundFile do
   before do
-    @mp3 = Scissor::SoundFile.new(fixture('sample.mp3'))
-    @wav = Scissor::SoundFile.new(fixture('sine.wav'))
+    @mp3 = Scissor::SoundFile.new_from_filename(fixture('sample.mp3'))
+    @wav = Scissor::SoundFile.new_from_filename(fixture('sine.wav'))
   end
 
   after do
@@ -16,7 +16,7 @@ describe Scissor::SoundFile do
 
   it "raise error if unknown file format" do
     lambda {
-      Scissor::SoundFile.new(fixture('foo.bar'))
+      Scissor::SoundFile.new_from_filename(fixture('foo.bar'))
     }.should raise_error(Scissor::SoundFile::UnknownFormat)
   end
 
@@ -24,4 +24,13 @@ describe Scissor::SoundFile do
     @mp3.length.should be_within(0.1).of(178.1)
     @wav.length.should eql(1.0)
   end
+
+  describe '#mono?' do
+    it "should return true if sound file is mono" do
+      @mp3.should be_mono
+      @wav.should_not be_mono
+
+      Scissor::SoundFile.new_from_filename(fixture('mono.wav')).should be_mono
+    end
+  end
 end

metadata

@@ -1,213 +1,115 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scissor
-version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 9
-  segments_generated: true
-  version: 0.2.9
+version: !ruby/object:Gem::Version
+  version: 0.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-19 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-06-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: open4
+  requirement: &70321600379940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        segments_generated: true
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
-  requirement: *id001
   type: :runtime
-  name: open4
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70321600379940
+- !ruby/object:Gem::Dependency
+  name: ruby-mp3info
+  requirement: &70321600379320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: ruby-mp3info
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70321600379320
+- !ruby/object:Gem::Dependency
+  name: riff
+  requirement: &70321600378660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <=
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        segments_generated: true
+      - !ruby/object:Gem::Version
         version: 0.3.0
-  requirement: *id003
   type: :runtime
-  name: riff
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70321600378660
+- !ruby/object:Gem::Dependency
+  name: tempdir
+  requirement: &70321600378140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: tempdir
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70321600378140
+- !ruby/object:Gem::Dependency
+  name: streamio-ffmpeg
+  requirement: &70321600221860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  name: streamio-ffmpeg
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 3
-        - 0
-        segments_generated: true
-        version: 2.3.0
-  requirement: *id006
-  type: :development
+  version_requirements: *70321600221860
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70321600220380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        segments_generated: true
-        version: 1.0.0
-  requirement: *id007
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-  name: bundler
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70321600220380
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70321600219080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 6
-        - 4
-        segments_generated: true
-        version: 1.6.4
-  requirement: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: jeweler
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id009
-  type: :development
-  name: rcov
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70321600219080
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70321600217900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id010
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rdoc
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id011
-  type: :development
-  name: fakeweb
   prerelease: false
+  version_requirements: *70321600217900
 description: utility to chop sound files
-email: youpy@buycheapviagraonlinenow.com
+email:
+- youpy@buycheapviagraonlinenow.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- ChangeLog
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
 - .rspec
 - ChangeLog
 - Gemfile
-- Gemfile.lock
 - README.rdoc
 - Rakefile
 - VERSION
@@ -222,6 +124,7 @@ files:
 - scissor.gemspec
 - spec/fixtures/about_mp3.txt
 - spec/fixtures/foo.bar
+- spec/fixtures/mono.wav
 - spec/fixtures/sample.mp3
 - spec/fixtures/sine.wav
 - spec/fragment_spec.rb
@@ -229,41 +132,44 @@ files:
 - spec/sequence_spec.rb
 - spec/sound_file_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
-homepage: http://github.com/youpy/scissor
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1882453864553140725
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
+      hash: 1882453864553140725
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: utility to chop sound files
-test_files: []
-
+test_files:
+- spec/fixtures/about_mp3.txt
+- spec/fixtures/foo.bar
+- spec/fixtures/mono.wav
+- spec/fixtures/sample.mp3
+- spec/fixtures/sine.wav
+- spec/fragment_spec.rb
+- spec/scissor_spec.rb
+- spec/sequence_spec.rb
+- spec/sound_file_spec.rb
+- spec/spec_helper.rb

data/Gemfile.lock

@@ -1,44 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    fakeweb (1.3.0)
-    git (1.2.5)
-    jeweler (1.6.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-    json (1.6.5)
-    open4 (1.3.0)
-    rake (0.9.2.2)
-    rcov (0.9.11)
-    rdoc (3.12)
-      json (~> 1.4)
-    riff (0.3)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    ruby-mp3info (0.6.16)
-    streamio-ffmpeg (0.8.4)
-    tempdir (0.0.1)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.0.0)
-  fakeweb
-  jeweler (~> 1.6.4)
-  open4 (>= 1.3.0)
-  rcov
-  rdoc
-  riff (<= 0.3.0)
-  rspec (~> 2.3.0)
-  ruby-mp3info
-  streamio-ffmpeg
-  tempdir