kayabot 0.1.6 → 0.1.7

data/kayabot.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name              = "kayabot"
-  s.version           = "0.1.6"
+  s.version           = "0.1.7"
   s.summary           = "Interface to run Go Bots on Kaya"
-  s.description       = "This is an interface to run GTP compliant Go Bots on Kaya."
+  s.description       = "This is an interface to run GTP compliant Go Bots on Kaya. "
   s.authors           = ["Gabriel Benmergui"]
   s.email             = ["gabriel.benmergui@kaya.gs"]
   s.homepage          = "http://github.com/conanbatt/OpenKaya"
 
   s.executables.push("kayabot")
 
-  s.add_dependency("mechanize")
+  s.add_dependency("mechanize", '= 1.0.0')
   s.add_dependency("json")
 
   s.files = Dir[

data/lib/gg.rb

@@ -1,10 +1,14 @@
 class GTP
 
   def self.run(bot_type, &command)
+    
     if bot_type == 'gnugo'
       new(IO.popen("gnugo --mode gtp", "r+"), &command)
     elsif bot_type == 'fuego'
       new(IO.popen("fuego", "r+"), &command)
+    else
+      ## All falls here to accept commands from the yaml directly 
+      new(IO.popen(bot_type, "r+"), &command) 
     end
   end
 
@@ -37,6 +41,10 @@ class GTP
     send_command(:loadsgf, path)
   end
 
+  def score(path)
+    send_command(:score, "aftermath", path)
+  end
+
   def list_stones(color)
     @io.puts [:list_stones, color].join(" ")
     return self.clean_gtp_response
@@ -70,7 +78,7 @@ class GTP
   end
 end
 
-SGF_FILE_PATH = "gnugo_games/"
+SGF_FILE_PATH = "bot_games/"
 
 def score_game(game_id, game_sgf)
   re = nil
@@ -81,14 +89,12 @@ def score_game(game_id, game_sgf)
   File.open(filepath, "w") do |f|
     f.write game_sgf
   end
-
-  IO.popen("gnugo --score aftermath #{filepath}") do |f|
-    re = f.read
-  end
+  
   dead_stones = ""
-  GTP.run("gnugo") do |gtp|
+  GTP.run(@bot) do |gtp|
     gtp.loadsgf filepath
     dead_stones = gtp.list_dead_stones
+    re = gtp.final_score
   end
 
   p dead_stones
@@ -110,13 +116,12 @@ def ai_move(game_id, game_sgf, color)
   end
 
   size = 19
-  GTP.run(@bot || "gnugo") do |gtp|
+  GTP.run(@bot) do |gtp|
     gtp.loadsgf filepath
     size = @master_node.match(/SZ\[(\d+)\]/)[1]
     re = gtp.genmove color
   end
-  p re
-  p size
+  p "Bot generated #{re}"
   move = convert_move(re,size)
 
   File.delete(filepath)
@@ -125,12 +130,13 @@ end
 
 #switches GTP move into sgf-like coordinate
 def convert_move(move, size=19)
-  if move == "PASS"
+  if move.downcase == "pass"
     return 'pass'
-  elsif move == "resign"
+  elsif move.downcase == "resign"
     return 'resign'
   else
 
+
     alphabet = "ABCDEFGHIJKLMNOPQRS"[0..size.to_i - 1]
 	  	
     sgf_alphabet = "ABCDEFGHJKLMNOPQRST"[0..size.to_i - 1]

data/lib/kayabot.rb

@@ -13,6 +13,8 @@ class KayaBot
   SCORE_URL = "/bot/score"
   VERSION =  Gem::Specification.find_by_name("kayabot").version.to_s
 
+  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+
   attr_accessor :challenger, :status, :move
 
   def initialize(config)
@@ -24,7 +26,7 @@ class KayaBot
     @title = config["title"]
     @bot = config["bot"]
     @agent = Mechanize.new
-    @status
+    @error_limit = 3
     @sgf
   end
 
@@ -40,13 +42,23 @@ class KayaBot
   TIME_LAPSE = 4
 
   def listener_loop
-    while (true) do
-      connect
-      fetch_and_parse_data
-      open_game if @status=="connected" || @status=="finished"
-      post_score if @status=="scoring"
-      post_move if @bots_turn && @status=="playing"
-      sleep TIME_LAPSE #lets not explode in requests
+    begin 
+      while (true) do
+        connect
+        fetch_and_parse_data
+        open_game if @status=="connected" || @status=="finished"
+        post_score if @status=="scoring"
+        post_move if @bots_turn && @status=="playing"
+        sleep TIME_LAPSE #lets not explode in requests
+      end
+    rescue SystemExit, Interrupt
+      raise
+    rescue Exception => e
+      p "There was an error. Will try to run again. If problems persist, contact Kaya at info@kaya.gs"
+      p e
+      p e.backtrace[0]
+      sleep 5
+      listener_loop
     end
   end
 
@@ -75,7 +87,6 @@ class KayaBot
       bot_move = ";#{color_short}[#{bot_move}]#{color_short}L[#{(25*60) - (@move ? @move.count(";") : 1)}]"
       @agent.post(@server_url+ PLAY_URL,
                   :move => bot_move)
-      #@sgf.add_move(bot_move)
       @move = nil
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kayabot
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: This is an interface to run GTP compliant Go Bots on Kaya.
+description: ! 'This is an interface to run GTP compliant Go Bots on Kaya. '
 email:
 - gabriel.benmergui@kaya.gs
 executables: