goshrine_bot 0.1.10 → 0.1.11

data/lib/goshrine_bot.rb

@@ -7,7 +7,7 @@ require 'logger'
 
 module GoshrineBot
 
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 
   STDOUT.sync = true
   

data/lib/goshrine_bot/client.rb

@@ -1,3 +1,5 @@
+require 'uri'
+
 module GoshrineBot
 
   class Client
@@ -102,11 +104,13 @@ module GoshrineBot
         end
         subscribe          
         load_existing_games {
-          EM::add_periodic_timer( 60 ) {
-            @games.each do |token, game|
-              game.idle_check
-            end
-          }
+          if @options[:idle_shutdown_timeout] > 0
+            EM::add_periodic_timer( @options[:idle_shutdown_timeout] ) {
+              @games.each do |token, game|
+                game.idle_check(@options[:idle_shutdown_timeout])
+              end
+            }
+          end
         }
       }
     end
@@ -152,14 +156,23 @@ module GoshrineBot
     end
     
     def handle_match_request(request)
+      active_games = @games.select { |key, game| game.state == "in-play" }
+      max_games = @options[:maximum_concurrent_games]
       game = GameInProgress.new(self)
       game.update_from_match_request(request)
-      http = http_get("/match/accept?id=#{game.challenge_id}")
-      http.callback {
-        attrs = JSON.parse(http.response)
-        game.update_from_game_list(attrs)
-        add_game(game)
-      }
+      if max_games.nil? || active_games.count < max_games
+        http = http_get("/match/accept?id=#{game.challenge_id}")
+        http.callback {
+          attrs = JSON.parse(http.response)
+          game.update_from_game_list(attrs)
+          add_game(game)
+        }
+      else 
+        count = max_games > 1 ? "#{max_games} games" : "1 game"
+        reason = "#{@login} only plays #{count} at a time."
+        puts "Rejecting match: #{reason}"
+        http = http_get("/match/reject?id=#{game.challenge_id}&reason=#{URI.escape(reason)}")
+      end
     end
     
   end

data/lib/goshrine_bot/game.rb

@@ -39,6 +39,7 @@ module GoshrineBot
         #puts "Going to update board"
       when 'resignedBy'
         puts "Game resigned by opponent."
+        self.state = "finished"
         stop_gtp_client
       when 'updateForUndo'
         # TODO - handle undos?
@@ -49,6 +50,7 @@ module GoshrineBot
         # ignore
       when 'gameFinished'
         stop_gtp_client
+        self.state = "finished"
         if m['data'].nil?
           puts "Missing data: #{m.inspect}"
           return
@@ -89,9 +91,9 @@ module GoshrineBot
       end
     end
     
-    def idle_check
-      if @last_gtp_access && @last_gtp_access + 60 < Time.now
-        puts "Shutting down gtp client #{self.token} for idle."
+    def idle_check(timeout)
+      if timeout > 0 && @last_gtp_access && @last_gtp_access + timeout < Time.now
+        puts "Shutting down gtp client #{self.token} after #{timeout} seconds idle."
         stop_gtp_client
       end
     end
@@ -197,13 +199,13 @@ module GoshrineBot
       gtp = GtpStdioClient.new(@client.gtp_cmd_line, "gtp_#{token}.log")
       gtp.boardsize(@board_size)
       gtp.clear_board
-      #if @handicap > 1
-      #  gtp.fixed_handicap(@handicap)
-      #end
-      @handicap_stones.each do |s|
-        puts "Placing handicap stone at #{s}"
-        gtp.play('B', sgf_coord_to_gtp_coord(s, board_size))
+      gtp.komi(@komi)
+      
+      if @handicap_stones.size > 0
+        gtp_coords = @handicap_stones.map {|s| sgf_coord_to_gtp_coord(s, board_size) }
+        gtp.set_free_handicap(gtp_coords.join(" "))
       end
+      
       if @moves
         @moves.each do |m|
           #puts "Going to play #{m.first}, #{m.last}"

data/lib/goshrine_bot/runner.rb

@@ -18,8 +18,9 @@ module GoshrineBot
         :server_url => "http://goshrine.com/",
         :gtp_cmd_line => "gnugo --mode gtp",
         :debug => false,
-        :pid_path => "./goshrine_bot.pid",
-        :log_path => "./goshrine_bot.log",
+        :idle_shutdown_timeout => 60,
+        :maximum_concurrent_games => nil,
+        :pid_path => "./goshrine_bot.pid"
       }
       
       cmd_line_options = parse_options

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goshrine_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000Z
+date: 2011-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70216509102660 !ruby/object:Gem::Requirement
+  requirement: &70281678905860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70216509102660
+  version_requirements: *70281678905860
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70216509101860 !ruby/object:Gem::Requirement
+  requirement: &70281678904480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0.beta.3
   type: :runtime
   prerelease: false
-  version_requirements: *70216509101860
+  version_requirements: *70281678904480
 - !ruby/object:Gem::Dependency
   name: faye
-  requirement: &70216509101240 !ruby/object:Gem::Requirement
+  requirement: &70281678901700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70216509101240
+  version_requirements: *70281678901700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70216509100540 !ruby/object:Gem::Requirement
+  requirement: &70281678900840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70216509100540
+  version_requirements: *70281678900840
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70216509099520 !ruby/object:Gem::Requirement
+  requirement: &70281678899680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70216509099520
+  version_requirements: *70281678899680
 description: The GoShrine bot client is a library that allows you connect a local
   Go playing program that speaks GTP (like gnugo) to http://goshrine.com.
 email: