monkeymusic 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    M2VhMDg0NTUyMDU0ODUyMTQ2M2I4NGEyNzliMjExZDYyZTIzODJkMQ==
+    MTBjY2IwY2ZiYTBkOGU3ZWExYzM1NmRiZjU3OGE4N2NkMTY4Y2FjYw==
   data.tar.gz: !binary |-
-    OTM5YjlmOWQ4MTNmZWIyYTJkMWQwNmMxYTNjNmY5ODg1ODY5OTI3Nw==
+    MDZiMDI1YjFmMmRmOWZmYjI3NDlhNzNjNjlhZWFkZTk3ZDM4ZGIxNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjczYTkxZDBmMDUwYzI0YTZmNDRkYmQ3YWRhNWVkMmVkNzEzM2MzMWNlYzUw
-    MGM4N2Y5NDZiNjE2ZDYzNmEyNmI5NjM3MWJiYmYzMWM2NDEyNDFjZmIzZTYy
-    OTQzMzRhMGFiOTJhMDMzM2FjYzhkZmExNjNlMDhhYWNlMzRmMTQ=
+    ZGIzYmE3NDExNGFjYzUxMmZlNzAzMTJkNDk3NjA2OTk2ZTlkNWFjZDk1OWY4
+    MmY4NTgxMTBlOTI2ZTIwNmUyYjk5YjE0NzIzYWViMzJiN2FjMjZjYmY3Yzhh
+    OTE0NDg1ZjEwMGJjMWYxY2VjYTE3OWExMDIwYjBhYjNhNzA0Yjg=
   data.tar.gz: !binary |-
-    NDU2ODNkYTRlMDYyNzRmOTM1NTE5YWIzYzg3MDRmNDAyYzA2Njk1NDhlYTFi
-    OWUyOWE4YWE4ZDczNzBlMDdkODM4ZjM0YmRhMGU2OGM1ZTA5NTJkZTYyYmYy
-    MDgxN2NkNDc5ODY3NTIzMzg2ZmQ1NjYzY2VmMzRjYzVkYWFjNWE=
+    MDZiMTRlOGE3MWE4NGJjNGI2YWNlOTcyODM5ZDM0YjM5NzBhZmJiOWZlNWNh
+    ZmQ4YWVkZDI2OGE4YmNmNjM3OWM1MDE3ZjBiMmJmYTk1N2RjNWE0MTgyYjJl
+    ZWVmNjJlMGEyMTRlMGMwYjNkM2ZiNTMzMmI0NjE3OGJmODQxZGI=

data/bin/monkeymusic-generate

@@ -2,5 +2,5 @@
 require File.dirname(__FILE__) + '/../lib/monkey_music'
 require File.dirname(__FILE__) + '/../lib/monkey_music_generate'
 
-generator = MonkeyMusic::Generator.new
-generator.run
+runner = MonkeyMusic::Generate::Runner.new
+runner.run

data/levels/bomberman2.rb

@@ -1,20 +1,18 @@
 carrying_capacity 5
-metadata_requests_per_turn 2
-max_turns 100
+turn_limit 500
+time_limit 20000
 
-legend({ 
-  "1" => Monkey.player(1),
-  "2" => Monkey.player(2),
-  "X" => Track.worth(-2),
-  "x" => Track.worth(-1),
-  "l" => Track.worth(1),
-  "t" => Track.worth(2),
-  "T" => Track.worth(3),
-  "U" => User,
-  "#" => Wall,
-})
+legend "1" => Monkey.player(1),
+       "2" => Monkey.player(2),
+       "X" => Track.worth(-2),
+       "x" => Track.worth(-1),
+       "l" => Track.worth(1),
+       "t" => Track.worth(2),
+       "T" => Track.worth(3),
+       "U" => User,
+       "#" => Wall
 
-layout <<LAYOUT
+layout <<EOS
  Xl     1 U 2     lX 
 t    ll       ll    t
 ###t ########### t###
@@ -28,4 +26,4 @@ t    ll       ll    t
 ### # # # # # # # ###
 #t    #   #   #    t#
 #l###l#t#t#t#t#l###l#
-LAYOUT
+EOS

data/levels/demolevel.rb

@@ -0,0 +1,23 @@
+carrying_capacity 3
+metadata_requests_per_turn 2
+max_turns 100
+
+legend({ 
+  "1" => Monkey.player(1),
+  "2" => Monkey.player(2),
+  "X" => Track.worth(-2),
+  "x" => Track.worth(-1),
+  "l" => Track.worth(1),
+  "t" => Track.worth(2),
+  "T" => Track.worth(3),
+  "U" => User,
+  "#" => Wall,
+})
+
+layout <<LAYOUT
+....t..t...
+.#.......#.
+#..#1U2#..#
+.#X.....X#.
+.....t.....
+LAYOUT

data/levels/testlevel.rb

@@ -1,6 +1,6 @@
 carrying_capacity 3
-metadata_requests_per_turn 2
-max_turns 100
+turn_limit 100
+time_limit 300
 
 legend({ 
   "1" => Monkey.player(1),
@@ -11,18 +11,19 @@ legend({
   "t" => Track.worth(2),
   "T" => Track.worth(3),
   "U" => User,
+  "W" => Wall,
 })
 
 layout <<LAYOUT
 ...........
-..x........
-...........
+.WW.....WW.
+.Wx.....xW.
 .......T...
 1..........
 ...t......U
 2..........
 .......l...
-...........
-..X........
+.WX.....xW.
+.WW.....WW.
 ...........
 LAYOUT

data/lib/monkey_music/game.rb

@@ -12,24 +12,28 @@ module MonkeyMusic
 
     def start
       @ui.update(@level)
-      @level.max_turns.times do
-        if @level.complete?
-          break
-        end
+      # Send initial state to players
+      init_threads = []
+      @players.each do |p|
+        init_threads << Thread.new { p.init! }
+      end
+      init_threads.each(&:join)
+      # Start the game
+      @level.turn_limit.times do |turn|
+        turn += 1
+        break if @level.complete?
         # Query players for moves
         query_threads = []
-        query_time = Benchmark.realtime do
+        turn_time = Benchmark.realtime do
           @players.each do |p|
-            query_threads << Thread.new do
-              p.query_move!
-            end
+            query_threads << Thread.new { p.query! turn }
           end
           query_threads.each(&:join)
         end
         # Move players in random order
         @players.shuffle.each { |p| p.move! }
-        # Update ui
-        @ui.update(@level, query_time)
+        ## Update ui
+        @ui.update(@level, turn, turn_time)
       end
     end
 

data/lib/monkey_music/level.rb

@@ -2,9 +2,8 @@ require 'json'
 
 module MonkeyMusic
   class Level
-    attr_accessor :width, :height, :max_turns, :requests_per_turn
-    attr_reader :players
-    attr_reader :user
+    attr_accessor :width, :height, :turn_limit, :time_limit
+    attr_reader :players, :user, :units
     
     def initialize(players, user)
       @players = players
@@ -33,6 +32,10 @@ module MonkeyMusic
         (@players.detect { |p| p.monkey.carrying.count > 0 }).nil?
     end
 
+    def tracks
+      @units.select {|u| u.kind_of? Track }
+    end
+
     def remove(unit)
       @units.reject! { |u| u == unit }
     end

data/lib/monkey_music/level_loader.rb

@@ -8,12 +8,13 @@ module MonkeyMusic
       @legend = {}
     end
 
-    def max_turns(max_turns)
-      @level.max_turns = max_turns
+    def turn_limit(turn_limit)
+      @level.turn_limit = turn_limit
     end
 
-    def metadata_requests_per_turn(n)
-      @level.requests_per_turn = n
+    def time_limit(time_limit)
+      @level.time_limit = time_limit
+      @level.players.each {|p| p.remaining_time = time_limit }
     end
 
     def carrying_capacity(capacity)

data/lib/monkey_music/metadata/album.rb

@@ -0,0 +1,15 @@
+module MonkeyMusic::Metadata
+  class Album
+    attr_reader :name, :artist, :year
+
+    def initialize(args = {})
+      @name = args[:name]
+      @artist = args[:artist]
+      @year = args[:year]
+    end
+    
+    def serialize
+      "#{@name},#{@artist},#{@year}"
+    end
+  end
+end

data/lib/monkey_music/metadata/artist.rb

@@ -0,0 +1,13 @@
+module MonkeyMusic::Metadata
+  class Artist
+    attr_accessor :name
+
+    def initialize(args = {})
+      @name = args[:name]
+    end
+    
+    def serialize
+      @name
+    end
+  end
+end

data/lib/monkey_music/metadata/track.rb

@@ -0,0 +1,22 @@
+module MonkeyMusic::Metadata
+  class Track
+    attr_reader :uri, :name, :artist, :album, :year, :multiplier, :value
+
+    def initialize(args = {})
+      @name = args[:name]
+      @artist = args[:artist]
+      @album = args[:album]
+      @year = args[:year]
+      @uri = args[:uri]
+    end
+
+    def set_value(multiplier, value)
+      @multiplier = multiplier
+      @value = value
+    end
+    
+    def serialize
+      "#{@name},#{@artist},#{@album},#{@year}"
+    end
+  end
+end

data/lib/monkey_music/player.rb

@@ -1,42 +1,110 @@
+require 'benchmark'
+
 module MonkeyMusic
   class Player
-    attr_accessor :monkey, :level
+    attr_accessor :monkey, :level, :has_boost, :remaining_time
     
     def initialize(file)
       @file = file
-      @monkey = Monkey.new()
+      @monkey = Monkey.new
+      @has_boost = true
+      @penalty = 0
+      @moves = []
+      @queries = []
+    end
+
+    def init!
+      IO.popen(@file, "r+") {|io| io.puts initial_output }
     end
 
-    def query_move!
-      IO.popen(@file, "r+") do |io|
-        io.puts player_output
-        move = io.gets
-        @next_move = parse_move(move) if move
+    def query!(turn)
+      if @penalty > 0
+        @penalty -= 1
+        @remaining_time = @monkey.level.time_limit if @penalty < 1
+      else
+        IO.popen(@file, "r+") do |io|
+          io.puts turn_output(turn)
+          @remaining_time -= (Benchmark.realtime { @input = io.gets } * 1000).round
+          parse!(@input) if @input
+          io.puts response_to(@queries) unless @queries.empty?
+          @queries = []
+        end
+        @penalty = 5 if @remaining_time < 0
       end
     end
 
-    def player_output
-      [ @monkey.id,
+    def initial_output
+      level = @monkey.level
+      user = @monkey.level.user
+      [ "INIT",
+        @monkey.id,
+        level.width,
+        level.height,
+        level.turn_limit,
+        user.toplists[:top_tracks].length,
+        user.toplists[:top_tracks].map(&:serialize).join("\n"),
+        user.toplists[:top_albums].length,
+        user.toplists[:top_albums].map(&:serialize).join("\n"),
+        user.toplists[:top_artists].length,
+        user.toplists[:top_artists].map(&:serialize).join("\n"),
+        user.toplists[:disliked_artists].length,
+        user.toplists[:disliked_artists].map(&:serialize).join("\n"),
+      ].join("\n")
+    end
+
+    def turn_output(turn)
+      [ "TURN",
+        turn,
         @monkey.remaining_capacity,
-        @monkey.level.requests_per_turn,
-        @monkey.level.width,
-        @monkey.level.height,
+        @remaining_time,
         @monkey.level.serialize,
       ].join("\n")
     end
 
-    def parse_move(s)
-      case s.chomp
-      when "N" then :north
-      when "W" then :west
-      when "E" then :east
-      when "S" then :south
+    def parse!(s)
+      @tokens = s.chomp.split(",")
+      parse_next_token!
+    end
+
+    def parse_next_token!
+      token = @tokens.shift
+      if /^[NWES]$/.match(token) then @moves << parse_move(token)
+      elsif /^spotify:track:/.match(token) then @queries << token
+      elsif "B" == token then boost!
+      end
+    end
+
+    def boost!
+      return unless @has_boost
+      @has_boost = false
+      [3, @tokens.length].min.times { parse_next_token! }
+    end
+
+    def response_to(queries)
+      tracks = []
+      queries.each do |uri|
+        tracks << @monkey.level.tracks.find {|t| t.uri == uri }
+      end
+      lines = []
+      lines << tracks.length
+      tracks.each do |track|
+        lines << "#{track.uri},#{track.metadata.serialize}"
+      end
+      lines.join("\n")
+    end
+
+    def parse_move(move)
+      case move
+        when "N" then :north
+        when "W" then :west
+        when "E" then :east
+        when "S" then :south
       end
     end
 
     def move!
-      @monkey.move! @next_move if @next_move
-      @next_move = nil
+      @moves.each {|move| @monkey.move! move }
+      @moves = []
     end
 
     def to_s

data/lib/monkey_music/runner.rb

@@ -3,7 +3,7 @@ require 'optparse'
 module MonkeyMusic
   class Runner
 
-    @@default_level = 'testlevel.rb'
+    @@default_level = 'bomberman2.rb'
     @@default_user = 'synth.yaml'
 
     def initialize(arguments)
@@ -43,9 +43,9 @@ module MonkeyMusic
         print "Using browser UI. Press the enter key to start game. "
         gets
         puts "Starting game..."
-        ui = BrowserUI.new(@delay)
+        ui = UI::Browser.new(@delay)
       else
-        ui = ConsoleUI.new(@delay)
+        ui = UI::Console.new(@delay)
       end
       ## Start game
       @game = Game.new(level, @players, ui)
@@ -97,14 +97,14 @@ module MonkeyMusic
         @delay = delay
       end
 
-      opts.on('-b', '--browser-ui', 
-              'View the game through the browser instead of the console.') do |password|
-        @browser_ui = true
-      end
+      #opts.on('-b', '--browser-ui', 
+              #'View the game through the browser instead of the console.') do |password|
+        #@browser_ui = true
+      #end
 
       opts.on('-v', '--version', 
               'Show the current version.') do |password|
-        puts '0.0.3' # TODO: Find out how to extract version from GemSpec
+        puts '0.0.5' # TODO: Find out how to extract version from GemSpec
         exit
       end
 

data/lib/monkey_music/ui/{browser_ui.rb → browser.rb}

@@ -1,12 +1,11 @@
 require 'em-websocket'
 require 'json'
-require 'rack'
 
-module MonkeyMusic
-  class BrowserUI
+module MonkeyMusic::UI
+  class Browser
 
-    def initialize(delay)
-      @delay = delay || 1
+    def initialize(delay = 1)
+      @delay = delay
       puts "Initializing websockets..."
       Thread.new {
         EM.run {
@@ -27,9 +26,9 @@ module MonkeyMusic
       puts "Websockets initialized!"
     end
 
-    def update(level)
+    def update(level, query_time = 0)
       @ws.send(level.as_json) if @ws
-      sleep @delay
+      sleep 1
     end
 
   end

data/lib/monkey_music/ui/{console_ui.rb → console.rb}

@@ -1,5 +1,5 @@
-module MonkeyMusic
-  class ConsoleUI
+module MonkeyMusic::UI
+  class Console
 
     def initialize(delay)
       @delay = delay || 1
@@ -12,7 +12,7 @@ module MonkeyMusic
       puts "\n"*5
     end
     
-    def update(level, query_time = 0)
+    def update(level, turn = 0, query_time = 0)
       # Clear screen
       puts "\e[H\e[2J"
       # Level
@@ -21,9 +21,10 @@ module MonkeyMusic
       puts "\n"
       level.players.each do |player|
         monkey = player.monkey
-        puts "---"
+        puts "--- Turn: #{turn}/#{level.turn_limit} ---"
         print "#{monkey.name} | "
         print "Score: #{monkey.score} | "
+        print "Time: #{player.remaining_time} | "
         puts "Capacity: #{monkey.remaining_capacity}"
         monkey.carrying.each { |t| puts "#{t.value}p: #{t.name}" }
         print("\n"*monkey.remaining_capacity)

data/lib/monkey_music/units/track.rb

@@ -1,22 +1,32 @@
 module MonkeyMusic
   class Track < Base
-    attr_accessor :uri, :name, :artist, :album, :popularity, :year,
-      :value, :multiplier
+    attr_accessor :metadata
 
     def self.worth(n)
       Class.new Track do @worth = n end
     end
 
     def self.from_user(user)
-      if @worth
+      track = Track.new
+      track.metadata = if @worth
         user.recommend!(@worth) || user.recommendations.sample
       else
         user.recommendations.sample
       end
+      track
+    end
+
+    # Delegate to metadata
+    def method_missing(method, *args, &block)    
+      if @metadata.respond_to?(method)
+        @metadata.send(method, *args, &block)
+      else
+        raise NoMethodError  
+      end    
     end
 
     def serialize
-      @uri
+      @metadata.uri
     end
 
     def to_json(options = {})
@@ -24,9 +34,9 @@ module MonkeyMusic
         :x => @x,
         :y => @y,
         :type => self.class.name.split('::').last,
-        :name => @name,
-        :multiplier => @multiplier,
-        :value => @value,
+        :name => @metadata.name,
+        :multiplier => @metadata.multiplier,
+        :value => @metadata.value,
       }.to_json
     end
   end

data/lib/monkey_music/units/user.rb

@@ -21,14 +21,12 @@ module MonkeyMusic
     end
 
     def dump
-      YAML::dump({
-        :toplists => @toplists,
-        :recommendations => @recommendations
-      })
+      YAML::dump :toplists => @toplists,
+                 :recommendations => @recommendations
     end
 
     def load_from_file(file)
-      data = YAML::load(IO.read(file))
+      data = YAML::load(IO.read file)
       @toplists = data[:toplists]
       @recommendations = data[:recommendations]
       @remaining_recommendations = @recommendations

data/lib/monkey_music.rb

@@ -8,8 +8,12 @@ require 'monkey_music/player'
 require 'monkey_music/level'
 require 'monkey_music/level_loader'
 
-require 'monkey_music/ui/console_ui'
-require 'monkey_music/ui/browser_ui'
+require 'monkey_music/ui/console'
+require 'monkey_music/ui/browser'
+
+require 'monkey_music/metadata/track'
+require 'monkey_music/metadata/album'
+require 'monkey_music/metadata/artist'
 
 require 'monkey_music/units/base'
 require 'monkey_music/units/monkey'