mastermind-game 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6d5bc9c19b85777bb6a3b1a77892337bfb0b75c
-  data.tar.gz: 8e6dede81fcfd1347048900504939e8116fd7ad9
+  metadata.gz: 2d8f958732f5aa1360b35da4a723f4cc61e7bb0a
+  data.tar.gz: 2c28c828f418f0d2c31717af3886cd9d42a80f6e
 SHA512:
-  metadata.gz: 3dbaf6735bc410f513e8fdf125ae5d84ddf171cb146c0e885d32778a238a2490f13b1212dcfa213184ecfe3413f67b9b52cb84364f9c6d1d3bc15f1f1d458133
-  data.tar.gz: c237db2c005d129d476a5a754ed67c8a7f5eef43a16aee3a154cd3ea99e5973c51b108446d8ee3b01009e75aba2894e8359d69ced94ade5b938a1f638328f827
+  metadata.gz: 339ca186466779c1f7cfb01f742225c4c5099c881436721b79d9c27ad3f59143cfc2069dfdb12dcaab8561b05f5e5ef56ba56e825fcf2fd26b40f44de1120c86
+  data.tar.gz: 3b48e687f214684a6bfce3bb287b1f93078cb67e8021b3c641c755cadcbc1a1e99ffa590bea36d67648519d2b448dfad1eb401b813eac99acc0fed065640fd52

data/README.md

@@ -34,10 +34,11 @@ The `Mastermind::Game` object is the primary point of interaction. Instances of
 
 ```ruby
 # Instantiate a game with a random secret
-game = Mastermind::Game.new
+# :codemaker and :codebreaker are optional and can be any object
+game = Mastermind::Game.new(codemaker: ..., codebreaker: ...)
 
 # Prepare a guess
-guess = [:red, :red, :red, :red]
+guess = Mastermind::Game::Code.from([:red, :red, :red, :red])
 game.guess(guess)
 
 # Find how many turns there have been
@@ -46,7 +47,8 @@ game.attempts # => 1
 # Check if the game is over
 game.over? # => false
 
-# Determine who has won (returns a Player instance)
+# Determine who has won
+# Returns the codemaker, the codebreaker, or nil
 game.winner # => nil
 ```
 

data/lib/mastermind/console/controller.rb

@@ -3,10 +3,11 @@ module Mastermind
     class Controller
       def setup
         puts View.introduction
-        print "How many players will there be? "
+        print "How many human players will there be? "
         number_of_players = Player::Human.get_input.to_i
 
-        @player1 = get_player(1)
+        @player1 = get_player(1) if number_of_players > 0
+        @player1 ||= Player::Computer.new(name: "Computer (1)")
         @player2 = get_player(2) if number_of_players > 1
         @player2 ||= Player::Computer.new(name: "Computer")
       end
@@ -39,7 +40,7 @@ module Mastermind
 
       def get_player(number)
         print "What is Player #{number}'s name? "
-        Player::Human.new(name: Player::Human.get_input)
+        Player::Human.new(name: gets.chomp)
       end
 
       def get_codebreaker

data/lib/mastermind/console/view.rb

@@ -42,7 +42,7 @@ module Mastermind
 
       def self.attempt_line(turn, width: 4)
         "#{turn.number}:".ljust(4) +
-        SIDE + guess_bar(turn.guess.sequence) + BLANK * (width - turn.guess.sequence.length) + SIDE +
+        SIDE + guess_bar(turn.guess.sequence) + BLANK * (width - turn.guess.length) + SIDE +
         feedback_line(exact: turn.exact, partial: turn.partial, width: width) + SIDE
       end
 

data/lib/mastermind/game.rb

@@ -3,7 +3,7 @@ module Mastermind
     attr_reader :turns, :codemaker, :codebreaker, :max_attempts
 
     def initialize(secret: nil, codemaker: nil, codebreaker: nil)
-      @secret = (secret && Code.from(secret)) || Code.random
+      @secret = secret || Code.random
       @turns = []
       @codemaker = codemaker || Player.new(name: "AbstractCodemaker")
       @codebreaker = codebreaker || Player.new(name: "AbstractCodebreaker")
@@ -18,8 +18,7 @@ module Mastermind
       @secret.length
     end
 
-    def guess(guess_sequence)
-      code = Code.from(guess_sequence)
+    def guess(code)
       @turns << Turn.new(
         guess: code, number: attempts + 1,
         exact: @secret.exact_matches_with(code),

data/lib/mastermind/game/piece.rb

@@ -6,7 +6,7 @@ module Mastermind
       attr_reader :color
 
       def initialize(color: COLORS.sample)
-        raise ArgumentError.new("Invalid color.") unless COLORS.include?(color)
+        raise ArgumentError.new("Invalid color: #{color}.") unless COLORS.include?(color)
         @color = color
       end
 

data/lib/mastermind/knuth.rb

@@ -5,8 +5,10 @@ module Mastermind
     def initialize(game)
       @game = game
       # 1. Create the set S of 1296 possible codes
-      @possible_guesses = Game::Piece::COLORS.repeated_permutation(game.secret_length).to_a
-      @set = Game::Piece::COLORS.repeated_permutation(game.secret_length).to_a
+      @possible_guesses = Game::Piece::COLORS.repeated_permutation(game.secret_length).to_a.map do |permutation|
+        Game::Code.from(permutation)
+      end
+      @set = @possible_guesses.dup
       @game.turns.each { |turn| prune(turn) }
     end
 
@@ -20,10 +22,11 @@ module Mastermind
     # 2. Make initial guess of 1122
     def first_guess
       first_color = Game::Piece::COLORS.sample
-      second_color = Game::Piece::COLORS.select { |color| color != first_color }.sample
-      Array.new(@game.secret_length) do |position|
+      second_color = Game::Piece::COLORS.reject { |color| color == first_color }.sample
+      sequence = Array.new(@game.secret_length) do |position|
         position < @game.secret_length / 2 ? first_color : second_color
       end
+      Game::Code.from(sequence)
     end
 
     # 5. Choose from the set of guesses with the maximum score, preferring members of S
@@ -36,21 +39,20 @@ module Mastermind
 
     # 3. Remove from S any code that would not give the same response if the guess were the code.
     def prune(turn)
-      @set.select! do |combination|
-        code = Game::Code.from(combination)
+      @set.select! do |code|
         !(turn.guess == code) &&
         turn.exact   == code.exact_matches_with(turn.guess) &&
         turn.partial == code.partial_matches_with(turn.guess)
       end
 
-      @possible_guesses.delete(turn.guess.sequence.map(&:color))
+      @possible_guesses.reject! { |guess| turn.guess == guess }
     end
 
     # 4. For each possible guess, find the minimum highest match count
     def minimum_match_count
       lowest = @set.length
       @possible_guesses.each do |possible|
-        count = highest_match_count(Game::Code.from(possible))
+        count = highest_match_count(possible)
         lowest = count if count < lowest
       end
       lowest
@@ -62,7 +64,7 @@ module Mastermind
       (0..@game.secret_length).each do |matches|
         # count how many possibilities in S would be retained
         count = @set.count do |combination|
-          Game::Code.from(combination).color_matches_with(guess) == matches
+          combination.color_matches_with(guess) == matches
         end
         # track the highest of these
         highest = count if count > highest
@@ -74,7 +76,7 @@ module Mastermind
     def maximum_scoring_guesses
       min_matches = minimum_match_count
       @possible_guesses.select do |possible|
-        highest_match_count(Game::Code.from(possible)) == min_matches
+        highest_match_count(possible) == min_matches
       end
     end
   end

data/lib/mastermind/player/computer.rb

@@ -7,7 +7,7 @@ module Mastermind
       end
 
       def get_code(length:)
-        Array.new(length) { Game::Piece::COLORS.sample }
+        Game::Code.random(length)
       end
     end
   end

data/lib/mastermind/player/human.rb

@@ -11,7 +11,7 @@ module Mastermind
           sequence << color
         end
 
-        sequence
+        Game::Code.from(sequence)
       end
 
       def get_guess_for(game)

data/lib/mastermind/version.rb

@@ -1,3 +1,3 @@
 module Mastermind
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mastermind-game
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andur Carr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2017-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: An API for creating the game "Mastermind".