scissor 0.1.2 → 0.2.0

data/Rakefile

@@ -18,7 +18,7 @@ DESCRIPTION       = "utility to chop sound files"
 RUBYFORGE_PROJECT = "scissor"
 HOMEPATH          = "http://github.com/youpy/scissor"
 BIN_FILES         = %w(  )
-VERS              = "0.1.2"
+VERS              = "0.2.0"
 
 REV = File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
 CLEAN.include ['**/.*.sw?', '*.gem', '.config']
@@ -62,6 +62,8 @@ spec = Gem::Specification.new do |s|
   s.add_dependency('ruby-mp3info')
   s.add_dependency('riff', '<= 0.3.0')
   s.add_dependency('tempdir')
+  s.add_dependency('streamio-ffmpeg')
+  s.add_development_dependency('fakeweb')
   #s.required_ruby_version = '>= 1.8.2'
 
   s.files = %w(README.rdoc ChangeLog Rakefile) +

data/lib/scissor/chunk.rb

@@ -1,3 +1,6 @@
+require 'open-uri'
+require 'tempfile'
+
 module Scissor
   class Chunk
     class Error < StandardError; end
@@ -17,6 +20,35 @@ module Scissor
       end
     end
 
+    def self.new_from_url(url)
+      file = nil
+      content_types = {
+        'audio/wav' => 'wav',
+        'audio/x-wav' => 'wav',
+        'audio/wave' => 'wav',
+        'audio/x-pn-wav' => 'wav',
+        'audio/mpeg' => 'mp3',
+        'audio/x-mpeg' => 'mp3',
+        'audio/mp3' => 'mp3',
+        'audio/x-mp3' => 'mp3',
+        'audio/mpeg3' => 'mp3',
+        'audio/x-mpeg3' => 'mp3',
+        'audio/mpg' => 'mp3',
+        'audio/x-mpg' => 'mp3',
+        'audio/x-mpegaudio' => 'mp3',
+      }
+
+      open(url) do |f|
+        ext = content_types[f.content_type.downcase]
+
+        file = Tempfile.new(['audio', '.' + ext])
+        file.write(f.read)
+        file.flush
+      end
+
+      new(file.path)
+    end
+
     def add_fragment(fragment)
       @fragments << fragment
     end

data/lib/scissor/writer.rb

@@ -2,6 +2,7 @@ require 'digest/md5'
 require 'pathname'
 require 'open4'
 require 'temp_dir'
+require 'streamio-ffmpeg'
 
 module Scissor
   class Writer
@@ -17,7 +18,6 @@ module Scissor
       @tracks = []
 
       which('ecasound')
-      which('ffmpeg')
       which('rubberband')
     end
 
@@ -40,7 +40,8 @@ module Scissor
         fragment_outfile = tmpdir + (Digest::MD5.hexdigest(fragment_filename.to_s) + '.wav')
 
         unless fragment_outfile.exist?
-          run_command("ffmpeg -i \"#{fragment_filename}\" -ar 44100 \"#{fragment_outfile}\"")
+          movie = FFMPEG::Movie.new(fragment_filename.to_s)
+          movie.transcode(fragment_outfile.to_s, :audio_sample_rate => 44100)
         end
 
         cmd << "-a:#{index} -o:#{outfile} -y:#{position}"
@@ -115,7 +116,8 @@ module Scissor
 
         mix_files(tmpfiles, final_tmpfile = tmpdir + 'tmp.wav')
 
-        run_command("ffmpeg -ab #{options[:bitrate]} -i \"#{final_tmpfile}\" -ar 44100 \"#{full_filename}\"")
+        movie = FFMPEG::Movie.new(final_tmpfile.to_s)
+        movie.transcode(full_filename.to_s, :audio_sample_rate => 44100, :audio_bitrate => options[:bitrate])
       end
     end
 

data/lib/scissor.rb

@@ -5,8 +5,12 @@ require 'scissor/sound_file'
 require 'scissor/sequence'
 require 'scissor/writer'
 
-def Scissor(*args)
-  Scissor::Chunk.new(*args)
+def Scissor(filename_or_url = nil)
+  if filename_or_url && filename_or_url =~ /^http/
+    Scissor::Chunk.new_from_url(filename_or_url)
+  else
+    Scissor::Chunk.new(filename_or_url)
+  end
 end
 
 require 'logger'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - youpy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-31 00:00:00 +09:00
+date: 2011-12-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,30 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: streamio-ffmpeg
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 description: utility to chop sound files
 email: youpy@buycheapviagraonlinenow.com
 executables: []