sweeper 0.3 → 0.3.1

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.3.1. Fix some annoying Windows bugs.
+
 v0.3. Pure Ruby Levenshtein algorithm, for Windows support.
 
 v0.2.4. More robust XSD error handling.

data/Manifest

@@ -2,6 +2,7 @@ bin/sweeper
 CHANGELOG
 ext/extconf.rb
 ext/Makefile
+ext/nmake.bat
 lib/sweeper.rb
 LICENSE
 Manifest

data/lib/sweeper.rb

@@ -7,7 +7,7 @@ require 'open-uri'
 require 'uri'
 require 'Text'
 
-require 'ruby-debug' if ENV['DEBUG']
+begin; require 'ruby-debug' if ENV['DEBUG']; rescue LoadError; end 
 
 class ID3Lib::Tag
   def url
@@ -36,7 +36,15 @@ class Sweeper
 
   # Instantiate a new Sweeper. See <tt>bin/sweeper</tt> for <tt>options</tt> details.
   def initialize(options = {})
-    @dir = File.expand_path(options['dir'] || Dir.pwd)
+    @dir = File.expand_path(options['dir'] || Dir.pwd)    
+
+    if RUBY_PLATFORM =~ /win32/
+      @dir = @dir[2..-1] # Strip drive letter
+      @null = "nul"
+    else
+      @null = "/dev/null"
+    end
+          
     @options = options
     @errf = Tempfile.new("stderr")
     @match_cache = {}    
@@ -51,7 +59,6 @@ class Sweeper
     Kernel.at_exit do
       if @read == 0
         puts "No mp3 files found. Maybe you meant --recursive?"
-        exec "#{$0} --help"
       else
         puts "Read: #{@read}\nUpdated: #{@updated}\nFailed: #{@failed}"
       end
@@ -71,7 +78,8 @@ class Sweeper
   def recurse(dir)
     # Hackishly avoid problems with metacharacters in the Dir[] string.
     dir = dir.gsub(/[^\s\w\.\/\\\-]/, '?')
-    # p dir if ENV['DEBUG']
+    p dir if ENV['DEBUG']
+    
     Dir["#{dir}/*"].each do |filename|
       if File.directory? filename and options['recursive']
         recurse(filename)
@@ -153,7 +161,9 @@ 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 = `./#{File.basename(binary)} #{filename.inspect} 2> #{@errf.path}`
+      cmd = "#{binary} #{filename.inspect} 2> #{@null}"
+      p cmd if ENV['DEBUG']
+      response = `#{cmd}`
       object = begin
         XSD::Mapping.xml2obj(response)
       rescue Object => e
@@ -237,12 +247,12 @@ class Sweeper
   
   # Returns the path to the fingerprinter binary for this platform.
   def binary
-    @binary ||= "#{File.dirname(__FILE__)}/../vendor/" + 
+    @binary ||= "#{File.expand_path(File.dirname(__FILE__))}/../vendor/" + 
       case RUBY_PLATFORM
-        when /darwin/
-          "lastfm.fpclient.beta2.OSX-intel/lastfmfpclient"
         when /win32/
           "lastfm.fpclient.beta2.win32/lastfmfpclient.exe"
+        when /darwin/
+          "lastfm.fpclient.beta2.OSX-intel/lastfmfpclient"
         else 
           "lastfm.fpclient.beta2.linux-32/lastfmfpclient"
         end

data/sweeper.gemspec

@@ -1,10 +1,10 @@
 
-# Gem::Specification for Sweeper-0.3
+# Gem::Specification for Sweeper-0.3.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{sweeper}
-  s.version = "0.3"
+  s.version = "0.3.1"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables = ["sweeper"]
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["CHANGELOG", "lib/sweeper.rb", "LICENSE", "README", "TODO"]
-  s.files = ["bin/sweeper", "CHANGELOG", "ext/extconf.rb", "ext/Makefile", "lib/sweeper.rb", "LICENSE", "Manifest", "README", "test/integration/sweeper_test.rb", "TODO", "vendor/lastfm.fpclient.beta2.linux-32/lastfmfpclient", "vendor/lastfm.fpclient.beta2.linux-32/readme.txt", "vendor/lastfm.fpclient.beta2.OSX-intel/lastfmfpclient", "vendor/lastfm.fpclient.beta2.OSX-intel/libcurl.dylib", "vendor/lastfm.fpclient.beta2.OSX-intel/libmad.dylib", "vendor/lastfm.fpclient.beta2.OSX-intel/libsamplerate.dylib", "vendor/lastfm.fpclient.beta2.OSX-intel/libtag.dylib", "vendor/lastfm.fpclient.beta2.OSX-intel/readme.txt", "vendor/lastfm.fpclient.beta2.win32/lastfmfpclient.exe", "vendor/lastfm.fpclient.beta2.win32/libcurl.dll", "vendor/lastfm.fpclient.beta2.win32/libfftw3f-3.dll", "vendor/lastfm.fpclient.beta2.win32/Microsoft.VC80.CRT.manifest", "vendor/lastfm.fpclient.beta2.win32/msvcm80.dll", "vendor/lastfm.fpclient.beta2.win32/msvcp80.dll", "vendor/lastfm.fpclient.beta2.win32/msvcr80.dll", "vendor/lastfm.fpclient.beta2.win32/taglib.dll", "vendor/lastfm.fpclient.beta2.win32/zlib1.dll", "sweeper.gemspec"]
+  s.files = ["bin/sweeper", "CHANGELOG", "ext/extconf.rb", "ext/Makefile", "ext/nmake.bat", "lib/sweeper.rb", "LICENSE", "Manifest", "README", "test/integration/sweeper_test.rb", "TODO", "vendor/lastfm.fpclient.beta2.linux-32/lastfmfpclient", "vendor/lastfm.fpclient.beta2.linux-32/readme.txt", "vendor/lastfm.fpclient.beta2.OSX-intel/lastfmfpclient", "vendor/lastfm.fpclient.beta2.OSX-intel/libcurl.dylib", "vendor/lastfm.fpclient.beta2.OSX-intel/libmad.dylib", "vendor/lastfm.fpclient.beta2.OSX-intel/libsamplerate.dylib", "vendor/lastfm.fpclient.beta2.OSX-intel/libtag.dylib", "vendor/lastfm.fpclient.beta2.OSX-intel/readme.txt", "vendor/lastfm.fpclient.beta2.win32/lastfmfpclient.exe", "vendor/lastfm.fpclient.beta2.win32/libcurl.dll", "vendor/lastfm.fpclient.beta2.win32/libfftw3f-3.dll", "vendor/lastfm.fpclient.beta2.win32/Microsoft.VC80.CRT.manifest", "vendor/lastfm.fpclient.beta2.win32/msvcm80.dll", "vendor/lastfm.fpclient.beta2.win32/msvcp80.dll", "vendor/lastfm.fpclient.beta2.win32/msvcr80.dll", "vendor/lastfm.fpclient.beta2.win32/taglib.dll", "vendor/lastfm.fpclient.beta2.win32/zlib1.dll", "sweeper.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://blog.evanweaver.com/files/doc/fauna/sweeper/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Sweeper", "--main", "README"]

data/test/integration/sweeper_test.rb

@@ -1,7 +1,7 @@
 
 require 'test/unit'
 require "#{File.dirname(__FILE__)}/../../lib/sweeper"
-require 'ruby-debug'
+begin; require 'ruby-debug'; rescue LoadError; end
 
 class SweeperTest < Test::Unit::TestCase
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sweeper
 version: !ruby/object:Gem::Version 
-  version: "0.3"
+  version: 0.3.1
 platform: ruby
 authors: 
 - Evan Weaver
@@ -86,6 +86,7 @@ files:
 - CHANGELOG
 - ext/extconf.rb
 - ext/Makefile
+- ext/nmake.bat
 - lib/sweeper.rb
 - LICENSE
 - Manifest