ruby_ttt 0.3.8 → 0.3.9

data/lib/ruby_ttt.rb

@@ -1,4 +1,3 @@
-$: << File.expand_path(File.dirname(__FILE__))
 require 'tictactoe_constants'
 require 'ai'
 require 'board'
@@ -7,4 +6,53 @@ require 'game_setup'
 require 'player'
 require 'ui'
 require 'alpha_beta_player'
-require 'game'
+
+module RubyTictactoe
+
+  class Game
+    include TictactoeConstants
+    attr_accessor :board, :player_one, :player_two, :ui, :player_first_move
+    def initialize(settings)
+      @board = settings[:board]
+      @player_one = settings[:player_one]
+      @player_two = settings[:player_two]
+      @player_first_move = settings[:player_first_move]
+      @ui = UI.new
+    end
+
+    def advance_game
+      game_status_check(current_player.opponent.marker)
+      ui.next_move_message(current_player.marker) unless board.game_over?
+    end
+
+    def game_status_check(marker)
+      if board.winner?(marker)
+        ui.winning_game_message(marker)
+      elsif !board.moves_remaining?
+        ui.tie_game_message
+      end
+    end
+
+    def verify_move(cell)
+      return false if !board.available_cell?(cell)
+      current_player.add_marker(board, cell)
+      true
+    end
+
+    def current_player
+      if total_markers(MARKER_X) > total_markers(MARKER_O)
+        player_two
+      elsif total_markers(MARKER_O) > total_markers(MARKER_X)
+        player_one
+      else
+        player_first_move
+      end
+    end
+
+    def total_markers(marker)
+      board.all_cells.select { |cell, value| value == marker }.count
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_ttt
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,6 @@ files:
 - lib/ai.rb
 - lib/alpha_beta_player.rb
 - lib/board.rb
-- lib/game.rb
 - lib/game_setup.rb
 - lib/player.rb
 - lib/player_factory.rb

data/lib/game.rb

@@ -1,49 +0,0 @@
-module RubyTictactoe
-
-  class Game
-    include TictactoeConstants
-    attr_accessor :board, :player_one, :player_two, :ui, :player_first_move
-    def initialize(settings)
-      @board = settings[:board]
-      @player_one = settings[:player_one]
-      @player_two = settings[:player_two]
-      @player_first_move = settings[:player_first_move]
-      @ui = UI.new
-    end
-
-    def advance_game
-      game_status_check(current_player.opponent.marker)
-      ui.next_move_message(current_player.marker) unless board.game_over?
-    end
-
-    def game_status_check(marker)
-      if board.winner?(marker)
-        ui.winning_game_message(marker)
-      elsif !board.moves_remaining?
-        ui.tie_game_message
-      end
-    end
-
-    def verify_move(cell)
-      return false if !board.available_cell?(cell)
-      current_player.add_marker(board, cell)
-      true
-    end
-
-    def current_player
-      if total_markers(MARKER_X) > total_markers(MARKER_O)
-        player_two
-      elsif total_markers(MARKER_O) > total_markers(MARKER_X)
-        player_one
-      else
-        player_first_move
-      end
-    end
-
-    def total_markers(marker)
-      board.all_cells.select { |cell, value| value == marker }.count
-    end
-
-  end
-
-end