monkeymusic 0.0.4 → 0.0.5

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monkeymusic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Oscar Soderlund
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -34,7 +34,7 @@ files:
 - lib/monkey_music_generate.rb
 - lib/monkey_music_generate/recommendation_loader.rb
 - lib/monkey_music_generate/toplist_loader.rb
-- lib/monkey_music_generate/generator.rb
+- lib/monkey_music_generate/runner.rb
 - lib/monkey_music_generate/score_system.rb
 - lib/monkey_music.rb
 - lib/monkey_music/level.rb
@@ -45,10 +45,13 @@ files:
 - lib/monkey_music/units/user.rb
 - lib/monkey_music/game.rb
 - lib/monkey_music/runner.rb
+- lib/monkey_music/metadata/track.rb
+- lib/monkey_music/metadata/artist.rb
+- lib/monkey_music/metadata/album.rb
 - lib/monkey_music/player.rb
 - lib/monkey_music/level_loader.rb
-- lib/monkey_music/ui/browser_ui.rb
-- lib/monkey_music/ui/console_ui.rb
+- lib/monkey_music/ui/browser.rb
+- lib/monkey_music/ui/console.rb
 - levels/testmaze_30.rb
 - levels/bomberman2.rb
 - levels/the_last_crusade.rb
@@ -56,6 +59,7 @@ files:
 - levels/testmaze_10.rb
 - levels/testlevel_maze.rb
 - levels/travelling_salesmonkeys.rb
+- levels/demolevel.rb
 - levels/testmaze_20.rb
 - bin/monkeymusic-generate
 - bin/monkeymusic

data/lib/monkey_music_generate/generator.rb

@@ -1,98 +0,0 @@
-require 'optparse'
-require 'hallon'
-
-module MonkeyMusic
-  class Generator
-  
-    def initialize
-      OptionParser.new do |opts|
-        opts.banner = 'Usage: monkeymusic-generate [options]'
-
-        opts.on('-g',
-                '--generate TOPLIST_FILE',
-                'Generate a user from a toplist file.') do |user|
-          @toplist_file = File.join(Dir.getwd, user)
-        end
-
-        opts.on('-o',
-                '--out OUT_FILE',
-                'The file to dump a generated user to.') do |file|
-          @out_file = File.join(Dir.getwd, file)
-        end
-
-        opts.on('-k', 
-                '--app-key KEY', 
-                'Path to libspotify application key.') do |key|
-          @spotify_appkey_file = File.join(Dir.getwd, key)
-        end
-
-        opts.on('-a', 
-                '--account ACCOUNT', 
-                'Username for a Spotify premium account.') do |account|
-          @spotify_account = account
-        end
-
-        opts.on('-w', '--password PASSWORD', 
-                'Password for a Spotify premium account.') do |password|
-          @spotify_password = password
-        end
-
-        opts.on_tail('-h',
-                     '--help', 
-                     'Show this message.') do 
-          puts opts
-          exit
-        end
-      end.parse!
-    end
-
-    def run
-      if generate_user?
-        # Create user
-        user = User.new
-        # Connect to libspotify
-        Hallon.load_timeout = 0
-        session = Hallon::Session.initialize(IO.read(@spotify_appkey_file))
-        session.login!(@spotify_account, @spotify_password)
-        # Load toplists
-        puts "Loading toplists from #{@toplist_file}..."
-        toplist_loader = ToplistLoader.new(@toplist_file)
-        toplist_loader.load_for_user!(user)
-        # Generate recommendations
-        puts "Loading recommendations..."
-        loaded_toplists = toplist_loader.loaded_toplists
-        recommendation_loader = RecommendationLoader.new(loaded_toplists)
-        recommendation_loader.load_for_user!(user)
-        # Disconnect from libspotify
-        session.logout!
-        # Evaluate recommendations
-        puts "Evaluating recommendations..."
-        score_system = ScoreSystem.new
-        score_system.evaluate_user_recommendations!(user)
-        # Dump and print the user
-        File.open(@out_file, 'w') do |f|
-          f.write(user.dump)
-        end
-        puts "====="
-        puts "DONE!"
-        puts "====="
-        puts "Loaded tracks:"
-        user.recommendations.group_by(&:multiplier).sort.each do |k,v| 
-          puts "#Multiplier #{k}:\t#{v.length}"
-        end
-        exit
-      end
-    end
-
-    private
-
-    def generate_user?
-      (defined? @toplist_file) &&
-        (defined? @out_file) &&
-        (defined? @spotify_appkey_file) &&
-        (defined? @spotify_account) &&
-        (defined? @spotify_password)
-    end
-
-  end
-end