ruby_ttt 0.1.9 → 0.2.0

data/lib/game_setup.rb

@@ -4,7 +4,24 @@ AI_PLAYER = 'hard computer'
 HARD_LEVEL = 'hard'
 EASY_LEVEL = 'easy'
 
-class GameSetup; end
+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 CLIGameSetup < GameSetup
   attr_accessor :ui
@@ -12,21 +29,6 @@ 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)

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.opponent.marker)
+    game_status_check(current_player.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, :player_first_move
+  attr_accessor :board, :player_one, :player_two, :ui
   def initialize(settings)
     super
     @ui = CLIUI.new
@@ -69,19 +69,14 @@ class CLIGame < Game
   def play!
     until board.game_over?
       board.display_board
-      get_next_move
+      move = get_next_move
+      verify_move(move) ? advance_game : invalid_move(move)
     end
     exit_game
   end
 
   def get_next_move
-    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
+    current_player.is_a?(HumanPlayer) ? ui.request_human_move : current_player.make_move(board)
   end
 
   def invalid_move(cell)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ttt
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: