tic_tac_toe_nhu 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76f4600254a71f4f37fe5efa7f74a8000b5d7b35
-  data.tar.gz: 81f2f459fa5e1a867e053d42f5dfdfe2ae4dc27f
+  metadata.gz: 26958ec38dc0a7146011dd9fcf8d64e44c53dd11
+  data.tar.gz: c9f624e26c265343a44f9704a023a09ceefb1242
 SHA512:
-  metadata.gz: 5eae5eeee50f815eaac5fb338c1aba07e9d54ad669cd179f6a333ef4b693aa333145b12825f61696eab943103b1934f4ca101e10f7bff4c10f9e702bc54a3912
-  data.tar.gz: b9e661172ad637011bd6b36e7a0ce4cb5a56bf17f114277b9e1da7ad57bc4d03f29269e6c7328d8fd8d147b44fc39b3b7feae7d9bd8cbe7004ee8f8a4665ca98
+  metadata.gz: 5f85c1739cef67a1deba90eed624f3e897b9c8eebdde2054ec2243c5fcce3b4b48906e86962291dc5dcdd68b49020b3f8774481e337554f14d5f1767b67fa4ed
+  data.tar.gz: a6251f4b4f381ae5fda53eb1ee046c8425e5be125e486e5ce06fabdc63fd9d22ab351674cdffc99bad3fac633dddf39b6b7ecb7861ecb5c7d70b4dc444c1f171

data/Gemfile.lock

@@ -2,25 +2,27 @@ GEM
   remote: https://rubygems.org/
   specs:
     builder (3.2.2)
-    cucumber (1.3.2)
+    cucumber (1.3.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12.0)
-      multi_json (~> 1.3)
+      multi_json (~> 1.7.5)
+      multi_test (>= 0.0.2)
     diff-lcs (1.2.4)
-    gherkin (2.12.0)
+    gherkin (2.12.1)
       multi_json (~> 1.3)
     json (1.7.7)
-    multi_json (1.7.7)
+    multi_json (1.7.9)
+    multi_test (0.0.2)
     rake (10.1.0)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.1)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.3)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)

data/lib/tic_tac_toe/game.rb

@@ -11,7 +11,7 @@ module TicTacToe
       @current_player = players[0]
     end
 
-    def game_over?
+    def over?
       rules.game_over?
     end
 

data/lib/tic_tac_toe/runner.rb

@@ -5,47 +5,47 @@ require 'tic_tac_toe/board'
 module TicTacToe
   class Runner
 
-    def initialize(ui = TicTacToe::Console.new, game_state_factory = TicTacToe::GameFactory.new)
+    def initialize(ui = TicTacToe::Console.new, game_factory = TicTacToe::GameFactory.new)
       @ui = ui
-      @game_state_factory = game_state_factory
+      @game_factory = game_factory
     end
 
     def start
       ui.display_welcome_message
-      @game_state = create_game_state
-      play until game_state.game_over?
+      @game = create_game
+      play until game.over?
       ui.display_board(board)
       display_result
     end
 
     private
-    attr_reader :ui, :game_state, :game_state_factory
+    attr_reader :ui, :game, :game_factory
 
-    def create_game_state
+    def create_game
       game_type = ui.game_type
       begin
-        game_state_factory.create(game_type)
+        game_factory.create(game_type)
       rescue ArgumentError
-        create_game_state
+        create_game
       end
     end
 
     def play
       ui.display_board(board)
-      ui.display_player_turn(game_state.current_player)
+      ui.display_player_turn(game.current_player)
       make_player_move
     end
 
     def make_player_move
       begin
-        game_state.make_player_move
+        game.make_player_move
       rescue MoveNotAvailableError
         make_player_move
       end
     end
 
     def display_result
-      winner = game_state.winner
+      winner = game.winner
       if winner
         ui.display_winner(winner)
       else
@@ -54,7 +54,7 @@ module TicTacToe
     end
 
     def board
-      game_state.board
+      game.board
     end
   end
 end

data/spec/mocks/game.rb

@@ -6,7 +6,7 @@ class MockGame
   define_reader :current_player
 
   define :winner
-  define(:game_over?){true}
+  define(:over?){true}
   define(:make_player_move){|*move|}
 end
 

data/spec/tic_tac_toe/game_spec.rb

@@ -6,99 +6,99 @@ require 'tic_tac_toe/values'
 require 'mocks/strategy/dynamic'
 
 describe TicTacToe::Game do
-  attr_reader :game_state, :player1, :player2, :board
+  attr_reader :game, :player1, :player2, :board
 
   before(:each) do
     @board = TicTacToe::Board.new
     @player1_strategy = MockDynamicStrategy.new
     @player1 = TicTacToe::Player.new("player1", TicTacToe::VALUES[0], @player1_strategy)
     @player2 = TicTacToe::Player.new("player1", TicTacToe::VALUES[1], nil)
-    @game_state = TicTacToe::Game.new([@player1, @player2], @board)
+    @game = TicTacToe::Game.new([@player1, @player2], @board)
   end
 
 
   it "can read board" do
-    game_state.board.should == board
+    game.board.should == board
   end
 
   describe "game over" do
     it "is false when there is no mark" do
-      game_state.should_not be_game_over
+      game.should_not be_over
     end
 
     it "should be over when there is a winner" do
       mark_winning_board(player1.value)
-      game_state.should be_game_over
+      game.should be_over
     end
   end
 
   describe "winner" do
     it "has no winner when there is no mark" do
-      game_state.winner.should be_nil
+      game.winner.should be_nil
     end
 
     it "is player 1" do
       mark_winning_board(player1.value)
-      game_state.winner.should == player1
+      game.winner.should == player1
     end
 
     it "is player 2" do
       mark_winning_board(player2.value)
-      game_state.winner.should == player2
+      game.winner.should == player2
     end
   end
 
   context "make player move" do
     it "mark the board with player move when caller doesn't pass in a move" do
       @player1_strategy.add_move(1)
-      @game_state.make_player_move
+      @game.make_player_move
       @board.unique_marked_values.should include(@player1.value)
     end
 
     it "does not mark the board if user doesn't return an input and caller didn't pass in a move" do
       @player1_strategy.add_move(nil)
-      @game_state.make_player_move
+      @game.make_player_move
       @board.unique_marked_values.should_not include(@player1.value)
     end
 
     it "marks the board with the move passed in" do
       @player1_strategy.add_move(1)
       move = 2
-      @game_state.make_player_move(move)
+      @game.make_player_move(move)
       @board.available_moves.should_not include(move)
     end
 
     it "marks the board with player move when move passed in is nil" do
       @player1_strategy.add_move(1)
-      @game_state.make_player_move(nil)
+      @game.make_player_move(nil)
       @board.available_moves.should_not include(1)
     end
 
     it "marks the board with current player value when the move passed in" do
       move = 2
-      @game_state.make_player_move(move)
+      @game.make_player_move(move)
       @board.unique_marked_values.should include(@player1.value)
     end
   end
 
   describe "changes player" do
     it "doesn't change player if player 1 doesn't return a move" do
-      @game_state.current_player.should == @player1
-      @game_state.make_player_move
-      @game_state.current_player.should == @player1
+      @game.current_player.should == @player1
+      @game.make_player_move
+      @game.current_player.should == @player1
     end
 
     it "changes to player 2 after player 1 moves" do
-      @game_state.current_player.should == @player1
-      @game_state.make_player_move(1)
-      @game_state.current_player.should == @player2
+      @game.current_player.should == @player1
+      @game.make_player_move(1)
+      @game.current_player.should == @player2
     end
   end
 
 
   def mark_winning_board(value)
     [0, 4, 8].each do |move|
-      game_state.board.mark(move, value)
+      game.board.mark(move, value)
     end
   end
 end

data/spec/tic_tac_toe/runner_spec.rb

@@ -7,36 +7,36 @@ require 'mocks/ui/console'
 require 'mocks/player'
 
 describe TicTacToe::Runner do
-  attr_reader :game, :ui, :game_state, :game_state_factory
+  attr_reader :runner, :game, :ui, :game_factory
 
   before(:each) do
-    @game_state = MockGame.factory
-    @game_state_factory = MockGameFactory.factory create: game_state
+    @game = MockGame.factory
+    @game_factory = MockGameFactory.factory create: game
     @ui = MockConsole.factory
-    @game = TicTacToe::Runner.new(@ui, @game_state_factory)
+    @runner = TicTacToe::Runner.new(@ui, @game_factory)
   end
 
   it "displays a welcome message" do
-    game.start
+    runner.start
     ui.was told_to(:display_welcome_message)
   end
 
   describe "create game state" do
     it "asks user for a game type" do
-      game.start
+      runner.start
       @ui.was asked_for(:game_type)
     end
 
     it "asks game state factory to create a game with input game type" do
       game_type = 4
       ui.will_have_game_type 4
-      game.start
-      @game_state_factory.was told_to(:create).with(game_type)
+      runner.start
+      @game_factory.was told_to(:create).with(game_type)
     end
 
     it "asks ui for game type again if the input is incorrect" do
-      game_state_factory.will_create ArgumentError.new, game_state
-      game.start
+      game_factory.will_create ArgumentError.new, game
+      runner.start
       ui.was asked_for(:game_type).times(2)
     end
   end
@@ -46,42 +46,42 @@ describe TicTacToe::Runner do
 
     before(:each) do
       @player = MockPlayer.new
-      game_state.will_game_over? false, true
-      game_state.will_have_current_player @player
+      game.will_over? false, true
+      game.will_have_current_player @player
     end
 
     it "displays the board" do
-      game.start
+      runner.start
       ui.was told_to(:display_board)
     end
 
     it "tells ui to display player turn" do
-      game.start
+      runner.start
       ui.was told_to(:display_player_turn).with(player)
     end
 
     it "tells player to move again if there is an error" do
-      game_state.will_make_player_move TicTacToe::MoveNotAvailableError.new, nil
-      game.start
-      game_state.was told_to(:make_player_move).times(2)
+      game.will_make_player_move TicTacToe::MoveNotAvailableError.new, nil
+      runner.start
+      game.was told_to(:make_player_move).times(2)
     end
   end
 
   describe "end game" do
     it "display a board at the end of the game" do
-      game.start
+      runner.start
       ui.was told_to(:display_board)
     end
 
     it "asks ui to display a winner if there is a winner" do
       winner = "Winner"
-      game_state.will_have_winner winner
-      game.start
+      game.will_have_winner winner
+      runner.start
       ui.was told_to(:display_winner).with(winner)
     end
 
     it "asks ui to display a draw" do
-      game.start
+      runner.start
       ui.was told_to(:display_tied_game)
     end
   end

data/tic_tac_toe_nhu.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'tic_tac_toe_nhu'
-  s.version     = '0.1.0'
+  s.version     = '0.1.1'
   s.date        = '2013-06-11'
   s.summary     = "Tic Tac Toe"
   s.description = "A simple tic tac toe game with AI"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tic_tac_toe_nhu
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Nhu Nguyen