goshrine_bot 0.1.13 → 0.2.0

data/goshrine_bot.gemspec

@@ -14,7 +14,7 @@ SPEC = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.authors = ["Pete Schwamb"]
   s.email = ["pete@schwamb.net"]
-  s.homepage = "http://github.com/ps2/goshrine_bot"
+  s.homepage = "http://github.com/goshrine/goshrine_bot"
   s.summary = "A client to connect GTP go programs to GoShrine"
   s.description = <<-END_DESCRIPTION.gsub(/\s+/, " ").strip
   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.

data/lib/goshrine_bot.rb

@@ -1,13 +1,13 @@
 require 'rubygems'
 require 'json'
+require 'faye'
 require 'eventmachine'
 require 'em-http'
-require 'faye'
 require 'logger'
 
 module GoshrineBot
 
-  VERSION = "0.1.13"
+  VERSION = "0.2.0"
 
   STDOUT.sync = true
   

data/lib/goshrine_bot/client.rb

@@ -80,7 +80,6 @@ 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

data/lib/goshrine_bot/game.rb

@@ -57,6 +57,9 @@ module GoshrineBot
         elsif m['data']['scoring_info'].nil?
           puts "Missing scoring_info: #{m.inspect}"
           return
+        elsif m['data']['scoring_info']['score'].nil?
+          puts "Missing score (game_id = #{game_id}): #{m.inspect}"
+          return
         end
         score = m['data']['scoring_info']['score']
         winner = score['black'] > score['white'] ? 'B' : 'W'
@@ -77,17 +80,24 @@ module GoshrineBot
       color = m["color"].upcase
       if pos && color && color != my_color
         pos = sgf_coord_to_gtp_coord(pos, board_size)
-        puts "Received move #{pos}"
-        gtp_client.time_left("B", m["black_seconds_left"], 0).callback {
-          gtp_client.time_left("W", m["white_seconds_left"], 0).callback {
-            gtp_client.play(color, pos).callback {
-              self.moves << [color, pos]
-              self.move_number = m["move_number"].to_i
-              self.turn = m["color"] == "b" ? "w" : "b"
-              make_move
+        move_proc = Proc.new do
+          gtp_client.play(color, pos).callback {
+            self.moves << [color, pos]
+            self.move_number = m["move_number"].to_i
+            self.turn = m["color"] == "b" ? "w" : "b"
+            puts "Going to make move..."
+            make_move
+          }
+        end
+        if m["black_seconds_left"] && m["white_seconds_left"]
+          gtp_client.time_left("B", m["black_seconds_left"] || 0, 0).callback {
+            gtp_client.time_left("W", m["white_seconds_left"] || 0, 0).callback {
+              move_proc.call
             }
           }
-        }
+        else
+          move_proc.call
+        end
       end
     end
     

data/lib/goshrine_bot/goshrine_request.rb

@@ -13,7 +13,6 @@ module GoshrineBot
     end
     
     def do_http(verb,options)
-      puts "Sending"
       options[:head] = 
         {'Accept' => 'application/json', 
          'cookie' => @cookie_persist.cookie_hash.to_cookie_string}
@@ -22,7 +21,6 @@ module GoshrineBot
       
       defer = EM::DefaultDeferrable.new
       http.callback {
-        puts "Persisting cookies"
         @cookie_persist.cookies << http.response_header[EM::HttpClient::SET_COOKIE]
         defer.succeed(http)
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goshrine_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000Z
+date: 2012-05-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70254337655960 !ruby/object:Gem::Requirement
+  requirement: &70320125116620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *70254337655960
+  version_requirements: *70320125116620
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70254337655480 !ruby/object:Gem::Requirement
+  requirement: &70320125116140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70254337655480
+  version_requirements: *70320125116140
 - !ruby/object:Gem::Dependency
   name: faye
-  requirement: &70254337655020 !ruby/object:Gem::Requirement
+  requirement: &70320125115680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254337655020
+  version_requirements: *70320125115680
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70254337654560 !ruby/object:Gem::Requirement
+  requirement: &70320125115220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70254337654560
+  version_requirements: *70320125115220
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70254337654180 !ruby/object:Gem::Requirement
+  requirement: &70320125114840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254337654180
+  version_requirements: *70320125114840
 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:
@@ -94,7 +94,7 @@ files:
 - 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
+homepage: http://github.com/goshrine/goshrine_bot
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -114,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A client to connect GTP go programs to GoShrine