goshrine_bot 0.1.11 → 0.1.13

data/README.rdoc

@@ -24,6 +24,18 @@ The GTP protocol is documented here: http://www.lysator.liu.se/~gunnar/gtp/
 
 * Run goshrine_bot botname
 
+== ADVANCED CONFIGURATION:
+
+In addition to the options listed above, there are some other configuration options that allow you avoid having your bot shut down for idle, and to limit the maximum number of games your bot will play at a time.
+
+ local_gnugo:
+   :login: gnugo
+   :password: testpass
+   :gtp_cmd_line: gnugo --mode gtp --level 10
+   :idle_shutdown_timeout: 10
+   :maximum_concurrent_games: 1
+   :debug: false
+
 == TROUBLESHOOTING:
 
 Look for a file named something like gtp_08e03daa.log.  An exit status of 255 means that your program could not be found.
@@ -33,6 +45,10 @@ Look for a file named something like gtp_08e03daa.log.  An exit status of 255 me
 * json
 * eventmachine
 
+== THANKS:
+
+Thanks to Gareth Davies for improvements that allow goshrine_bot to run pachi (and likely other bots as well).
+
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -6,7 +6,7 @@
 
 require 'rake'
 require 'rspec/core/rake_task'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 
 task :default => :spec
 
@@ -16,7 +16,7 @@ end
 
 load(File.join(File.dirname(__FILE__), "goshrine_bot.gemspec"))
 
-Rake::GemPackageTask.new(SPEC) do |package|
+Gem::PackageTask.new(SPEC) do |package|
   # do nothing: I just need a gem but this block is required
 end
 

data/goshrine_bot.gemspec

@@ -21,7 +21,7 @@ SPEC = Gem::Specification.new do |s|
   END_DESCRIPTION
 
   s.add_dependency('eventmachine', '>= 0.12.10')
-  s.add_dependency('em-http-request', '>= 1.0.0.beta.3')
+  s.add_dependency('em-http-request', '>= 0.3')
   s.add_dependency('faye', '>= 0.6.0')
   s.add_dependency('json', '>= 1.5.0')
 

data/lib/goshrine_bot/client.rb

@@ -4,11 +4,9 @@ module GoshrineBot
 
   class Client
 
-    class << self
-    end
-
     def initialize(options)
       @base_url = URI::parse(options[:server_url])
+      GoshrineRequest.base_url = @base_url
       @options = options
       @password = options[:password]
       @login = options[:login]
@@ -27,8 +25,8 @@ module GoshrineBot
     
     def login(&blk)
       # login
-      http = http_post('/sessions/create', {'login' => @login, 'password' => @password})
-      http.callback {
+      request = GoshrineRequest.new('/sessions/create').post(:body => {'login' => @login, 'password' => @password})
+      request.callback { |http|
         if http.response_header.status == 401
           puts "Invalid Login or Password"
           EventMachine::stop
@@ -47,38 +45,14 @@ module GoshrineBot
           end
         end
       }
-      http.errback {|response|
+      request.errback { |http|
         puts "Login failed (network issue?)";
       }
     end
-    
-    def http_post(path, data = nil)
-      conn = EM::HttpRequest.new("#{@base_url}#{path}")
-      conn.use CookiePersist
-      headers = {'Accept' => 'application/json'}
-      
-      http = conn.post(:head => headers, :body => data)
-      
-      http.headers { |head|
-        CookiePersist.cookies << head[EM::HttpClient::SET_COOKIE]
-      }
-      http
-    end
-
-    def http_get(path)
-      conn = EM::HttpRequest.new("#{@base_url}#{path}")
-      conn.use CookiePersist
-      
-      http = conn.get(:head => {'Accept' => 'application/json'})
-      
-      http.headers { |head|
-        CookiePersist.cookies << head[EM::HttpClient::SET_COOKIE]
-      }
-      http
-    end
-    
+        
     def subscribe
       @faye_client.subscribe("/user/private/" + @queue_id) do |m|
+        puts "msg"
         msg_type = m["type"]
         case msg_type
         when 'match_requested'
@@ -106,6 +80,7 @@ module GoshrineBot
         load_existing_games {
           if @options[:idle_shutdown_timeout] > 0
             EM::add_periodic_timer( @options[:idle_shutdown_timeout] ) {
+              puts "checking"
               @games.each do |token, game|
                 game.idle_check(@options[:idle_shutdown_timeout])
               end
@@ -116,9 +91,9 @@ module GoshrineBot
     end
 
     def load_existing_games(&blk)
-      http = http_get('/game/active')
-      http.callback {
-        #puts "Got #{response.inspect}"
+      request = GoshrineRequest.new('/game/active').get
+      request.callback { |http|
+        #puts "Got #{http.inspect}"
         games = JSON.parse(http.response)
         puts "#{games.count} game(s) in progress"
         games.each do |game_attrs|
@@ -147,12 +122,12 @@ module GoshrineBot
 
     def handle_match_accept(token)
       game = GameInProgress.new(self)
-      http = http_get("/g/#{token}")
-      http.callback {
+      request = GoshrineRequest.new("/g/#{token}")
+      request.callback { |http|
         attrs = JSON.parse(http.response)
         game.update_from_game_list(attrs)
         add_game(game)
-      }      
+      }
     end
     
     def handle_match_request(request)
@@ -161,8 +136,8 @@ module GoshrineBot
       game = GameInProgress.new(self)
       game.update_from_match_request(request)
       if max_games.nil? || active_games.count < max_games
-        http = http_get("/match/accept?id=#{game.challenge_id}")
-        http.callback {
+        request = GoshrineRequest.new("/match/accept?id=#{game.challenge_id}").get
+        request.callback { |http|
           attrs = JSON.parse(http.response)
           game.update_from_game_list(attrs)
           add_game(game)
@@ -171,7 +146,7 @@ module GoshrineBot
         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)}")
+        GoshrineRequest.new("/match/reject?id=#{game.challenge_id}&reason=#{URI.escape(reason)}").get
       end
     end
     

data/lib/goshrine_bot/cookies.rb

@@ -23,23 +23,24 @@ class CookieHash < Hash #:nodoc:
 end
 
 class CookiePersist
-  def self.cookies
+  
+  def cookies
     Thread.current[:cookies] ||= []
   end
 
-  def self.cookie_hash
+  def cookie_hash
     CookieHash.new.tap { |hsh|
       cookies.uniq.each { |c| hsh.add_cookies(c) }
     }
   end
 
-  def self.request(head, body)
+  def request(client, head, body)
     head['cookie'] = cookie_hash.to_cookie_string
-    #puts "Sending cookies: #{head['cookie']}"
     [head, body]
   end
 
-  def self.response(resp)
+  def response(resp)
+    cookies << resp.response_header[EM::HttpClient::SET_COOKIE]
     resp
   end
 end

data/lib/goshrine_bot/game.rb

@@ -29,7 +29,7 @@ module GoshrineBot
         user_id = m["id"].to_i
         puts "User arrived (#{token}): #{m["login"]}"
         if state == 'new' && (user_id == black_player_id || user_id == white_player_id)
-          http = @client.http_post("/game/#{token}/attempt_start")
+          GoshrineRequest.new("/game/#{token}/attempt_start").post
         end
       when 'game_started'
         self.state = "in-play"
@@ -102,7 +102,7 @@ module GoshrineBot
       puts "Got private game message: #{m.inspect}"
       case m["type"]
       when 'undo_requested'
-        @client.http_post("/game/accept_undo/" + m["request_id"])
+        GoshrineReuqest.new("/game/accept_undo/" + m["request_id"]).post
       end
     end
     
@@ -157,7 +157,7 @@ module GoshrineBot
       end
       
       if state == 'new'
-        http = @client.http_post("/game/#{token}/attempt_start")
+        GoshrineRequest.new("/game/#{token}/attempt_start").post
       end
       
     end
@@ -177,15 +177,16 @@ module GoshrineBot
       res.callback { |response_move|
         puts "Generated move: #{response_move} (#{token})"
         self.move_number += 1
+        request = nil
         if response_move.upcase == 'PASS'
-          http = @client.http_post("/game/#{token}/pass")
+          request = GoshrineRequest.new("/game/#{token}/pass").post
         elsif response_move.upcase == 'RESIGN'
-          http = @client.http_post("/game/#{token}/resign")
+          request = GoshrineRequest.new("/game/#{token}/resign").post
         else
           rgo_coord = gtp_coord_to_goshrine_coord(response_move.upcase, board_size)
-          http = @client.http_post("/game/#{token}/move/#{rgo_coord}")
+          request = GoshrineRequest.new("/game/#{token}/move/#{rgo_coord}").post
         end
-        http.callback {
+        request.callback { |http|
           if http.response_header.status == 200
             self.moves << [my_color, response_move]
           else
@@ -193,7 +194,7 @@ module GoshrineBot
           end
         }
       }
-    end    
+    end
     
     def start_engine
       gtp = GtpStdioClient.new(@client.gtp_cmd_line, "gtp_#{token}.log")

data/lib/goshrine_bot/goshrine_request.rb

@@ -0,0 +1,45 @@
+module GoshrineBot
+
+  class GoshrineRequest
+    
+    def self.base_url=(url)
+      @@base_url = url
+    end
+    
+    def initialize(path)
+      @url = "#{@@base_url}#{path}"
+      @conn = EventMachine::HttpRequest.new(@url)
+      @cookie_persist = CookiePersist.new
+    end
+    
+    def do_http(verb,options)
+      puts "Sending"
+      options[:head] = 
+        {'Accept' => 'application/json', 
+         'cookie' => @cookie_persist.cookie_hash.to_cookie_string}
+  
+      http = @conn.send verb, options
+      
+      defer = EM::DefaultDeferrable.new
+      http.callback {
+        puts "Persisting cookies"
+        @cookie_persist.cookies << http.response_header[EM::HttpClient::SET_COOKIE]
+        defer.succeed(http)
+      }
+      http.errback {
+        puts "failed goshrine request"
+        defer.fail(http)
+      }
+      defer
+    end
+    
+    def post(options = {})
+      do_http(:post, options)
+    end
+    
+    def get(options = {})
+      do_http(:get, options)
+    end
+  end
+  
+end

data/lib/goshrine_bot.rb

@@ -7,7 +7,7 @@ require 'logger'
 
 module GoshrineBot
 
-  VERSION = "0.1.11"
+  VERSION = "0.1.13"
 
   STDOUT.sync = true
   
@@ -15,6 +15,7 @@ module GoshrineBot
   
   %w[ client
       gtp_stdio_client
+      goshrine_request
       runner
       game
       cookies

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goshrine_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-04 00:00:00.000000000Z
+date: 2011-12-15 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70281678905860 !ruby/object:Gem::Requirement
+  requirement: &70254337655960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70281678905860
+  version_requirements: *70254337655960
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70281678904480 !ruby/object:Gem::Requirement
+  requirement: &70254337655480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.3
+        version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70281678904480
+  version_requirements: *70254337655480
 - !ruby/object:Gem::Dependency
   name: faye
-  requirement: &70281678901700 !ruby/object:Gem::Requirement
+  requirement: &70254337655020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70281678901700
+  version_requirements: *70254337655020
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70281678900840 !ruby/object:Gem::Requirement
+  requirement: &70254337654560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70281678900840
+  version_requirements: *70254337654560
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281678899680 !ruby/object:Gem::Requirement
+  requirement: &70254337654180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70281678899680
+  version_requirements: *70254337654180
 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:
@@ -91,6 +91,7 @@ files:
 - lib/goshrine_bot/core_ext/hash.rb
 - lib/goshrine_bot/faye_auth_ext.rb
 - lib/goshrine_bot/game.rb
+- lib/goshrine_bot/goshrine_request.rb
 - lib/goshrine_bot/gtp_stdio_client.rb
 - lib/goshrine_bot/runner.rb
 homepage: http://github.com/ps2/goshrine_bot
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: A client to connect GTP go programs to GoShrine