youpy-scissor 0.0.16 → 0.0.17

data/README.rdoc

@@ -22,6 +22,7 @@ supported file format:
 
 === Gem Installation
 
+	gem sources -a http://gems.github.com/  
 	gem install youpy-scissor
 
 == Features/Problems
@@ -40,7 +41,7 @@ supported file format:
 	 foo[10, 1] + bar.slice[2, 3] > 'slicefoobar.mp3'
 
 	 # slice + concat + loop
-	 foo[10, 1] + bar[2, 3] * 4 > 'slicefoobarloop.mp3'
+	 (foo[10, 1] + bar[2, 3]) * 4 > 'slicefoobarloop.mp3'
 
 	 # split
 	 (Scissor('sequence.mp3') / 16).first.to_file('split.mp3')
@@ -50,7 +51,7 @@ supported file format:
 
 	 # sequence + loop
 	 seq = Scissor.sequence('x y  xyz', 0.2)
-	 seq.apply(:x => foo, :y => bar, :z => foo.reverse) * 4 > 'sequence.wav'
+	 seq.apply(:x => foo, :y => Proc.new { bar }, :z => foo.reverse) * 4 > 'sequence.wav'
 
 == 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.16"
+VERS              = "0.0.17"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']

data/lib/scissor/chunk.rb

@@ -2,9 +2,17 @@ require 'digest/md5'
 require 'pathname'
 require 'open4'
 require 'logger'
+require 'bigdecimal'
 
 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
@@ -12,12 +20,9 @@ module Scissor
     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(
@@ -31,12 +36,19 @@ module Scissor
       @fragments << fragment
     end
 
-    def duration
-      @fragments.inject(0) do |memo, fragment|
-        memo += fragment.duration
+    def add_fragments(fragments)
+      fragments.each do |fragment|
+        add_fragment(fragment)
       end
     end
 
+    def duration
+      BigDecimal(
+        @fragments.inject(0) do |memo, fragment|
+          memo += fragment.duration
+        end.to_s).round(3).to_f
+    end
+
     def slice(start, length)
       if start + length > duration
         raise OutOfDuration
@@ -65,9 +77,7 @@ module Scissor
     alias [] slice
 
     def concat(other)
-      other.fragments.each do |fragment|
-        add_fragment(fragment)
-      end
+      add_fragments(other.fragments)
 
       self
     end
@@ -76,11 +86,7 @@ module Scissor
 
     def +(other)
       new_instance = Scissor()
-
-      (@fragments + other.fragments).each do |fragment|
-        new_instance.add_fragment(fragment)
-      end
-
+      new_instance.add_fragments(@fragments + other.fragments)
       new_instance
     end
 
@@ -88,9 +94,7 @@ module Scissor
       orig_fragments = @fragments.clone
 
       (count - 1).times do
-        orig_fragments.each do |fragment|
-          add_fragment(fragment)
-        end
+        add_fragments(orig_fragments)
       end
 
       self
@@ -133,11 +137,11 @@ module Scissor
       new_instance
     end
 
-    def replace(start, duration, replaced)
+    def replace(start, length, replaced)
       new_instance = self.class.new
-      offset = start + duration
+      offset = start + length
 
-      if offset > self.duration
+      if offset > duration
         raise OutOfDuration
       end
 
@@ -146,7 +150,7 @@ module Scissor
       end
 
       new_instance += replaced
-      new_instance += slice(offset, self.duration - offset)
+      new_instance += slice(offset, duration - offset)
 
       new_instance
     end
@@ -197,36 +201,37 @@ module Scissor
 
       begin
         @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')
+            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}\"")
+            run_command("ffmpeg -i \"#{fragment_filename}\" \"#{fragment_tmpfile}\"")
           end
 
           cmd <<
             "-a:#{index} " +
             "-i:" +
             (fragment.reversed? ? 'reverse,' : '') +
-            "select,#{fragment.start},#{fragment.duration},\"#{fragment_tmpfile}\" " +
+            "select,#{fragment.start},#{fragment_duration},\"#{fragment_tmpfile}\" " +
             "-o:#{tmpfile} " +
             "-y:#{position}"
 
-          position += fragment.duration
+          position += fragment_duration
         end
 
         run_command(cmd.join(' '))
 
         if filename.extname == '.wav'
-          open(filename, 'w') do |file|
-            file.write(tmpfile.read)
-          end
+          File.rename(tmpfile, filename)
         else
           run_command("ffmpeg -i \"#{tmpfile}\" \"#{filename}\"")
         end
@@ -248,11 +253,11 @@ module Scissor
     end
 
     def run_command(cmd)
-      @logger.debug("run_command: #{cmd}")
+      logger.debug("run_command: #{cmd}")
 
       result = ''
       status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
-        @logger.debug(stderr.read)
+        logger.debug(stderr.read)
         result = stdout.read
       end
 
@@ -262,5 +267,9 @@ module Scissor
 
       return result
     end
+
+    def logger
+      self.class.logger
+    end
   end
 end

data/lib/scissor/sequence.rb

@@ -5,18 +5,22 @@ module Scissor
       @duration_per_step = duration_per_step
     end
 
-    def apply(scissors)
+    def apply(instruments)
       result = Scissor()
 
       @pattern.split(//).each do |c|
-        if scissors.include?(c.to_sym)
-          scissor = scissors[c.to_sym]
+        if instruments.include?(c.to_sym)
+          instrument = instruments[c.to_sym]
 
-          if @duration_per_step > scissor.duration
-            result += scissor
-            result += Scissor.silence(@duration_per_step - scissor.duration)
+          if instrument.is_a?(Proc)
+            instrument = instrument.call(c)
+          end
+
+          if @duration_per_step > instrument.duration
+            result += instrument
+            result += Scissor.silence(@duration_per_step - instrument.duration)
           else
-            result += scissors[c.to_sym].slice(0, @duration_per_step)
+            result += instrument.slice(0, @duration_per_step)
           end
         else
           result += Scissor.silence(@duration_per_step)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors: 
 - youpy
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-08 00:00:00 -07:00
+date: 2009-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency