sweeper 0.3.1 → 0.3.2

data/CHANGELOG

@@ -1,4 +1,6 @@
 
+v0.3.2. Bundle working sweeper.exe.
+
 v0.3.1. Fix some annoying Windows bugs.
 
 v0.3. Pure Ruby Levenshtein algorithm, for Windows support.

data/Manifest

@@ -3,10 +3,12 @@ CHANGELOG
 ext/extconf.rb
 ext/Makefile
 ext/nmake.bat
+init.rb
 lib/sweeper.rb
 LICENSE
 Manifest
 README
+sweeper.exe
 test/integration/sweeper_test.rb
 TODO
 vendor/lastfm.fpclient.beta2.linux-32/lastfmfpclient

data/README

@@ -26,13 +26,23 @@ If you use this software, please {make a donation}[http://blog.evanweaver.com/do
 * id3lib (Linux and OS X only)
 * some mp3 files
 
-== Usage
+== Installation
+
+<b>Linux/OS X:</b>
 
-First, install the gem:
+First, install id3lib, Ruby, and Rubygems through your package manager. Then start a terminal and run:
   sudo gem install sweeper
 
-Now, change to the directory of mp3s you want to tag and run:
-  sweeper --genre --recursive
+<b>Windows:</b>
+
+If you have Ruby set up via the {One-Click Installer}[http://rubyforge.org/projects/rubyinstaller/], you install via gems as above.
+
+Otherwise, download a zipfile from the Sweeper section of the {Rubyforge page}[http://rubyforge.org/frs/?group_id=2835]. Unzip it and copy <tt>sweeper.exe</tt> into the <tt>C:\Windows</tt> folder.
+
+== Usage
+
+Now, start a terminal. Change to the directory of mp3s you want to tag and run:
+  sweeper --genre --recursive  
 
 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.
 

data/bin/sweeper

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'choice'
-require "#{File.dirname(__FILE__)}/../lib/sweeper"
+require "#{File.dirname(__FILE__)}/../lib/sweeper" unless defined? Sweeper
 
 PROGRAM_VERSION = 0.1
 

data/init.rb

@@ -0,0 +1,10 @@
+# Windows RubyScript2Exe start point
+
+require 'rubygems'
+require 'rubyscript2exe'
+
+RUBYSCRIPT2EXE.bin = Dir["vendor/lastfm.fpclient.beta2.win32/*"]
+
+require 'net/http'
+require 'lib/sweeper'
+load 'bin/sweeper'

data/lib/sweeper.rb

@@ -247,14 +247,20 @@ class Sweeper
   
   # Returns the path to the fingerprinter binary for this platform.
   def binary
-    @binary ||= "#{File.expand_path(File.dirname(__FILE__))}/../vendor/" + 
-      case RUBY_PLATFORM
+    here = "#{File.expand_path(File.dirname(__FILE__))}/../vendor"
+    @binary ||= case RUBY_PLATFORM
         when /win32/
-          "lastfm.fpclient.beta2.win32/lastfmfpclient.exe"
+          if defined?(RUBYSCRIPT2EXE)
+            e = RUBYSCRIPT2EXE            
+            p [e.tempdir, e.userdir, e.exedir, e.appdir] if ENV['DEBUG']
+            "#{e.appdir}/../bin/lastfmfpclient.exe"
+          else
+            "#{here}/lastfm.fpclient.beta2.win32/lastfmfpclient.exe"
+          end
         when /darwin/
-          "lastfm.fpclient.beta2.OSX-intel/lastfmfpclient"
+          "#{here}/lastfm.fpclient.beta2.OSX-intel/lastfmfpclient"
         else 
-          "lastfm.fpclient.beta2.linux-32/lastfmfpclient"
+          "#{here}/lastfm.fpclient.beta2.linux-32/lastfmfpclient"
         end
   end
   

data/sweeper.gemspec

@@ -1,23 +1,23 @@
 
-# Gem::Specification for Sweeper-0.3.1
+# Gem::Specification for Sweeper-0.3.2
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{sweeper}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Weaver"]
-  s.date = %q{2008-04-16}
+  s.date = %q{2008-04-18}
   s.default_executable = %q{sweeper}
   s.description = %q{Automatically tag your music collection with metadata from Last.fm.}
   s.email = %q{}
   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", "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.files = ["bin/sweeper", "CHANGELOG", "ext/extconf.rb", "ext/Makefile", "ext/nmake.bat", "init.rb", "lib/sweeper.rb", "LICENSE", "Manifest", "README", "sweeper.exe", "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"]
@@ -47,4 +47,14 @@ end
 #   p.dependencies = ['id3lib-ruby', 'choice', 'Text', 'activesupport']
 #   p.clean_pattern = ['doc', 'pkg', 'test/integration/songs']
 #   p.rdoc_pattern = ['README', 'LICENSE', 'CHANGELOG', 'TODO', 'lib/*']
+#   p.need_zip = true
+#   p.need_tar_gz = false
 # end
+# 
+# task :binary do
+#   Dir.chdir(File.dirname(__FILE__)) do
+#     system("ruby c:/ruby/bin/rubyscript2exe init.rb")
+#     File.rename("init.exe", "sweeper.exe")
+#   end
+# end
+#   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sweeper
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Evan Weaver
@@ -30,7 +30,7 @@ cert_chain:
   yZ0=
   -----END CERTIFICATE-----
 
-date: 2008-04-16 00:00:00 -04:00
+date: 2008-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -87,10 +87,12 @@ files:
 - ext/extconf.rb
 - ext/Makefile
 - ext/nmake.bat
+- init.rb
 - lib/sweeper.rb
 - LICENSE
 - Manifest
 - README
+- sweeper.exe
 - test/integration/sweeper_test.rb
 - TODO
 - vendor/lastfm.fpclient.beta2.linux-32/lastfmfpclient