youpy-scissor 0.0.19 → 0.0.20

data/README.rdoc

@@ -18,12 +18,12 @@ supported file format:
 
 === Archive Installation
 
-	rake install
+ rake install
 
 === Gem Installation
 
-	gem sources -a http://gems.github.com/  
-	gem install youpy-scissor
+ gem sources -a http://gems.github.com/  
+ gem install youpy-scissor
 
 == Features/Problems
 
@@ -31,27 +31,30 @@ supported file format:
 
 == Synopsis
 
-	 foo = Scissor('foo.mp3')
-	 bar = Scissor('bar.wav')
+ foo = Scissor('foo.mp3')
+ bar = Scissor('bar.wav')
+  
+ # concat
+ foo + bar > 'foobar.mp3'
 
-	 # concat
-	 foo + bar > 'foobar.mp3'
+ # slice + concat
+ foo[10, 1] + bar[2, 3] > 'slicefoobar.mp3'
 
-	 # slice + concat
-	 foo[10, 1] + bar[2, 3] > 'slicefoobar.mp3'
+ # slice + concat + loop
+ (foo[10, 1] + bar[2, 3]) * 4 > 'slicefoobarloop.mp3'
 
-	 # slice + concat + loop
-	 (foo[10, 1] + bar[2, 3]) * 4 > 'slicefoobarloop.mp3'
+ # split
+ (Scissor('sequence.mp3') / 16).first.to_file('split.mp3')
 
-	 # split
-	 (Scissor('sequence.mp3') / 16).first.to_file('split.mp3')
+ # replace first 10 seconds with 30 seconds of silence
+ foo.replace(0, 10, Scissor.silence(30)).to_file('replace.mp3')
 
-	 # replace first 10 seconds with 30 seconds of silence
-	 foo.replace(0, 10, Scissor.silence(30)).to_file('replace.mp3')
+ # sequence + loop
+ seq = Scissor.sequence('x y  xyz', 0.2)
+ seq.apply(:x => foo, :y => Proc.new { bar }, :z => foo.reverse) * 4 > 'sequence.wav'
 
-	 # sequence + loop
-	 seq = Scissor.sequence('x y  xyz', 0.2)
-	 seq.apply(:x => foo, :y => Proc.new { bar }, :z => foo.reverse) * 4 > 'sequence.wav'
+ # mix
+ Scissor.mix([foo, bar], 'mix.mp3')
 
 == Copyright
 

data/Rakefile

@@ -17,7 +17,7 @@ DESCRIPTION       = "utility to chop sound files"
 RUBYFORGE_PROJECT = "scissor"
 HOMEPATH          = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
 BIN_FILES         = %w(  )
-VERS              = "0.0.19"
+VERS              = "0.0.20"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -87,7 +87,6 @@ task :uninstall => [:clean] do
   sh %{sudo gem uninstall #{NAME}}
 end
 
-
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'html'
   rdoc.options += RDOC_OPTS

data/lib/scissor.rb

@@ -1,26 +1,55 @@
+require 'scissor/loggable'
 require 'scissor/chunk'
 require 'scissor/fragment'
 require 'scissor/sound_file'
 require 'scissor/sequence'
+require 'scissor/writer'
 
 def Scissor(*args)
   Scissor::Chunk.new(*args)
 end
 
+require 'logger'
+
 module Scissor
-  def self.silence(duration)
-    Scissor(File.dirname(__FILE__) + '/../data/silence.mp3').
-      slice(0, 1).
-      fill(duration)
+  @logger = Logger.new(STDOUT)
+  @logger.level = Logger::INFO
+
+  class << self
+    attr_accessor :logger
   end
 
-  def self.sequence(*args)
-    Scissor::Sequence.new(*args)
+  def logger
+    self.class.logger
   end
 
-  def self.join(scissor_array)
-    scissor_array.inject(Scissor()) do |m, scissor|
-      m + scissor
+  class << self
+    def silence(duration)
+      Scissor(File.dirname(__FILE__) + '/../data/silence.mp3').
+        slice(0, 1).
+        fill(duration)
+    end
+
+    def sequence(*args)
+      Scissor::Sequence.new(*args)
+    end
+
+    def join(scissor_array)
+      scissor_array.inject(Scissor()) do |m, scissor|
+        m + scissor
+      end
+    end
+
+    def mix(scissor_array, filename, options = {})
+      writer = Scissor::Writer.new
+
+      scissor_array.each do |scissor|
+        writer.add_track(scissor.fragments)
+      end
+
+      writer.to_file(filename, options)
+
+      Scissor(filename)
     end
   end
 end

data/lib/scissor/chunk.rb

@@ -1,23 +1,11 @@
 require 'digest/md5'
 require 'pathname'
-require 'open4'
-require 'logger'
-require 'temp_dir'
 
 module Scissor
   class Chunk
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
-
-    class << self
-      attr_accessor :logger
-    end
-
     class Error < StandardError; end
-    class FileExists < Error; end
     class EmptyFragment < Error; end
     class OutOfDuration < Error; end
-    class CommandFailed < Error; end
 
     attr_reader :fragments
 
@@ -170,72 +158,10 @@ module Scissor
     end
 
     def to_file(filename, options = {})
-      filename = Pathname.new(filename)
-
-      if @fragments.empty?
-        raise EmptyFragment
-      end
-
-      which('ecasound')
-      which('ffmpeg')
-
-      options = {
-        :overwrite => false
-      }.merge(options)
-
-      filename = Pathname.new(filename)
-
-      if filename.exist?
-        if options[:overwrite]
-          filename.unlink
-        else
-          raise FileExists
-        end
-      end
-
-      position = 0.0
-
-      TempDir.create do |dir|
-        tmpdir = Pathname.new(dir)
-        tmpfile = tmpdir + 'tmp.wav'
-        cmd = %w/ecasound/
-
-        @fragments.each_with_index do |fragment, index|
-          fragment_filename = fragment.filename
-          fragment_duration = fragment.duration
-
-          if !index.zero? && (index % 80).zero?
-            run_command(cmd.join(' '))
-            cmd = %w/ecasound/
-          end
-
-          fragment_tmpfile =
-            fragment_filename.extname.downcase == '.wav' ? fragment_filename :
-            tmpdir + (Digest::MD5.hexdigest(fragment_filename) + '.wav')
+      writer = Writer.new
 
-          unless fragment_tmpfile.exist?
-            run_command("ffmpeg -i \"#{fragment_filename}\" \"#{fragment_tmpfile}\"")
-          end
-
-          cmd <<
-            "-a:#{index} " +
-            "-i:" +
-            (fragment.reversed? ? 'reverse,' : '') +
-            "select,#{fragment.start},#{fragment_duration},\"#{fragment_tmpfile}\" " +
-            "-o:#{tmpfile} " +
-            "-y:#{position}"
-
-          position += fragment_duration
-        end
-
-        run_command(cmd.join(' '))
-
-        if filename.extname == '.wav'
-          File.rename(tmpfile, filename)
-        else
-          run_command("ffmpeg -i \"#{tmpfile}\" \"#{filename}\"")
-        end
-      end
+      writer.add_track(@fragments)
+      writer.to_file(filename, options)
 
       self.class.new(filename)
     end
@@ -245,29 +171,5 @@ module Scissor
     def >>(filename)
       to_file(filename, :overwrite => true)
     end
-
-    def which(command)
-      run_command("which #{command}")
-    end
-
-    def run_command(cmd)
-      logger.debug("run_command: #{cmd}")
-
-      result = ''
-      status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
-        logger.debug(stderr.read)
-        result = stdout.read
-      end
-
-      if status.exitstatus != 0
-        raise CommandFailed.new(cmd)
-      end
-
-      return result
-    end
-
-    def logger
-      self.class.logger
-    end
   end
 end

data/lib/scissor/loggable.rb

@@ -0,0 +1,7 @@
+module Scissor
+  module Loggable
+    def logger
+      Scissor.logger
+    end
+  end
+end

data/lib/scissor/sequence.rb

@@ -6,9 +6,7 @@ module Scissor
     end
 
     def apply(instruments)
-      result = Scissor()
-
-      @pattern.split(//).each do |c|
+      @pattern.split(//).inject(Scissor()) do |result, c|
         if instruments.include?(c.to_sym)
           instrument = instruments[c.to_sym]
 
@@ -17,17 +15,16 @@ module Scissor
           end
 
           if @duration_per_step > instrument.duration
-            result += instrument
-            result += Scissor.silence(@duration_per_step - instrument.duration)
+            result += instrument + Scissor.silence(@duration_per_step - instrument.duration)
           else
             result += instrument.slice(0, @duration_per_step)
           end
         else
           result += Scissor.silence(@duration_per_step)
         end
-      end
 
-      result
+        result
+      end
     end
   end
 end

data/lib/scissor/writer.rb

@@ -0,0 +1,128 @@
+require 'open4'
+require 'temp_dir'
+
+module Scissor
+  class Writer
+    include Loggable
+
+    class Error < StandardError; end
+    class FileExists < Error; end
+    class EmptyFragment < Error; end
+    class CommandFailed < Error; end
+
+    def initialize
+      @tracks = []
+
+      which('ecasound')
+      which('ffmpeg')
+    end
+
+    def add_track(fragments)
+      @tracks << fragments
+    end
+
+    def fragments_to_file(fragments, outfile, tmpdir)
+      position = 0.0
+      cmd = %w/ecasound/
+
+      fragments.each_with_index do |fragment, index|
+        fragment_filename = fragment.filename
+        fragment_duration = fragment.duration
+
+        if !index.zero? && (index % 80).zero?
+          run_command(cmd.join(' '))
+          cmd = %w/ecasound/
+        end
+
+        fragment_outfile =
+          fragment_filename.extname.downcase == '.wav' ? fragment_filename :
+          tmpdir + (Digest::MD5.hexdigest(fragment_filename) + '.wav')
+
+        unless fragment_outfile.exist?
+          run_command("ffmpeg -i \"#{fragment_filename}\" \"#{fragment_outfile}\"")
+        end
+
+        cmd <<
+          "-a:#{index} " +
+          "-i:" +
+          (fragment.reversed? ? 'reverse,' : '') +
+          "select,#{fragment.start},#{fragment_duration},\"#{fragment_outfile}\" " +
+          "-o:#{outfile} " +
+          "-y:#{position}"
+
+        position += fragment_duration
+      end
+
+      run_command(cmd.join(' '))
+    end
+
+    def mix_files(filenames, outfile)
+      cmd = %w/ecasound/
+
+      filenames.each_with_index do |tf, index|
+        cmd << "-a:#{index} -i:#{tf}"
+      end
+
+      cmd << "-a:all -o:#{outfile}"
+      run_command(cmd.join(' '))
+    end
+
+    def to_file(filename, options)
+      filename = Pathname.new(filename)
+
+      if @tracks.flatten.empty?
+        raise EmptyFragment
+      end
+
+      options = {
+        :overwrite => false
+      }.merge(options)
+
+      if filename.exist?
+        if options[:overwrite]
+          filename.unlink
+        else
+          raise FileExists
+        end
+      end
+
+      TempDir.create do |dir|
+        tmpdir = Pathname.new(dir)
+        tmpfiles = []
+
+        @tracks.each_with_index do |fragments, track_index|
+          tmpfiles << tmpfile = tmpdir + 'track_%s.wav' % track_index.to_s
+          fragments_to_file(fragments, tmpfile, tmpdir)
+        end
+
+        mix_files(tmpfiles, final_tmpfile = tmpdir + 'tmp.wav')
+
+        if filename.extname == '.wav'
+          File.rename(final_tmpfile, filename)
+        else
+          run_command("ffmpeg -i \"#{final_tmpfile}\" \"#{filename}\"")
+        end
+      end
+    end
+
+    def which(command)
+      run_command("which #{command}")
+    end
+
+    def run_command(cmd)
+      logger.debug("run_command: #{cmd}")
+
+      result = ''
+      status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
+        logger.debug(stderr.read)
+        result = stdout.read
+      end
+
+      if status.exitstatus != 0
+        raise CommandFailed.new(cmd)
+      end
+
+      return result
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors: 
 - youpy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-04 00:00:00 -07:00
+date: 2009-07-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,8 +68,10 @@ files:
 - 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
 has_rdoc: true