sweeper 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,5 +1,7 @@
 
-v0.2.1. Better error handling.
+v0.2.2. Avoid error with too many open files.
+
+v0.2.1. Better error handling; smarter genre choosing.
 
 v0.2. Genre tagging; bugfixes.
 

data/README

@@ -1,4 +1,6 @@
 
+Sweeper
+
 Automatically tag your music collection with metadata from Last.fm.
 
 == License
@@ -34,9 +36,11 @@ Now, change to the directory of mp3s you want to tag and run:
 
 Your mp3s will be updated with missing artist, genre, and trackname information, and a list of all tagged genres will be added to the <tt>comment</tt> field, for use in smart playlists.
 
+You do not need a Last.fm account to use Sweeper.
+
 == Demo
 
-Unknown song before sweeping:
+Unknown song:
 
   $ id3info 1_001.mp3 
   *** Tag information for 1_001.mp3
@@ -80,3 +84,7 @@ You will get cleaner tags if you convert your files to ID3v2 first. Sweeper read
 The support forum is here[http://rubyforge.org/forum/forum.php?forum_id=23599].
 
 Patches and contributions are very welcome. Please note that contributors are required to assign copyright for their additions to Cloudburst, LLC.
+
+== Further resources
+
+* http://blog.evanweaver.com/articles/2008/04/13/sweeper/

data/lib/sweeper.rb

@@ -36,6 +36,8 @@ class Sweeper
   def initialize(options = {})
     @dir = File.expand_path(options['dir'] || Dir.pwd)
     @options = options
+    @outf = Tempfile.new("stdout")
+    @errf = Tempfile.new("stderr")    
   end
   
   # Run the Sweeper according to the <tt>options</tt>.
@@ -149,7 +151,7 @@ class Sweeper
   # Lookup the basic metadata for an mp3 file. Accepts a pathname. Returns a tag hash.
   def lookup_basic(filename)
     Dir.chdir File.dirname(binary) do
-      response = silence { `./#{File.basename(binary)} #{filename.inspect}` }
+      response = `./#{File.basename(binary)} #{filename.inspect} 2> #{@errf.path}`
       object = begin
         XSD::Mapping.xml2obj(response)
       rescue REXML::ParseException
@@ -246,21 +248,4 @@ class Sweeper
     ID3Lib::Tag.new(filename, ID3Lib::V_ALL)
   end  
   
-  # Silence STDERR and STDOUT for the duration of the block.
-  def silence(outf = nil, errf = nil)
-    # This method is annoying.
-    outf, errf = Tempfile.new("stdout"), Tempfile.new("stderr")
-    out, err = $stdout.clone, $stderr.clone
-    $stdout.reopen(outf)
-    $stderr.reopen(errf)
-    begin
-      yield
-    ensure
-      $stdout.reopen(out)
-      $stderr.reopen(err)
-      outf.close; outf.unlink
-      errf.close; errf.unlink
-    end
-  end    
-  
 end

data/sweeper.gemspec

@@ -1,10 +1,10 @@
 
-# Gem::Specification for Sweeper-0.2.1
+# Gem::Specification for Sweeper-0.2.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{sweeper}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 

data/test/integration/sweeper_test.rb

@@ -49,9 +49,7 @@ class SweeperTest < Test::Unit::TestCase
   end
   
   def test_write
-    @s.silence do
-      @s.write(@found_many, @s.lookup(@found_many))
-    end
+    @s.write(@found_many, @s.lookup(@found_many))
     assert_equal(
       @s.lookup(@found_many),
       @s.read(@found_many))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sweeper
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Evan Weaver