mr_eko 0.5.1 → 0.5.2

data/bin/mreko

@@ -5,9 +5,6 @@ $: << File.join(File.dirname(__FILE__), '../lib')
 require 'mr_eko'
 require 'optparse'
 
-require 'sequel/extensions/migration'
-Sequel::Migrator.apply(MrEko.connection, File.join(File.dirname(__FILE__), "..", "db", "migrate"))
-
 def parse_options
 
   options = { :format => :pls }

data/db/migrate/001_add_playlists.rb

@@ -1,16 +1,16 @@
-class AddPlaylists < Sequel::Migration
-  def up
+Sequel.migration do
+  up do
     create_table(:playlists) do
       primary_key :id
       String :name
       DateTime :created_on
       DateTime :updated_on
-      
+
       index :name, :unique => true
     end
   end
-  
-  def down
+
+  down do
     drop_table :playlists
   end
-end
+end

data/db/migrate/002_add_songs.rb

@@ -1,5 +1,5 @@
-class AddSongs < Sequel::Migration
-  def up
+Sequel.migration do
+  up do
     create_table(:songs) do
       primary_key :id
       String :md5, :length => 32
@@ -17,20 +17,20 @@ class AddSongs < Sequel::Migration
       Integer :mode, :length => 1
       DateTime :created_on
       DateTime :updated_on
-    
+
       index :md5, :unique => true
     end
-    
+
     create_table :playlists_songs do
       Integer :playlist_id
       Integer :song_id
-      
+
       index [:playlist_id, :song_id], :unique => true
     end
   end
-  
-  def down
+
+  down do
     drop_table :songs
     drop_table :playlists_songs
   end
-end
+end

data/db/migrate/003_add_useful_song_fields.rb

@@ -1,15 +1,15 @@
-class AddUsefulSongFields < Sequel::Migration
-  def up
+Sequel.migration do
+  up do
     alter_table(:songs) do
       add_column :echonest_id, String
-      add_column :danceability, Float    
-      add_column :energy, Float    
+      add_column :danceability, Float
+      add_column :energy, Float
       add_column :bitrate, Integer, :size => 4
       add_index :echonest_id
     end
   end
-  
-  def down
+
+  down do
     alter_table(:songs) do
       drop_column :echonest_id
       drop_column :danceability
@@ -17,4 +17,4 @@ class AddUsefulSongFields < Sequel::Migration
       drop_column :bitrate
     end
   end
-end
+end

data/db/migrate/{04_add_code_to_songs.rb → 004_add_code_to_songs.rb}

@@ -1,13 +1,13 @@
-class AddCodeToSongs < Sequel::Migration
-  def up
+Sequel.migration do
+  up do
     alter_table(:songs) do
       add_column :code, String, :text => true
     end
   end
-  
-  def down
+
+  down do
     alter_table(:songs) do
       drop_column :code
     end
   end
-end
+end

data/db/migrate/{05_remove_fades_from_song.rb → 005_remove_fades_from_song.rb}

@@ -1,12 +1,12 @@
-class AddCodeToSongs < Sequel::Migration
-  def up
+Sequel.migration do
+  up do
     alter_table(:songs) do
       drop_column :fade_in
       drop_column :fade_out
     end
   end
 
-  def down
+  down do
     alter_table(:songs) do
       add_column :fade_in, Float
       add_column :fade_out, Float

data/db/migrate/{06_add_song_position.rb → 006_add_song_position.rb}

@@ -1,5 +1,5 @@
-class AddSongPosition < Sequel::Migration
-  def up
+Sequel.migration do
+  up do
     alter_table(:playlists_songs) do
       add_column :position, Integer
     end
@@ -7,7 +7,7 @@ class AddSongPosition < Sequel::Migration
     rename_table :playlists_songs, :playlist_entries
   end
 
-  def down
+  down do
     alter_table(:playlists_songs) do
       drop_column :position
     end

data/lib/mr_eko.rb

@@ -3,6 +3,7 @@ require "bundler"
 
 require "sqlite3"
 require "sequel"
+require 'sequel/extensions/migration'
 require "logger"
 require "hashie"
 require "digest/md5"
@@ -19,7 +20,7 @@ EKO_ENV = ENV['EKO_ENV'] || 'development'
 Sequel.default_timezone = :utc
 
 module MrEko
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'
   USER_DIR = File.join(ENV['HOME'], ".mreko")
   FINGERPRINTS_DIR = File.join(USER_DIR, 'fingerprints')
   LOG_DIR = File.join(USER_DIR, 'logs')
@@ -70,6 +71,9 @@ module MrEko
       return @connection if @connection
       @connection = Sequel.sqlite(db_name)
       @connection.loggers << @logger
+
+      File.unlink(MrEko.db_name) if File.exist?(MrEko.db_name) && env == 'test'
+      Sequel::Migrator.apply(MrEko.connection, File.join(File.dirname(__FILE__), "..", "db", "migrate"))
     end
 
     def setup_echonest!

data/mr_eko.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'mr_eko'
-  s.version           = '0.5.1'
-  s.date              = '2012-06-03'
+  s.version           = '0.5.2'
+  s.date              = '2012-09-13'
   s.rubyforge_project = 'mr_eko'
 
   ## Make sure your summary is short. The description may be as long
@@ -76,9 +76,9 @@ Gem::Specification.new do |s|
     db/migrate/001_add_playlists.rb
     db/migrate/002_add_songs.rb
     db/migrate/003_add_useful_song_fields.rb
-    db/migrate/04_add_code_to_songs.rb
-    db/migrate/05_remove_fades_from_song.rb
-    db/migrate/06_add_song_position.rb
+    db/migrate/004_add_code_to_songs.rb
+    db/migrate/005_remove_fades_from_song.rb
+    db/migrate/006_add_song_position.rb
     ext/enmfp/LICENSE
     ext/enmfp/README
     ext/enmfp/RELEASE_NOTES
@@ -102,6 +102,8 @@ Gem::Specification.new do |s|
     lib/mr_eko/song.rb
     lib/mr_eko/timed_playlist.rb
     mr_eko.gemspec
+    test/data/tagless.mp3
+    test/data/they_want_a_test.mp3
     test/mr_eko_test.rb
     test/playlist_test.rb
     test/song_test.rb

data/test/test.rb

@@ -1,15 +1,11 @@
 ENV['EKO_ENV'] = 'test'
 require "bundler/setup"
-Bundler.setup
 
 require 'test/unit'
 require 'shoulda'
 require 'mocha'
 require "mr_eko"
 require "ruby-debug"
-
-require 'sequel/extensions/migration'
-Sequel::Migrator.apply(MrEko.connection, File.join(File.dirname(__FILE__), "..", "db", "migrate"))
 # Clear the tables out
 (MrEko.connection.tables - [:schema_info]).each do |table|
   MrEko.connection.run "DELETE FROM #{table}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mr_eko
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Ed Hickey
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-03 00:00:00 Z
+date: 2012-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -30,12 +28,12 @@ dependencies:
         - 3
         - 15
         version: "3.15"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  name: sequel
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +43,12 @@ dependencies:
         - 1
         - 3
         version: "1.3"
+  prerelease: false
   type: :runtime
-  version_requirements: *id002
+  name: sqlite3-ruby
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: hashie
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -59,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id003
+  name: hashie
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: httpclient
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,12 +72,12 @@ dependencies:
         - 2
         - 1
         version: "2.1"
+  prerelease: false
   type: :runtime
-  version_requirements: *id004
+  name: httpclient
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: bassnode-ruby-echonest
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,12 +86,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id005
+  name: bassnode-ruby-echonest
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -104,12 +102,12 @@ dependencies:
         - 4
         - 6
         version: 1.4.6
+  prerelease: false
   type: :runtime
-  version_requirements: *id006
+  name: json
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: id3lib-ruby
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -118,12 +116,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id007
+  name: id3lib-ruby
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: mocha
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -134,12 +132,12 @@ dependencies:
         - 9
         - 8
         version: 0.9.8
+  prerelease: false
   type: :development
-  version_requirements: *id008
+  name: mocha
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -149,12 +147,12 @@ dependencies:
         - 2
         - 11
         version: "2.11"
+  prerelease: false
   type: :development
-  version_requirements: *id009
+  name: shoulda
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: test-unit
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -164,12 +162,12 @@ dependencies:
         - 2
         - 1
         version: "2.1"
+  prerelease: false
   type: :development
-  version_requirements: *id010
+  name: test-unit
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: ruby-debug
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -178,12 +176,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id011
+  name: ruby-debug
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: autotest
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -192,12 +190,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id012
+  name: autotest
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
-  name: pry
-  prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -206,12 +204,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id013
+  name: pry
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -220,8 +218,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  prerelease: false
   type: :development
-  version_requirements: *id014
+  name: yard
+  requirement: *id014
 description: Catalogs music file data and exposes a playlist interface
 email: bassnode@gmail.com
 executables: 
@@ -239,9 +239,9 @@ files:
 - db/migrate/001_add_playlists.rb
 - db/migrate/002_add_songs.rb
 - db/migrate/003_add_useful_song_fields.rb
-- db/migrate/04_add_code_to_songs.rb
-- db/migrate/05_remove_fades_from_song.rb
-- db/migrate/06_add_song_position.rb
+- db/migrate/004_add_code_to_songs.rb
+- db/migrate/005_remove_fades_from_song.rb
+- db/migrate/006_add_song_position.rb
 - ext/enmfp/LICENSE
 - ext/enmfp/README
 - ext/enmfp/RELEASE_NOTES
@@ -265,6 +265,8 @@ files:
 - lib/mr_eko/song.rb
 - lib/mr_eko/timed_playlist.rb
 - mr_eko.gemspec
+- test/data/tagless.mp3
+- test/data/they_want_a_test.mp3
 - test/mr_eko_test.rb
 - test/playlist_test.rb
 - test/song_test.rb
@@ -299,7 +301,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mr_eko
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: Catalogs music file data and exposes a playlist interface