youpy-scissor 0.0.12 → 0.0.13

data/README.rdoc

@@ -13,14 +13,6 @@ supported file format:
 
 === Requirements
 
-* {ruby-mp3info}[http://ruby-mp3info.rubyforge.org/]
-
-	gem install ruby-mp3info
-
-* {RiffLib}[http://rubyforge.org/projects/riff/]
-
-	gem install riff
-
 * {FFmpeg}[http://ffmpeg.mplayerhq.hu/]
 * {Ecasound}[http://www.eca.cx/ecasound/] 2.5.0 or higher
 

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.12"
+VERS              = "0.0.13"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -57,6 +57,7 @@ spec = Gem::Specification.new do |s|
   s.homepage          = HOMEPATH
   s.test_files        = Dir["test/test_*.rb"]
 
+  s.add_dependency('open4')
   s.add_dependency('ruby-mp3info')
   s.add_dependency('riff')
   #s.required_ruby_version = '>= 1.8.2'

data/lib/scissor.rb

@@ -2,19 +2,23 @@ require 'mp3info'
 require 'digest/md5'
 require 'pathname'
 require 'riff/reader'
+require 'open4'
+require 'logger'
 
 class Scissor
   class Error < StandardError; end
-  class CommandNotFound < Error; end
-  class CommandFailed < Error; 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(
@@ -164,6 +168,8 @@ class Scissor
   end
 
   def to_file(filename, options = {})
+    filename = Pathname.new(filename)
+
     if @fragments.empty?
       raise EmptyFragment
     end
@@ -189,16 +195,17 @@ class Scissor
     tmpdir = Pathname.new('/tmp/scissor-' + $$.to_s)
     tmpdir.mkpath
     tmpfile = tmpdir + 'tmp.wav'
-    cmd = %w/ecasound -q/
+    cmd = %w/ecasound/
 
     begin
       @fragments.each_with_index do |fragment, index|
         if !index.zero? && (index % 80).zero?
           run_command(cmd.join(' '))
-          cmd = %w/ecasound -q/
+          cmd = %w/ecasound/
         end
 
         fragment_tmpfile =
+          fragment.filename.extname.downcase == '.wav' ? fragment.filename :
           tmpdir + (Digest::MD5.hexdigest(fragment.filename) + '.wav')
 
         unless fragment_tmpfile.exist?
@@ -217,7 +224,14 @@ class Scissor
       end
 
       run_command(cmd.join(' '))
-      run_command("ffmpeg -i \"#{tmpfile}\" \"#{filename}\"")
+
+      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
@@ -229,15 +243,22 @@ class Scissor
 
   def which(command)
     run_command("which #{command}")
-
-    rescue CommandFailed
-    raise CommandNotFound.new("#{command}: not found")
   end
 
   def run_command(cmd)
-    unless system(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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: youpy-scissor
 version: !ruby/object:Gem::Version 
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors: 
 - youpy
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -07:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: open4
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: ruby-mp3info
   type: :runtime