youpy-scissor 0.0.14 → 0.0.15

data/README.rdoc

@@ -30,8 +30,8 @@ supported file format:
 
 == Synopsis
 
-	 foo = Scissor.new('foo.mp3')
-	 bar = Scissor.new('bar.wav')
+	 foo = Scissor('foo.mp3')
+	 bar = Scissor('bar.wav')
 
 	 # concat
 	 foo + bar > 'foobar.mp3'

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.14"
+VERS              = "0.0.15"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/scissor/chunk.rb

@@ -0,0 +1,267 @@
+require 'digest/md5'
+require 'pathname'
+require 'open4'
+require 'logger'
+
+module Scissor
+  class Chunk
+    class Error < StandardError; end
+    class FileExists < Error; end
+    class EmptyFragment < Error; end
+    class OutOfDuration < Error; end
+    class CommandFailed < Error; end
+
+    attr_reader :fragments
+    attr_accessor :logger
+
+    def initialize(filename = nil)
+      @fragments = []
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+
+      if filename
+        @fragments << Fragment.new(
+          Pathname.new(filename),
+          0,
+          SoundFile.new(filename).length)
+      end
+    end
+
+    def add_fragment(fragment)
+      @fragments << fragment
+    end
+
+    def duration
+      @fragments.inject(0) do |memo, fragment|
+        memo += fragment.duration
+      end
+    end
+
+    def slice(start, length)
+      if start + length > duration
+        raise OutOfDuration
+      end
+
+      new_instance = self.class.new
+      remain = length
+
+      @fragments.each do |fragment|
+        if start >= fragment.duration
+          start -= fragment.duration
+
+          next
+        end
+
+        if (start + remain) <= fragment.duration
+          new_instance.add_fragment(Fragment.new(
+              fragment.filename,
+              fragment.start + start,
+              remain,
+              fragment.reversed?))
+
+          break
+        else
+          remain = remain - (fragment.duration - start)
+          new_instance.add_fragment(Fragment.new(
+              fragment.filename,
+              fragment.start + start,
+              fragment.duration - start,
+              fragment.reversed?))
+
+          start = 0
+        end
+      end
+
+      new_instance
+    end
+
+    def concat(other)
+      other.fragments.each do |fragment|
+        add_fragment(fragment)
+      end
+
+      self
+    end
+
+    alias + concat
+
+    def loop(count)
+      orig_fragments = @fragments.clone
+
+      (count - 1).times do
+        orig_fragments.each do |fragment|
+          add_fragment(fragment)
+        end
+      end
+
+      self
+    end
+
+    alias * loop
+
+    def split(count)
+      splitted_duration = duration / count.to_f
+      results = []
+
+      count.times do |i|
+        results << slice(i * splitted_duration, splitted_duration)
+      end
+
+      results
+    end
+
+    alias / split
+
+    def fill(filled_duration)
+      if @fragments.empty?
+        raise EmptyFragment
+      end
+
+      remain = filled_duration
+      new_instance = self.class.new
+
+      while filled_duration > new_instance.duration
+        if remain < duration
+          added = slice(0, remain)
+        else
+          added = self
+        end
+
+        new_instance += added
+        remain -= added.duration
+      end
+
+      new_instance
+    end
+
+    def replace(start, duration, replaced)
+      new_instance = self.class.new
+      offset = start + duration
+
+      if offset > self.duration
+        raise OutOfDuration
+      end
+
+      if start > 0
+        new_instance += slice(0, start)
+      end
+
+      new_instance += replaced
+      new_instance += slice(offset, self.duration - offset)
+
+      new_instance
+    end
+
+    def reverse
+      new_instance = self.class.new
+
+      @fragments.reverse.each do |fragment|
+        new_instance.add_fragment(Fragment.new(
+            fragment.filename,
+            fragment.start,
+            fragment.duration,
+            !fragment.reversed?))
+      end
+
+      new_instance
+    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
+      tmpdir = Pathname.new('/tmp/scissor-' + $$.to_s)
+      tmpdir.mkpath
+      tmpfile = tmpdir + 'tmp.wav'
+      cmd = %w/ecasound/
+
+      begin
+        @fragments.each_with_index do |fragment, index|
+          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')
+
+          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'
+          open(filename, 'w') do |file|
+            file.write(tmpfile.read)
+          end
+        else
+          run_command("ffmpeg -i \"#{tmpfile}\" \"#{filename}\"")
+        end
+      ensure
+        tmpdir.rmtree
+      end
+
+      self.class.new(filename)
+    end
+
+    alias > to_file
+
+    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
+  end
+end

data/lib/scissor/fragment.rb

@@ -0,0 +1,18 @@
+module Scissor
+  class Fragment
+    attr_reader :filename, :start, :duration
+
+    def initialize(filename, start, duration, reverse = false)
+      @filename = filename
+      @start = start
+      @duration = duration
+      @reverse = reverse
+
+      freeze
+    end
+
+    def reversed?
+      @reverse
+    end
+  end
+end

data/lib/scissor/sequence.rb

@@ -0,0 +1,29 @@
+module Scissor
+  class Sequence
+    def initialize(pattern, duration_per_step)
+      @pattern = pattern
+      @duration_per_step = duration_per_step
+    end
+
+    def apply(scissors)
+      result = Scissor()
+
+      @pattern.split(//).each do |c|
+        if scissors.include?(c.to_sym)
+          scissor = scissors[c.to_sym]
+
+          if @duration_per_step > scissor.duration
+            result += scissor
+            result += Scissor.silence(@duration_per_step - scissor.duration)
+          else
+            result += scissors[c.to_sym].slice(0, @duration_per_step)
+          end
+        else
+          result += Scissor.silence(@duration_per_step)
+        end
+      end
+
+      result
+    end
+  end
+end

data/lib/scissor/sound_file.rb

@@ -0,0 +1,34 @@
+require 'mp3info'
+require 'pathname'
+require 'riff/reader'
+
+module Scissor
+  class SoundFile
+    SUPPORTED_FORMAT = %w/mp3 wav/
+
+    class Error < StandardError; end
+    class UnknownFormat < Error; end
+
+    def initialize(filename)
+      @filename = Pathname.new(filename)
+      @ext = @filename.extname.sub(/^\./, '').downcase
+
+      unless SUPPORTED_FORMAT.include?(@ext)
+        raise UnknownFormat
+      end
+    end
+
+    def length
+      case @ext
+      when 'mp3'
+        Mp3Info.new(@filename).length
+      when 'wav'
+        riff = Riff::Reader.open(@filename ,"r")
+        data = riff.root_chunk['data']
+        fmt = riff.root_chunk['fmt ']
+
+        data.length / fmt.body.unpack('s2i2')[3].to_f
+      end
+    end
+  end
+end

data/lib/scissor.rb

@@ -1,349 +1,20 @@
-require 'mp3info'
-require 'digest/md5'
-require 'pathname'
-require 'riff/reader'
-require 'open4'
-require 'logger'
+require 'scissor/chunk'
+require 'scissor/fragment'
+require 'scissor/sound_file'
+require 'scissor/sequence'
 
-class Scissor
-  class Error < StandardError; end
-  class FileExists < Error; end
-  class EmptyFragment < Error; end
-  class OutOfDuration < Error; end
-  class CommandFailed < Error; end
-
-  attr_reader :fragments
-  attr_accessor :logger
-
-  def initialize(filename = nil)
-    @fragments = []
-    @logger = Logger.new(STDOUT)
-    @logger.level = Logger::INFO
-
-    if filename
-      @fragments << Fragment.new(
-        Pathname.new(filename),
-        0,
-        SoundFile.new(filename).length)
-    end
-  end
-
-  def add_fragment(fragment)
-    @fragments << fragment
-  end
-
-  def duration
-    @fragments.inject(0) do |memo, fragment|
-      memo += fragment.duration
-    end
-  end
-
-  def slice(start, length)
-    if start + length > duration
-      raise OutOfDuration
-    end
-
-    new_instance = self.class.new
-    remain = length
-
-    @fragments.each do |fragment|
-      if start >= fragment.duration
-        start -= fragment.duration
-
-        next
-      end
-
-      if (start + remain) <= fragment.duration
-        new_instance.add_fragment(Fragment.new(
-            fragment.filename,
-            fragment.start + start,
-            remain,
-            fragment.reversed?))
-
-        break
-      else
-        remain = remain - (fragment.duration - start)
-        new_instance.add_fragment(Fragment.new(
-            fragment.filename,
-            fragment.start + start,
-            fragment.duration - start,
-            fragment.reversed?))
-
-        start = 0
-      end
-    end
-
-    new_instance
-  end
-
-  def concat(other)
-    other.fragments.each do |fragment|
-      add_fragment(fragment)
-    end
-
-    self
-  end
-
-  alias + concat
-
-  def loop(count)
-    orig_fragments = @fragments.clone
-
-    (count - 1).times do
-      orig_fragments.each do |fragment|
-        add_fragment(fragment)
-      end
-    end
-
-    self
-  end
-
-  alias * loop
-
-  def split(count)
-    splitted_duration = duration / count.to_f
-    results = []
-
-    count.times do |i|
-      results << slice(i * splitted_duration, splitted_duration)
-    end
-
-    results
-  end
-
-  alias / split
-
-  def fill(filled_duration)
-    if @fragments.empty?
-      raise EmptyFragment
-    end
-
-    remain = filled_duration
-    new_instance = self.class.new
-
-    while filled_duration > new_instance.duration
-      if remain < duration
-        added = slice(0, remain)
-      else
-        added = self
-      end
-
-      new_instance += added
-      remain -= added.duration
-    end
-
-    new_instance
-  end
-
-  def replace(start, duration, replaced)
-    new_instance = self.class.new
-    offset = start + duration
-
-    if offset > self.duration
-      raise OutOfDuration
-    end
-
-    if start > 0
-      new_instance += slice(0, start)
-    end
-
-    new_instance += replaced
-    new_instance += slice(offset, self.duration - offset)
-
-    new_instance
-  end
-
-  def reverse
-    new_instance = self.class.new
-
-    @fragments.reverse.each do |fragment|
-      new_instance.add_fragment(Fragment.new(
-          fragment.filename,
-          fragment.start,
-          fragment.duration,
-          !fragment.reversed?))
-    end
-
-    new_instance
-  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
-    tmpdir = Pathname.new('/tmp/scissor-' + $$.to_s)
-    tmpdir.mkpath
-    tmpfile = tmpdir + 'tmp.wav'
-    cmd = %w/ecasound/
-
-    begin
-      @fragments.each_with_index do |fragment, index|
-        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')
-
-        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'
-        open(filename, 'w') do |file|
-          file.write(tmpfile.read)
-        end
-      else
-        run_command("ffmpeg -i \"#{tmpfile}\" \"#{filename}\"")
-      end
-    ensure
-      tmpdir.rmtree
-    end
-
-    self.class.new(filename)
-  end
-
-  alias > to_file
-
-  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
-
-  class << self
-    def silence(duration)
-      new(File.dirname(__FILE__) + '/../data/silence.mp3').
-        slice(0, 1).
-        fill(duration)
-    end
-
-    def sequence(*args)
-      Sequence.new(*args)
-    end
-  end
-
-  class SoundFile
-    SUPPORTED_FORMAT = %w/mp3 wav/
-
-    class Error < StandardError; end
-    class UnknownFormat < Error; end
-
-    def initialize(filename)
-      @filename = Pathname.new(filename)
-      @ext = @filename.extname.sub(/^\./, '').downcase
-
-      unless SUPPORTED_FORMAT.include?(@ext)
-        raise UnknownFormat
-      end
-    end
-
-    def length
-      case @ext
-      when 'mp3'
-        Mp3Info.new(@filename).length
-      when 'wav'
-        riff = Riff::Reader.open(@filename ,"r")
-        data = riff.root_chunk['data']
-        fmt = riff.root_chunk['fmt ']
-
-        data.length / fmt.body.unpack('s2i2')[3].to_f
-      end
-    end
-  end
-
-  class Fragment
-    attr_reader :filename, :start, :duration
-
-    def initialize(filename, start, duration, reverse = false)
-      @filename = filename
-      @start = start
-      @duration = duration
-      @reverse = reverse
-
-      freeze
-    end
+def Scissor(*args)
+  Scissor::Chunk.new(*args)
+end
 
-    def reversed?
-      @reverse
-    end
+module Scissor
+  def self.silence(duration)
+    Scissor(File.dirname(__FILE__) + '/../data/silence.mp3').
+      slice(0, 1).
+      fill(duration)
   end
 
-  class Sequence
-    def initialize(pattern, duration_per_step)
-      @pattern = pattern
-      @duration_per_step = duration_per_step
-    end
-
-    def apply(scissors)
-      result = Scissor.new
-
-      @pattern.split(//).each do |c|
-        if scissors.include?(c.to_sym)
-          scissor = scissors[c.to_sym]
-
-          if @duration_per_step > scissor.duration
-            result += scissor
-            result += Scissor.silence(@duration_per_step - scissor.duration)
-          else
-            result += scissors[c.to_sym].slice(0, @duration_per_step)
-          end
-        else
-          result += Scissor.silence(@duration_per_step)
-        end
-      end
-
-      result
-    end
+  def self.sequence(*args)
+    Scissor::Sequence.new(*args)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors: 
 - youpy
@@ -55,6 +55,11 @@ files:
 - README.rdoc
 - ChangeLog
 - Rakefile
+- lib/scissor
+- lib/scissor/chunk.rb
+- lib/scissor/fragment.rb
+- lib/scissor/sequence.rb
+- lib/scissor/sound_file.rb
 - lib/scissor.rb
 - data/silence.mp3
 has_rdoc: true