chess 0.0.3 → 0.0.4

data/lib/chess/gnuchess.rb

@@ -1,35 +1,54 @@
 module Chess
 
   # Use Gnuchess to I.A. <em>(Only a draft)</em>
-  # To use this module, extend a game object with Chess::Gnuchess
+  # To use this module, extend a game object with Chess::Gnuchess.
+  # Gnuchess binary have to be installed.
   #
   #    g = Chess::Game.new
   #    g.extend Chess::Gnuchess
-  #    g.gnuchess_move
+  #    g.gnuchess_move!
   #    puts g
   module Gnuchess
 
-    # Make a move using Gnuchess engine. This add a new Board in the Game.
     # Return the next move calculated by Gnuchess.
     # Gnuchess must be installed!
     def gnuchess_move
       pipe = IO.popen('gnuchess -x', 'r+')
       begin
-        pipe.write("depth 1\n")
-        pipe.write("force\n")
+        pipe.puts('depth 1')
+        pipe.puts('manual')
         self.full_moves.each do |m|
-          pipe.write(m + "\n")
+          pipe.puts(m)
         end
-        pipe.write("go\n")
+        pipe.puts('go')
         while line = pipe.gets
           raise IllegalMoveError if line.include?('Invalid move')
-          match = line.match(/My move is : ([a-h][1-8][a-h][1-8])/)
-          return self.move(match[1]) if match
+          match = line.match(/My move is : ([a-h][1-8][a-h][1-8][rkbq]?)/)
+          return match[1] if match
         end
       ensure
-        pipe.write("quit\n")
+        pipe.puts('quit')
         pipe.close
       end
+      return moves
+    end
+
+    # Make a move using Gnuchess engine. This add a new Board in the Game.
+    # Return the next move calculated by Gnuchess.
+    # Gnuchess must be installed!
+    def gnuchess_move!
+      next_move = self.gnuchess_move
+      self.move(next_move) if next_move
+    end
+
+    # :nodoc:
+    def self.included(mod)
+      raise_if_gnuchess_is_not_installed
+    end
+
+    # :nodoc:
+    def self.extended(mod)
+      raise_if_gnuchess_is_not_installed
     end
 
     # :nodoc:
@@ -51,10 +70,10 @@ module Chess
             elsif line =~ / : resign/
               break
             elsif line =~ / : 1-0 {White mates}/
-              done = :white_wins
+              done = :white_won
               break
             elsif line =~ / : 0-1 {Black mates}/
-              done = :black_wins
+              done = :black_won
               break
             elsif m = line.match(/1\/2-1\/2 {(.*?)}/)
               case m[1]
@@ -87,6 +106,14 @@ module Chess
       system('which gnuchess >& /dev/null')
       $?.exitstatus == 0
     end
+
+    # Raise an exception if Gnuchess is not installed
+    def self.raise_if_gnuchess_is_not_installed
+      unless gnuchess_installed?
+        raise 'You need to install Gnuchess to use the module Chess::Gnuchess.'
+      end
+    end
+
   end
 
 end

data/lib/chess/pgn.rb

@@ -22,11 +22,12 @@ module Chess
       TAGS.each do |t|
         instance_variable_set("@#{t}", data.match(/^\[#{t.capitalize} ".*"\]\s?$/).to_s.strip[t.size+3..-3])
       end
+      @result = '1/2-1/2' if @result == '1/2'
       game_index = data.index(/^1\./)
       raise Chess::InvalidPgnFormatError.new(filename) if game_index.nil?
       game = data[game_index..-1].strip
       @moves = game.gsub("\n", ' ').split(/\d+\./).collect{|t| t.strip}[1..-1].collect{|t| t.split(' ')}.flatten
-      @moves.delete_at(@moves.size-1) if @moves.last =~ /(0\-1)|(1\-0)|(1\/2)|(1\/2\-1\/2)|(\*)/
+      @moves.delete_at(@moves.size-1) if @moves.last =~ /(0-1)|(1-0)|(1\/2)|(1\/2-1\/2)|(\*)/
       return self
     end
 

data/lib/chess/version.rb

@@ -1,5 +1,5 @@
 # The Chess library module.
 module Chess
   # The library version.
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end