games_bfox 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b869fc9dbf4366e974cab29e2e0fec776fcd6f30
-  data.tar.gz: 47921477fd8d4c7d703cc5867a464bd26fac0050
+  metadata.gz: 702ed910d768c011c3ea9368619789ab36e9cb6c
+  data.tar.gz: 9c168b219534ae38b0f8c7c9257a4ec1da345672
 SHA512:
-  metadata.gz: e69728ecffc7184b02c99a33d3d673defac42d8803bf113b2084ae45c6aee9598e11e3c40c536fa296877446541a53798a97baf799bfa507d9b8947c3961f788
-  data.tar.gz: bc49069cd841039d46e369b4276774084bff81f2c10a886eebf033fabda23fa8c83ef026c8d74c0cfe0a75da8298b2a578e94af55d2aff3e19c56c60dfd0e2dd
+  metadata.gz: e54ceafc5ba6eca59d09e475428e359bbd8d5a3934fc4646728d8806d8fc01b445fbea2f094679827d08a65528f398a7ada54674dae27ab93249a5022e8cca2b
+  data.tar.gz: 25c0874c5fc1f1a36c5a6cc6e3a482ace6ac50c6bfe65fff0b1c7eed193bebc29bbd165115bfb3705b746fff07099446c07a3ab628ae3b4d38963c9d65ce1528

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+..starting at Version 0.5.0
+##### Version 0.6.0 (01.15.2018)
+  * Update dependencies to latest versions
+
+##### Version 0.5.0 (01.15.2018)
+  * Allow user to choose between tictactoe and mastermind at run time 
+  * Reclassify game specs as integration tests
+  * Add CHANGELOG.md
+  * Add version test

data/README.md

@@ -2,25 +2,16 @@
 
 Welcome to the games_bfox gem!
 
+## Versions
+Ruby 2.4.0, rbenv 1.1.1
 
-## Installation
+## How to Run
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'games_bfox'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
+###...from the command line 
+To run from command line, you must install the gem on your machine: 
 
     $ gem install games_bfox
 
-## Usage
-
 To play Mastermind, type the following into your command line to run the game executable :
 
     $ mastermind
@@ -29,4 +20,13 @@ To play Tic Tac Toe, type the following into your command line to run the game e
 
     $ tictactoe
 
+###...from inside the project
+
+Clone the project, cd into the project directory, and then run the following command: 
+
+    $ bundle exec ruby lib/games.rb
+
+## How to Test
+From inside the project directory, run the following command:
 
+    $ bundle exec rspec

data/exe/games

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+
+require File.join('bundler', 'setup')
+#below line requires mastermind which runs program
+require "games"

data/exe/mastermind

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
+require File.join('bundler', 'setup')
 #below line requires mastermind which runs program
-require "games/mastermind"
+require File.join('games', 'mastermind')
 
 Mastermind.run
 

data/exe/tictactoe

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
+require File.join('bundler', 'setup')
 #below line requires tictactoe which runs program
-require "games/tictactoe"
+require File.join('games', 'tictactoe')
 
 TicTacToe.run
 

data/lib/games.rb

@@ -1,5 +1,14 @@
-require "games/version"
+require File.join('games', 'version')
+require File.join('games', 'mastermind')
+require File.join('games', 'tictactoe')
+require File.join('games', 'shared', 'io_helpers')
+require File.join('games', 'shared', 'io_terminal')
 
-module Games
-  # Your code goes here...
+io_helpers = Shared::IOHelpers.new(Shared::IOTerminal.new)
+choice = io_helpers.choose_game
+
+if choice == :tictactoe
+  TicTacToe.run
+elsif choice == :mastermind
+  Mastermind.run
 end

data/lib/games/mastermind.rb

@@ -1,5 +1,12 @@
-Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'shared', '*.rb')].each {|file| require file }
-Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'mastermind', '*.rb')].each {|file| require file }
+# Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'shared', '*.rb')].each {|file| require file }
+# Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'mastermind', '*.rb')].each {|file| require file }
+
+require File.join('games', 'shared', 'io_terminal')
+require File.join('games', 'mastermind', 'io_helpers')
+require File.join('games', 'mastermind', 'board_presenter_terminal')
+require File.join('games', 'mastermind', 'board_builder')
+require File.join('games', 'mastermind', 'players_factory')
+require File.join('games', 'mastermind', 'game')
 
 class Mastermind
   def self.run

data/lib/games/mastermind/board.rb

@@ -32,12 +32,12 @@ module MM
 
     private
       def retrieve_peg(row, col)
-        return pegs.retrieve_peg(row, col)
+        pegs.retrieve_peg(row, col)
       end
 
       #result_pegs is an instance of pegs
       def retrieve_result_peg(row, col)
-        return result_pegs.retrieve_peg(row,col)
+        result_pegs.retrieve_peg(row,col)
       end
   end
 end

data/lib/games/mastermind/board_builder.rb

@@ -1,5 +1,5 @@
-require_relative 'pegs_factory'
-require_relative 'board'
+require File.join('games','mastermind', 'board')
+require File.join('games', 'mastermind', 'pegs_factory')
 
 module MM
   class BoardBuilder

data/lib/games/mastermind/computer_player_expert.rb

@@ -1,7 +1,9 @@
-require_relative '../shared/player'
+require File.join('games', 'shared', 'player')
 
 module MM
   class ComputerPlayerExpert < Shared::Player
+    attr_reader :game
+
     def make_move(game)
       @game = game
       computer_choosing_graphic
@@ -17,15 +19,15 @@ module MM
     end
 
     def computer_choosing_graphic
-      @game.computer_choosing_graphic
+      game.computer_choosing_graphic
     end
 
     def current_result_partial_match_values
-      @game.current_result_partial_match_values
+      game.current_result_partial_match_values
     end
 
     def current_result_exact_match_values
-      @game.current_result_exact_match_values
+      game.current_result_exact_match_values
     end
   end
 end

data/lib/games/mastermind/computer_player_novice.rb

@@ -1,4 +1,4 @@
-require_relative '../shared/player'
+require File.join('games', 'shared', 'player')
 
 module MM
   class ComputerPlayerNovice < Shared::Player

data/lib/games/mastermind/game.rb

@@ -1,4 +1,8 @@
-require_relative '../shared/game'
+require File.join('games', 'shared', 'game')
+require File.join('games', 'mastermind', 'guess_evaluator')
+require File.join('games', 'mastermind', 'guess_evaluator_result')
+require File.join('games', 'mastermind', 'human_player')
+require File.join('games', 'mastermind', 'secret_code')
 require 'logger'
 
 module MM
@@ -63,7 +67,7 @@ module MM
     def won?
       #depends on evaluate_guess returning an array of all "X"s for perfect guess
       if won_flag
-        return true
+        true
       end
 
       if self.current_result.is_won

data/lib/games/mastermind/guess_evaluator.rb

@@ -1,4 +1,4 @@
-require_relative "../../../lib/games/mastermind/guess_evaluator_result"
+require File.join('games', 'mastermind', 'guess_evaluator_result')
 
 module MM
   class GuessEvaluator

data/lib/games/mastermind/human_player.rb

@@ -1,4 +1,4 @@
-require_relative '../shared/player'
+require File.join('games', 'shared', 'player')
 
 module MM
   class HumanPlayer < Shared::Player

data/lib/games/mastermind/io_helpers.rb

@@ -1,4 +1,4 @@
-require_relative '../shared/io_helpers'
+require File.join('games', 'shared', 'io_helpers')
 require 'paint'
 
 module MM
@@ -30,9 +30,9 @@ module MM
         input == 1 || input == 2
       end
       if user_choice == 1
-        return :human
+        :human
       elsif user_choice == 2
-        return :computer
+        :computer
       end
     end
 

data/lib/games/mastermind/pegs.rb

@@ -10,9 +10,9 @@ module MM
 
     def retrieve_peg(row, col)
       if row >= number_of_rows || col >= number_of_cols
-        return nil
+        nil
       else
-        return collection_of_pegs[row][col]
+        collection_of_pegs[row][col]
       end
     end
 

data/lib/games/mastermind/pegs_factory.rb

@@ -1,5 +1,5 @@
-require_relative 'pegs'
-require_relative 'peg'
+require File.join('games', 'mastermind', 'pegs')
+require File.join('games', 'mastermind', 'peg')
 
 module MM
   module PegsFactory

data/lib/games/mastermind/players_factory.rb

@@ -1,6 +1,7 @@
-require_relative 'human_player'
-require_relative 'computer_player_expert'
-require_relative 'computer_player_novice'
+require File.join('games', 'shared', 'players_factory')
+require File.join('games', 'mastermind', 'human_player')
+require File.join('games', 'mastermind', 'computer_player_expert')
+require File.join('games', 'mastermind', 'computer_player_novice')
 
 module MM
   class PlayersFactory < Shared::PlayersFactory

data/lib/games/shared/game.rb

@@ -1,7 +1,4 @@
-Dir[File.join(File.dirname(__FILE__), '*.rb')].each {|file| require file }
-# note the below exclude the game subclasses, because these classes inherit from this class, so if we require these before the parent class is read, an error will be generated.
-Dir[File.join(File.expand_path("..", File.dirname(__FILE__)), 'tictactoe', '*.rb')].each {|file| require file unless file == File.join(File.expand_path("..", File.dirname(__FILE__)), 'tictactoe', 'game.rb')}
-Dir[File.join(File.expand_path("..", File.dirname(__FILE__)), 'mastermind', '*.rb')].each {|file| require file unless file == File.join(File.expand_path("..", File.dirname(__FILE__)), 'mastermind', 'game.rb')}
+require File.join('games', 'tictactoe', 'computer_player_expert')
 
 module Shared
   class Game
@@ -10,7 +7,6 @@ module Shared
     attr_accessor :number_of_turns_taken, :won_flag
     attr_reader :io_helpers
 
-
     def initialize(args = {})
       @board_presenter = args.fetch(:board_presenter)
 
@@ -62,7 +58,7 @@ module Shared
     def winner
       #each move is immediately proceeded by an increment to number_of_selections_made; therefore, need to rewind won to find winner
       if !won?
-        return nil
+        nil
       end
       current_player
     end

data/lib/games/shared/io_helpers.rb

@@ -12,6 +12,17 @@ module Shared
       raise 'Called abstract method: initial_instructions'
     end
 
+    def choose_game
+      user_choice = get_user_input("Please enter " + Paint["\"1\" ", :blue, :bold] + "if you would like to play " + Paint["tictactoe. ", :blue, :bold] + "Enter " + Paint["\"2\" ", :red, :bold] + "if you would like to play " + Paint["mastermind.", :red, :bold], "Invalid entry. Please enter either 1(tictactoe) or 2 (mastermind)") do |input|
+        input == 1 || input == 2
+      end
+      if user_choice == 1
+        :tictactoe
+      elsif user_choice == 2
+        :mastermind
+      end
+    end
+
     def get_player_1_name
       user_choice = get_user_input("Player 1, please enter your name:", "Please re-enter your name, using only letters") do |input|
         input =~ /^[a-zA-Z]+$/
@@ -56,8 +67,6 @@ module Shared
       #hook
     end
 
-    private
-
     def get_user_input(prompt, reprompt, &block_validation)
       io.present_with_new_line(prompt)
       user_choice = nil
@@ -74,6 +83,8 @@ module Shared
       user_choice
     end
 
+    private
+
     def marching_dots
       sleep(0.2)
       io.present(".")

data/lib/games/shared/io_terminal.rb

@@ -11,9 +11,9 @@ module Shared
     def receive
       result = gets.chomp
       if is_int?(result)
-        return result.to_i
+        result.to_i
       else
-        return result.chomp
+        result.chomp
       end
     end
 

data/lib/games/tictactoe.rb

@@ -1,5 +1,12 @@
-Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'shared', '*.rb')].each {|file| require file }
-Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'tictactoe', '*.rb')].each {|file| require file }
+# Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'shared', '*.rb')].each {|file| require file }
+# Dir[File.join(File.expand_path(File.dirname(__FILE__)), 'tictactoe', '*.rb')].each {|file| require file }
+
+require File.join('games', 'shared', 'io_terminal')
+require File.join('games', 'tictactoe', 'io_helpers')
+require File.join('games', 'tictactoe', 'board_presenter_terminal')
+require File.join('games', 'tictactoe', 'board_builder')
+require File.join('games', 'tictactoe', 'players_factory')
+require File.join('games', 'tictactoe', 'game')
 
 class TicTacToe
   def self.run

data/lib/games/tictactoe/board.rb

@@ -12,19 +12,19 @@ module TTT
     end
 
     def full?
-      return squares.full?
+      squares.full?
     end
 
     def won?
-      return squares.any_combination_won?
+      squares.any_combination_won?
     end
 
     def display_values
-      return squares.display_values
+      squares.display_values
     end
 
     def available_choices
-      return squares.available_choices
+      squares.available_choices
     end
 
     def number_of_rows_cols
@@ -33,7 +33,7 @@ module TTT
 
     private
     def retrieve_square(display_value)
-      return squares.retrieve_square(display_value)
+      squares.retrieve_square(display_value)
     end
   end
 end

data/lib/games/tictactoe/board_builder.rb

@@ -1,5 +1,5 @@
-require_relative 'board'
-require_relative 'squares_factory'
+require File.join('games', 'tictactoe', 'board')
+require File.join('games', 'tictactoe', 'squares_factory')
 
 module TTT
   class BoardBuilder

data/lib/games/tictactoe/board_presenter_terminal.rb

@@ -1,6 +1,6 @@
 module TTT
   class BoardPresenterTerminal
-    attr_accessor :board
+    attr_reader :board
 
     def present_board(board)
       @board = board

data/lib/games/tictactoe/computer_player_expert.rb

@@ -1,4 +1,5 @@
-require_relative '../tictactoe/player'
+require File.join('games', 'tictactoe', 'player')
+require File.join('games', 'tictactoe', 'minimax')
 
 module TTT
   class ComputerPlayerExpert < TTT::Player

data/lib/games/tictactoe/computer_player_novice.rb

@@ -1,4 +1,4 @@
-require_relative '../tictactoe/player'
+require File.join('games', 'tictactoe', 'player')
 
 module TTT
   class ComputerPlayerNovice < TTT::Player

data/lib/games/tictactoe/game.rb

@@ -1,4 +1,4 @@
-require_relative '../shared/game'
+require File.join('games', 'shared', 'game')
 
 module TTT
   class Game < Shared::Game
@@ -38,7 +38,7 @@ module TTT
 
     def won?
       if won_flag
-        return true
+        true
       end
 
       if board.won?

data/lib/games/tictactoe/human_player.rb

@@ -1,4 +1,4 @@
-require_relative '../tictactoe/player'
+require File.join('games', 'tictactoe', 'player')
 
 module TTT
   class HumanPlayer < TTT::Player

data/lib/games/tictactoe/io_helpers.rb

@@ -1,4 +1,4 @@
-require_relative '../shared/io_helpers'
+require File.join('games', 'shared', 'io_helpers')
 require 'paint'
 
 module TTT

data/lib/games/tictactoe/minimax.rb

@@ -21,6 +21,7 @@ module TTT
       if board_won || board_full
         #rewind one player to see which player took last turn and therefore won the game
         self.number_of_turns_taken -= 1
+        # note: need return statement here so that method stops here if board is won or full
         return score(board_won)
       end
 
@@ -38,12 +39,12 @@ module TTT
         #https://stackoverflow.com/questions/2149802/in-ruby-what-is-the-cleanest-way-of-obtaining-the-index-of-the-largest-value-in
         max_score_index = scores.each_with_index.max[1]
         self.choice = choices[max_score_index]
-        return scores[max_score_index]
+        scores[max_score_index]
       else
         # This is the min calculation
         min_score_index = scores.each_with_index.min[1]
         self.choice = choices[min_score_index]
-        return scores[min_score_index]
+        scores[min_score_index]
       end
     end
 

data/lib/games/tictactoe/player.rb

@@ -1,4 +1,4 @@
-require_relative '../shared/player'
+require File.join('games', 'shared', 'player')
 
 module TTT
   class Player < Shared::Player

data/lib/games/tictactoe/players_factory.rb

@@ -1,6 +1,7 @@
-require_relative 'human_player'
-require_relative 'computer_player_expert'
-require_relative 'computer_player_novice'
+require File.join('games', 'shared', 'players_factory')
+require File.join('games', 'tictactoe', 'human_player')
+require File.join('games', 'tictactoe', 'computer_player_expert')
+require File.join('games', 'tictactoe', 'computer_player_novice')
 
 module TTT
   class PlayersFactory < Shared::PlayersFactory

data/lib/games/tictactoe/square.rb

@@ -18,9 +18,9 @@ module TTT
 
     def full?
       if value != nil
-        return true
+        true
       else
-        return false
+        false
       end
     end
   end

data/lib/games/tictactoe/squares.rb

@@ -12,9 +12,9 @@ module TTT
       row = (display_value - 1) / number_of_rows_cols
       col = (display_value - 1) % number_of_rows_cols
       if row >= number_of_rows_cols || col >= number_of_rows_cols
-        return nil
+        nil
       else
-        return collection_of_squares[row][col]
+        collection_of_squares[row][col]
       end
     end
 
@@ -42,7 +42,7 @@ module TTT
       collection_of_squares.each do |row|
         return false if !(row.all? { |square| square.full? })
       end
-      return true
+      true
     end
 
     def any_combination_won?

data/lib/games/tictactoe/squares_factory.rb

@@ -1,5 +1,5 @@
-require_relative 'squares'
-require_relative 'square'
+require File.join('games', 'tictactoe', 'squares')
+require File.join('games', 'tictactoe', 'square')
 
 module TTT
   class SquaresFactory

data/lib/games/version.rb

@@ -1,3 +1,3 @@
 module Games
-  VERSION = "0.4.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: games_bfox
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Brett Fox
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2018-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ description: In order to play, download the gem, and type "tictactoe" or "master
 email:
 - brettfox11@gmail.com
 executables:
+- games
 - mastermind
 - setup
 - tictactoe
@@ -114,10 +115,12 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
 - config/application.yml
+- exe/games
 - exe/mastermind
 - exe/setup
 - exe/tictactoe
@@ -145,7 +148,6 @@ files:
 - lib/games/shared/player.rb
 - lib/games/shared/player_factory.rb
 - lib/games/shared/players_factory.rb
-- lib/games/shared/version.rb
 - lib/games/tictactoe.rb
 - lib/games/tictactoe/board.rb
 - lib/games/tictactoe/board_builder.rb

data/lib/games/shared/version.rb

@@ -1,3 +0,0 @@
-module Shared
-  VERSION = "0.3.0"
-end