scissor 0.0.24 → 0.0.25

data/Rakefile

@@ -17,7 +17,7 @@ DESCRIPTION       = "utility to chop sound files"
 RUBYFORGE_PROJECT = "scissor"
 HOMEPATH          = "http://github.com/youpy/scissor"
 BIN_FILES         = %w(  )
-VERS              = "0.0.24"
+VERS              = "0.0.25"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -57,9 +57,9 @@ spec = Gem::Specification.new do |s|
   s.homepage          = HOMEPATH
   s.test_files        = Dir["test/test_*.rb"]
 
-  s.add_dependency('open4')
+  s.add_dependency('open4', '<= 1.0.1')
   s.add_dependency('ruby-mp3info')
-  s.add_dependency('riff')
+  s.add_dependency('riff', '<= 0.3.0')
   s.add_dependency('tempdir')
   #s.required_ruby_version = '>= 1.8.2'
 

data/lib/scissor/chunk.rb

@@ -179,5 +179,9 @@ module Scissor
     def >>(filename)
       to_file(filename, :overwrite => true)
     end
+
+    def silence
+      Scissor.silence(duration)
+    end
   end
 end

data/lib/scissor/writer.rb

@@ -38,7 +38,7 @@ module Scissor
 
         fragment_outfile =
           fragment_filename.extname.downcase == '.wav' ? fragment_filename :
-          tmpdir + (Digest::MD5.hexdigest(fragment_filename) + '.wav')
+          tmpdir + (Digest::MD5.hexdigest(fragment_filename.to_s) + '.wav')
 
         unless fragment_outfile.exist?
           run_command("ffmpeg -i \"#{fragment_filename}\" \"#{fragment_outfile}\"")
@@ -116,12 +116,9 @@ module Scissor
     def run_command(cmd)
       logger.debug("run_command: #{cmd}")
 
-      result = ''
-      status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
-        stdin.close
-        logger.debug(stderr.read)
-        result = stdout.read
-      end
+      result, error = '', ''
+      status = Open4.spawn cmd, 'stdout' => result, 'stderr' => error
+      logger.debug(error)
 
       if status.exitstatus != 0
         raise CommandFailed.new(cmd)

data/lib/scissor.rb

@@ -53,3 +53,19 @@ module Scissor
     end
   end
 end
+
+# for ruby 1.9
+if IO.instance_methods.include? :getbyte
+  class << Riff::Reader::Chunk
+    alias :read_bytes_to_int_original :read_bytes_to_int
+    def read_bytes_to_int file, bytes
+      require 'delegate'
+      file_delegate = SimpleDelegator.new(file)
+      def file_delegate.getc
+        getbyte
+      end
+      read_bytes_to_int_original file_delegate, bytes
+    end
+  end
+end
+

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 24
-  version: 0.0.24
+  - 25
+  version: 0.0.25
 platform: ruby
 authors: 
 - youpy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 +09:00
+date: 2010-12-22 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,11 +22,13 @@ dependencies:
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -46,11 +48,13 @@ dependencies:
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - <=
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency