Refactored the play loop.

Author: istateside

chess.rb

@@ -7,7 +7,7 @@ def initialize(white, black)
     @player1 = white
     @player2 = black
     @move_count = 0
-    @curr_player = :w
+    @curr_player = @player1
   end
 
   def play
@@ -16,35 +16,23 @@ def play
     until @board.checkmate?(:w) || @board.checkmate?(:b)
       system('clear')
       @board.display
-      if @move_count.even?
-        begin
-          puts "Check." if @board.in_check?(:w)
-          puts "Player 1:"
-          start, target = @player1.play_turn
-          make_move(:w, start, target)
-        rescue RuntimeError => e
-          puts e.message
-          puts "Please select valid move."
-          retry
-        end
-      else
-        begin
-          puts "Check." if @board.in_check?(:b)
-          puts "Player 2:"
-          start, target = @player2.play_turn
-          make_move(:b, start, target)
-        rescue RuntimeError => e
-          puts e.message
-          puts "Please select valid move."
-          retry
-        end
+      begin
+        puts "Check." if @board.in_check?(@curr_player)
+          puts "#{@curr_player.name}'s turn."
+        start, target = @curr_player.play_turn
+        make_move(@curr_player.color, start, target)
+      rescue RuntimeError => e
+        puts e.message
+        puts "Please select valid move."
+        retry
       end
+      @curr_player = (@curr_player == @player1 ? @player2 : @player1)
       @move_count += 1
     end
 
     system('clear')
     @board.display
-    winner = @board.checkmate?(:w) ? 'Player 2' : 'Player 1'
+    winner = @board.checkmate?(:w) ? @player2.name : @player1.name
     puts "CHECKMATE. #{winner} wins."
     puts "Game lasted for #{@move_count / 2} turns."
     puts "Game time: #{Time.now - start_time}s"
@@ -60,8 +48,8 @@ def make_move(color, start, target)
 end
 
 if __FILE__ == $PROGRAM_NAME
-  player1 = HumanPlayer.new
-  player2 = HumanPlayer.new
+  player1 = HumanPlayer.new(:w, 'Foo')
+  player2 = HumanPlayer.new(:b, 'Bar')
   game = Game.new(player1, player2)
   game.play
 end

human_player.rb

@@ -1,4 +1,11 @@
 class HumanPlayer
+  attr_reader :color, :name
+
+  def initialize(color, name)
+    @color = color
+    @name = name
+  end
+
   def play_turn
     print "Input start, target positions: "
     move_string = gets.chomp