ruby_ttt 0.2.0 → 0.2.2

data/lib/game_setup.rb

@@ -4,24 +4,7 @@ AI_PLAYER = 'hard computer'
 HARD_LEVEL = 'hard'
 EASY_LEVEL = 'easy'
 
-class GameSetup
-  def initialize; end
-
-  def get_settings
-    settings = {}
-    players = set_up_players
-    settings[:board] = get_board
-    settings[:player_one] = players.player_one
-    settings[:player_two] = players.player_two
-    settings[:player_goes_first] = players.player_goes_first
-    settings
-  end
-
-  def set_up_players; end
-
-  def get_board; end
-
-end
+class GameSetup; end
 
 class CLIGameSetup < GameSetup
   attr_accessor :ui
@@ -29,6 +12,21 @@ class CLIGameSetup < GameSetup
     @ui = CLIUI.new
   end
 
+  def get_settings
+    settings = {}
+    begin
+      players = set_up_players
+      settings[:board] = get_board
+      settings[:player_one] = players.player_one
+      settings[:player_two] = players.player_two
+      settings[:player_first_move] = players.player_goes_first
+      settings
+    rescue Interrupt
+      ui.early_exit_message
+      exit
+    end
+  end
+
   def set_up_players
     player_one_type = get_player_type(MARKER_X)
     player_two_type = get_player_type(MARKER_O)
@@ -90,24 +88,19 @@ class CLIGameSetup < GameSetup
 end
 
 class WebGameSetup < GameSetup
+  attr_accessor :ui
+  def initialize
+    @ui = WebUI.new
+  end
 
-  # def set_up_players(player_one_type, player_two_type)
-  #   PlayerFactory.new(player_one_type, player_two_type)
-  # end
-
-  # def get_board
-  #   board = Board.new(session[:board_size])
-  #   board.all_cells = session[:current_board]
-  # end
-
-  # def get_settings
-  #   settings = {}
-  #   players = set_up_players
-  #   settings[:board] = get_board
-  #   settings[:player_one] = players.player_one
-  #   settings[:player_two] = players.player_two
-  #   settings[:player_goes_first] = players.player_goes_first
-  #   settings
-  # end
+  def set_up_players(player_one_type, player_two_type)
+    PlayerFactory.new(player_one_type, player_two_type)
+  end
+
+  def get_board(board_size, current_board)
+    board = WebBoard.new(board_size)
+    board.all_cells = current_board
+    board
+  end
 
 end

data/lib/ruby_ttt.rb

@@ -1,8 +1,8 @@
 require 'ai'
 require 'board'
+require 'player_factory'
 require 'game_setup'
 require 'player'
-require 'player_factory'
 require 'ui'
 
 class Game
@@ -16,7 +16,7 @@ class Game
   end
 
   def advance_game
-    game_status_check(current_player.marker)
+    game_status_check(current_player.opponent.marker)
     ui.next_move_message(current_player.marker) unless board.game_over?
   end
 
@@ -51,7 +51,7 @@ class Game
 end
 
 class CLIGame < Game
-  attr_accessor :board, :player_one, :player_two, :ui
+  attr_accessor :board, :player_one, :player_two, :ui, :player_first_move
   def initialize(settings)
     super
     @ui = CLIUI.new
@@ -67,16 +67,22 @@ class CLIGame < Game
   end
 
   def play!
+    ui.first_move_message
     until board.game_over?
       board.display_board
-      move = get_next_move
-      verify_move(move) ? advance_game : invalid_move(move)
+      get_next_move
     end
     exit_game
   end
 
   def get_next_move
-    current_player.is_a?(HumanPlayer) ? ui.request_human_move : current_player.make_move(board)
+    if current_player.is_a?(HumanPlayer)
+      move = ui.request_human_move
+      verify_move(move) ? advance_game : invalid_move(move)
+    else
+      current_player.make_move(board)
+      advance_game
+    end
   end
 
   def invalid_move(cell)
@@ -90,4 +96,26 @@ class CLIGame < Game
 
 end
 
-class WebGame < Game; end
+class WebGame < Game
+  attr_accessor :board, :player_one, :player_two, :ui, :player_first_move
+  def initialize(settings)
+    super
+    @ui = WebUI.new
+  end
+
+  def get_message
+    return ui.first_move_message(current_player.marker) if board.empty?
+    if board.winner?(current_player.opponent.marker)
+      ui.winning_game_message(current_player.opponent.marker)
+    elsif !board.moves_remaining?
+      ui.tie_game_message
+    else
+      ui.next_move_message(game.current_player.marker)
+    end
+  end
+
+  def computer_player?(type_one, type_two)
+    ((type_one.downcase) == COMPUTER_PLAYER) || ((type_two.downcase) == COMPUTER_PLAYER)
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ttt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec