kayabot 0.1.0 → 0.1.1

data/README.markdown

@@ -1,16 +1,20 @@
 This is the official Gem to run a bot in Kaya.
 
-Right now only gnubot is default and has to be installed. 
 
 Feel free to expand the gem to allow other bots with GTP interface, should work plug-play easily.
 
+Requirements:
 
-On Ubuntu:
-   sudo apt-get install gnugo
+   gnugo
+   ruby 1.9.2
+   rubygems
 
 To install :
+
     gem install kayabot
+
 To run:
+
     kayabot my_configuration.yaml
 
 The configuration yaml must look like this:

data/bin/kayabot

@@ -17,11 +17,13 @@ if ARGV.length > 0
     config_file = ARGV.first
     if File.exists?(config_file)
       config = YAML.load_file(config_file)
-      if config["url"] && config["user"] && config["pass"]
-        k = KayaBot.new(config["url"], config["user"], config["pass"])
+      if config["url"] && config["user"] && config["pass"] && config["title"] && config["size"]
+        sz = config["size"].to_i
+        raise "Invalid size!. only 9,13,19 are supported" unless sz == 9 || sz == 13 || sz == 19
+        k = KayaBot.new(config)
         k.listener_loop
       else
-        puts "Invalid config file."
+        puts "Invalid config file. url,user, pass, title, size required."
       end
     else
       puts "File does not exist."

data/kayabot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "kayabot"
-  s.version           = "0.1.0"
+  s.version           = "0.1.1"
   s.summary           = "Interface to run Go Bots on Kaya"
   s.description       = "This is an interface to run GTP compliant Go Bots on Kaya."
   s.authors           = ["Gabriel Benmergui"]

data/lib/gg.rb

@@ -40,8 +40,22 @@ class GTP
 
   def list_stones(color)
     @io.puts [:list_stones, color].join(" ")
-    result = @io.take_while { |line| line != "\n" }.join
-    return result.sub(/^=\s/, "").sub(/\n/, "")
+    return self.clean_gtp_response
+  end
+
+  def final_score()
+    @io.puts [:final_score]
+    return self.clean_gtp_response
+  end
+
+  def list_dead_stones()
+    @io.puts [:final_status_list, "dead"].join(" ")
+    return self.clean_gtp_response
+  end
+
+  def clean_gtp_response()
+    response = @io.take_while { |line| line != "\n" }.join(" ")
+    return response.sub(/^=\s+/, "")
   end
 
   def send_command(command, *arguments)
@@ -72,9 +86,16 @@ def score_game(game_id, game_sgf)
   IO.popen("gnugo --score aftermath #{filepath}") do |f|
     re = f.read
   end
+  dead_stones = ""
+  GTP.run("gnugo") do |gtp|
+    gtp.loadsgf filepath
+    dead_stones = gtp.list_dead_stones
+  end
+
+  p dead_stones
 
   File.delete(filepath)
-  return re
+  return {:score => re, :dead_stones => dead_stones}
 end
 
 # return a move coordinates, such as "c17", or "PASS", or "resign"
@@ -93,25 +114,29 @@ def ai_move(game_id, game_sgf, color)
   if color == 'black' || color == 'white'
     game_bot = 'gnugo'
   end
+  size = 19
   GTP.run(game_bot) do |gtp|
     gtp.loadsgf filepath
+    size = gtp.send_command(:query_boardsize)
     re = gtp.genmove color
   end
   p re
-  move = convert_move(re)
+  p size
+  move = convert_move(re,size)
 
   File.delete(filepath)
   return move
 end
 
 #switches GTP move into sgf-like coordinate
-def convert_move(move)
+def convert_move(move, size=19)
   if move == "PASS"
     return 'pass'
   elsif move == "resign"
     return 'resign'
   else
-    alphabet = "ABCDEFGHIJKLMNOPQRS"
+    alphabet = "ABCDEFGHIJKLMNOPQRS"[0..size.to_i - 1]
+    sgf_alphabet = "ABCDEFGHJKLMNOPQRST"[0..size.to_i - 1]
     return alphabet["ABCDEFGHJKLMNOPQRST".index(move[0])].downcase + alphabet.reverse[(move[1].to_s + move[2].to_s).to_i - 1].downcase
   end
 end

data/lib/kayabot.rb

@@ -11,31 +11,36 @@ class KayaBot
   OPEN_GAME_URL = "/bot/open_game"
   RESIGN_URL = "/bot/resign"
   SCORE_URL = "/bot/score"
+  VERSION = "0.1.1"#Gem::Specification.find_by_name("kayabot").version.to_s
 
   attr_accessor :challenger, :status, :move
 
-  def initialize(server_url, user, pass)
-    @server_url = server_url
-    @user = user
-    @pass = pass
+  def initialize(config)
+    p config
+    @server_url = config["url"]
+    @user = config["user"]
+    @pass = config["pass"]
+    @size = config["size"]
+    @title = config["title"]
     @agent = Mechanize.new
     @status
     @sgf
   end
 
   def game_configuration
-     {:title => "Come at me bro"}
+     {:title => @title || "Come at me bro", :size => @size || 19}
   end
 
   def connect
+    return if @agent.cookies.last && @agent.cookies.last.name == "rack.session"
     page = @agent.post(@server_url+ "/session/create", {:id => @user, :password => @pass})
   end
 
   TIME_LAPSE = 4
 
   def listener_loop
-    connect
     while (true) do
+      connect
       fetch_and_parse_data
       open_game if @status=="connected" || @status=="finished"
       post_score if @status=="scoring"
@@ -45,7 +50,7 @@ class KayaBot
   end
 
   def fetch_and_parse_data
-     page = @agent.get(@server_url + "/bot/status")
+     page = @agent.get(@server_url + "/bot/status", {:version => VERSION })
      json = JSON.parse(page.body)
      p json
      @status = json["status"]
@@ -76,12 +81,12 @@ class KayaBot
   def resign
     @agent.post(@server_url+ RESIGN_URL, {:result => "resign"})
   end
+
   def post_score
     result = score_game("temp", sgf_content)
     p result
-    @agent.post(@server_url+ SCORE_URL, {:score => parse_result_from_bot(result)})
+    @agent.post(@server_url+ SCORE_URL, {:score => parse_result_from_bot(result[:score]), :dead_stones => result[:dead_stones]})
   end
-
   #Black wins by 61.5 points
   def parse_result_from_bot(result)
     color = result[0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kayabot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -54,10 +54,10 @@ files:
 - README.markdown
 - LICENSE
 - Rakefile
-- lib/kayabot.rb
 - lib/node.rb
-- lib/sgf.rb
 - lib/gg.rb
+- lib/sgf.rb
+- lib/kayabot.rb
 - kayabot.gemspec
 - bin/kayabot
 homepage: http://github.com/conanbatt/OpenKaya
@@ -80,7 +80,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Interface to run Go Bots on Kaya