goshrine_bot 0.1.1 → 0.1.5

data/.rvmrc

@@ -0,0 +1 @@
+rvm ruby-1.9.2-p180

data/README.rdoc

@@ -15,13 +15,12 @@ The GTP protocol is documented here: http://www.lysator.liu.se/~gunnar/gtp/
 
 * Create a normal account on goshrine for your bot.
 * Email feedback@goshrine.com with the account name, and request that it be changed to a bot account.
-* Edit goshrine_bot.yml with your account info.
-* Create a database.yml file in the following format:
+* Create a goshrine_bot.yml file in the following format, substituting your bot's login info :
 
-botname:
-  :login: yourbotlogin
-  :password: yourbotpassword
-  :gtp_cmd_line: gnugo --mode gtp --level 1
+ botname:
+   :login: yourbotlogin
+   :password: yourbotpassword
+   :gtp_cmd_line: gnugo --mode gtp --level 1
 
 * Run goshrine_bot botname
 

data/TODO.txt

@@ -1,2 +1,3 @@
 
-* Shutdown idle engines (to be restarted later) to save on resources.
+* Shutdown idle engines (to be restarted later) to save on resources.
+

data/goshrine_bot.gemspec

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

data/goshrine_bot.yml

@@ -1,5 +1,23 @@
-botname:
-  :login: yourbotlogin
-  :password: yourbotpass
+gnugo:
+  :login: gnugo
+  :password: atk2sih
+  :gtp_cmd_line: gnugo --mode gtp
+
+easy_gnugo:
+  :login: EasyGnuGo
+  :password: jasj308jrke
+  :gtp_cmd_line: gnugo --mode gtp --level 1
+  :debug: false
+
+local_gnugo:
+  :server_url: http://localhost:5730
+  :login: gnugo
+  :password: testpass
   :gtp_cmd_line: gnugo --mode gtp --level 1
+  :debug: false
 
+mogo:
+  :login: mogo
+  :password: a0ij45o3i
+  :gtp_cmd_line: /home/pete/MoGo_release3/mogo --19 --dontDisplay 1
+  :debug: false

data/lib/goshrine_bot/client.rb

@@ -1,4 +1,3 @@
-
 module GoshrineBot
 
   class Client
@@ -13,7 +12,6 @@ module GoshrineBot
       @login = options[:login]
       @gtp_cmd_line = options[:gtp_cmd_line]
       @connected = false
-      @cookie = ""
       @games = {}
     end
     
@@ -25,30 +23,19 @@ module GoshrineBot
       @my_user_id
     end
     
-    def parse_cookie(headers)
-      cookies = []
-      headers.each do |h|
-        if h.match(/^Set-Cookie: /)
-          pieces = h[12..-1].split("=")
-          cookies << "#{pieces[0]}=#{pieces[1].split(";").first}";
-        end
-      end
-      @cookie = cookies.join("; ") + ';'
-    end
-
     def login(&blk)
       # login
       http = http_post('/sessions/create', {'login' => @login, 'password' => @password})
-      http.callback {|response|
-        #puts "login returned: #{response[:status]}"
-        if response[:status].to_i == 401
+      http.callback {
+        if http.response_header.status == 401
           puts "Invalid Login or Password"
           EventMachine::stop
         else
-          parse_cookie(response[:headers])
-          user = JSON.parse(response[:content])
+          user = JSON.parse(http.response)
+          puts "Got #{user.inspect}"
           @queue_id = user['queue_id']
           @my_user_id = user['id']
+          @faye_token = user['faye_token']
           if user['user_type'] != 'bot'
             puts "Account #{user['login']} is not registered as a robot!"
             EventMachine::stop
@@ -63,36 +50,33 @@ module GoshrineBot
       }
     end
     
-    def http_post(url, data = nil)
-      headers = {'Accept' => 'application/json', :cookie => @cookie}
-      if data.is_a? Hash
-        data = data.to_params        
-        contenttype = "application/x-www-form-urlencoded"
-      else
-        contenttype = "application/octet-stream"
-      end
-      #puts "Posting #{data}"
-      GoshrineBot::HttpClient.request(
-        :host => @base_url.host,
-        :port => @base_url.port,
-        :contenttype => contenttype,
-        :request => url,
-        :verb => 'POST',
-        :content => data,
-        :custom_headers => headers)
+    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(url)
-      headers = {'Accept' => 'application/json', :cookie => @cookie}
-      GoshrineBot::HttpClient.request(
-        :host => @base_url.host,
-        :port => @base_url.port,
-        :request => url,
-        :custom_headers => headers)
+    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
-      @client.subscribe("/user/private/" + @queue_id) do |m|
+      @faye_client.subscribe("/user/private/" + @queue_id) do |m|
         msg_type = m["type"]
         case msg_type
         when 'match_requested'
@@ -104,14 +88,18 @@ module GoshrineBot
         end
         #@msg_queue_in.push(doc)
       end
-      @client.subscribe("/room/1") do |m|
+      @faye_client.subscribe("/room/1") do |m|
         #@msg_queue_in.push(doc)
       end
     end
 
     def run
       login {
-        @client = Faye::Client.new((@base_url + '/events').to_s, :timeout => 120, :cookie => @cookie)
+        puts "Starting faye client"
+        @faye_client = Faye::Client.new((@base_url + '/events').to_s, :cookie => @cookie)
+        if @faye_token
+          @faye_client.add_extension(FayeAuthExt.new(@my_user_id, @faye_token))
+        end
         subscribe          
         load_existing_games {
           EM::add_periodic_timer( 60 ) {
@@ -125,10 +113,9 @@ module GoshrineBot
 
     def load_existing_games(&blk)
       http = http_get('/game/active')
-      http.callback {|response|
+      http.callback {
         #puts "Got #{response.inspect}"
-        parse_cookie(response[:headers])
-        games = JSON.parse(response[:content])
+        games = JSON.parse(http.response)
         puts "#{games.count} game(s) in progress"
         games.each do |game_attrs|
           game = GameInProgress.new(self)
@@ -146,10 +133,10 @@ module GoshrineBot
     def add_game(game)
       @games[game.game_id] = game
       game.make_move # does nothing if its not our turn, or the game is not started
-      @client.subscribe("/game/private/" + game.token + '/' + @queue_id) do |m|
+      @faye_client.subscribe("/game/private/" + game.token + '/' + @queue_id) do |m|
         game.private_message(m)
       end
-      @client.subscribe("/game/play/" + game.token) do |m|
+      @faye_client.subscribe("/game/play/" + game.token) do |m|
         game.play_message(m)
       end
     end
@@ -157,8 +144,8 @@ module GoshrineBot
     def handle_match_accept(token)
       game = GameInProgress.new(self)
       http = http_get("/g/#{token}")
-      http.callback {|response|
-        attrs = JSON.parse(response[:content])
+      http.callback {
+        attrs = JSON.parse(http.response)
         game.update_from_game_list(attrs)
         add_game(game)
       }      
@@ -168,8 +155,8 @@ module GoshrineBot
       game = GameInProgress.new(self)
       game.update_from_match_request(request)
       http = http_get("/match/accept?id=#{game.challenge_id}")
-      http.callback {|response|
-        attrs = JSON.parse(response[:content])
+      http.callback {
+        attrs = JSON.parse(http.response)
         game.update_from_game_list(attrs)
         add_game(game)
       }

data/lib/goshrine_bot/cookies.rb

@@ -0,0 +1,45 @@
+# Borrowed from HTTParty, a great rubygem from John Nunemaker (thanks!)
+class CookieHash < Hash #:nodoc:
+  CLIENT_COOKIES = %w{path expires domain path secure HTTPOnly HttpOnly}
+  
+  def add_cookies(value)
+    case value
+    when Hash
+      merge!(value)
+    when String
+      value.split('; ').each do |cookie|
+        array = cookie.split('=')
+        self[array[0].to_sym] = array[1]
+      end
+    else
+      raise "add_cookies only takes a Hash or a String"
+    end
+  end
+
+  def to_cookie_string
+    delete_if { |k, v| CLIENT_COOKIES.include?(k.to_s) }.collect { |k, v| "#{k}=#{v}" }.join("; ")
+  end
+end
+
+class CookiePersist
+  def self.cookies
+    Thread.current[:cookies] ||= []
+  end
+
+  def self.cookie_hash
+    CookieHash.new.tap { |hsh|
+      cookies.uniq.each { |c| hsh.add_cookies(c) }
+    }
+  end
+
+  def self.request(head, body)
+    head['cookie'] = cookie_hash.to_cookie_string
+    #puts "Sending cookies: #{head['cookie']}"
+    [head, body]
+  end
+
+  def self.response(resp)
+    resp
+  end
+end
+

data/lib/goshrine_bot/faye_auth_ext.rb

@@ -0,0 +1,17 @@
+class FayeAuthExt
+  def initialize(user_id, token)
+    @user_id = user_id
+    @token = token
+  end
+  
+  def outgoing(message, callback)
+    # Add ext field if it's not present
+    message['ext'] ||= {}
+
+    # Set the auth token
+    message['ext']['authToken'] = "#{@user_id}:#{@token}"
+
+    # Carry on and send the message to the server
+    callback.call(message)
+  end
+end

data/lib/goshrine_bot/faye_transport_patch.rb

@@ -0,0 +1,43 @@
+require 'em-http'
+require 'em-http/version'
+require 'json'
+require 'uri'
+
+module Faye
+  
+  class HttpTransport < Transport
+    
+    def request(message, timeout)
+      retry_block = retry_block(message, timeout)
+      
+      content = JSON.unparse(message)
+      params = {
+        :head => {
+          'Content-Type'    => 'application/json',
+          'host'            => URI.parse(@endpoint).host,
+          'Content-Length'  => content.length
+        },
+        :body    => content,
+        :timeout => -1  # for em-http-request < 1.0
+      }
+      if EventMachine::HttpRequest::VERSION.split('.')[0].to_i >= 1
+        options = {   # for em-http-request >= 1.0
+          :inactivity_timeout => 0,    # connection inactivity (post-setup) timeout (0 = disable timeout)
+        }
+        request = EventMachine::HttpRequest.new(@endpoint, options).post(params)
+      else
+        request = EventMachine::HttpRequest.new(@endpoint).post(params)
+      end
+      request.callback do
+        begin
+          receive(JSON.parse(request.response))
+        rescue
+          retry_block.call
+        end
+      end
+      request.errback { retry_block.call }
+    end
+  end
+  
+end
+

data/lib/goshrine_bot/game.rb

@@ -38,7 +38,7 @@ module GoshrineBot
         handle_move(m["data"])
         #puts "Going to update board"
       when 'resignedBy'
-        puts "Game resigned by #{m["data"]}"
+        puts "Game resigned by opponent."
         stop_gtp_client
       when 'updateForUndo'
         # TODO - handle undos?
@@ -180,8 +180,8 @@ module GoshrineBot
           rgo_coord = gtp_coord_to_goshrine_coord(response_move.upcase, board_size)
           http = @client.http_post("/game/#{token}/move/#{rgo_coord}")
         end
-        http.callback {|response|
-          if response[:status] == 200
+        http.callback {
+          if http.response_header.status == 200
             self.moves << [my_color, response_move]
           else
             puts "Could not make move: #{response.inspect}"

data/lib/goshrine_bot/runner.rb

@@ -49,7 +49,7 @@ module GoshrineBot
     end
     
     def start
-      puts "Starting GoShrine bot client: #{options[:bot_name]}."
+      puts "Starting GoShrine (v#{GoshrineBot::VERSION}) bot client: #{options[:bot_name]}."
       
       client = Client.new(options)
       client.run      

data/lib/goshrine_bot.rb

@@ -1,10 +1,13 @@
 require 'rubygems'
 require 'json'
 require 'eventmachine'
+require 'em-http'
+require 'faye'
+require 'logger'
 
 module GoshrineBot
 
-  VERSION = "0.1.1"
+  VERSION = "0.1.5"
 
   STDOUT.sync = true
   
@@ -14,12 +17,15 @@ module GoshrineBot
       gtp_stdio_client
       runner
       game
-      core_ext/hash
-      faye
-      httpclient
-      
+      cookies
+      faye_transport_patch
+      faye_auth_ext
+      core_ext/hash      
   ].each do |lib|
     require File.join(ROOT, 'goshrine_bot', lib)
   end
 
+  #Faye.logger = Logger.new(STDOUT)
+  #Faye::Logging.log_level = :debug
+
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: goshrine_bot
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
+  prerelease: 
+  version: 0.1.5
 platform: ruby
 authors: 
 - Pete Schwamb
@@ -14,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -05:00
-default_executable: 
+date: 2011-05-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -25,41 +20,53 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 10
         version: 0.12.10
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: em-http-request
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+        version: 1.0.0.beta.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: faye
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
+        version: 0.5.5
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 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: 
 - pete@schwamb.net
@@ -70,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .rvmrc
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -80,23 +88,13 @@ files:
 - goshrine_bot.yml
 - lib/goshrine_bot.rb
 - lib/goshrine_bot/client.rb
+- lib/goshrine_bot/cookies.rb
 - lib/goshrine_bot/core_ext/hash.rb
-- lib/goshrine_bot/faye.rb
-- lib/goshrine_bot/faye/channel.rb
-- lib/goshrine_bot/faye/client.rb
-- lib/goshrine_bot/faye/connection.rb
-- lib/goshrine_bot/faye/error.rb
-- lib/goshrine_bot/faye/grammar.rb
-- lib/goshrine_bot/faye/namespace.rb
-- lib/goshrine_bot/faye/rack_adapter.rb
-- lib/goshrine_bot/faye/server.rb
-- lib/goshrine_bot/faye/timeouts.rb
-- lib/goshrine_bot/faye/transport.rb
+- lib/goshrine_bot/faye_auth_ext.rb
+- lib/goshrine_bot/faye_transport_patch.rb
 - lib/goshrine_bot/game.rb
 - lib/goshrine_bot/gtp_stdio_client.rb
-- lib/goshrine_bot/httpclient.rb
 - lib/goshrine_bot/runner.rb
-has_rdoc: true
 homepage: http://github.com/ps2/goshrine_bot
 licenses: []
 
@@ -110,21 +108,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: A client to connect GTP go programs to GoShrine