mastermind-scott 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97de0bdd2f5f54df55087874472037230ccd7b3c
-  data.tar.gz: f9511f74f739dc58abd105af0fa380d089964cfa
+  metadata.gz: d9851f1b85be4ced658bbb73d916f908dd712c37
+  data.tar.gz: 84912780e04ef850cea0a290be52518de76ea953
 SHA512:
-  metadata.gz: b41c25e72b070b83a456311a91af85ed645aaa0df171dd62492108f6047303dc1a5f51258460434c64e268485c64b5a3bbf7ec42272f4c27ba34fe87ea90a8b2
-  data.tar.gz: 2b7592f0ce1e1e1acbc4440fedc3d77d8d773648ddff383f1d6534e6e6a28a8782f67b859abca0fd1209e93add428b24efb1926b83d013598c8f3b51272f5420
+  metadata.gz: e7219d4abcb82c7aa2ef6ca20a355955f7b99886db0571f59cc12c3fa8e370715358dafdb0478a9c743656d826d1c073aa7f928c5450c13a5a495e57b4bba06a
+  data.tar.gz: 0ba50930f055d2d6de3774b8dd9187e2a5c9de3122da7c01ea181c838bdc65bcb0664b01364f6748cf5f4c51b3794718a361177024593d62af27972e56b0ba29

data/lib/cli.rb

@@ -1,5 +1,5 @@
-require "game_prompts"
-require "game"
+require 'game_prompts'
+require 'game'
 
 class CLI
   attr_reader :input,
@@ -11,12 +11,12 @@ class CLI
     @input = input
     @output = output
     @messages = GamePrompts.new
-    @command = ""
+    @command = ''
   end
 
   def call
-      output.puts @messages.mastermind_logo
-      output.puts @messages.intro_message
+    output.puts @messages.mastermind_logo
+    output.puts @messages.intro_message
     until quit?
       output.puts @messages.player_input
       @command = input.gets.strip.downcase
@@ -27,29 +27,28 @@ end
 
 private
 
-
-  def welcome_options
-    case
-      when play?
-        game = Game.new(input, output, messages)
-        game.play
-      when instructions?
-        output.puts @messages.instructions
-      when quit?
-        output.puts @messages.quit
-      else
-        output.puts @messages.invalid
-      end
-    end
-
-  def play?
-    command == "p" || command == "play"
+def welcome_options
+  case
+  when play?
+    game = Game.new(input, output, messages)
+    game.play
+  when instructions?
+    output.puts @messages.instructions
+  when quit?
+    output.puts @messages.quit
+  else
+    output.puts @messages.invalid
   end
+end
 
-  def instructions?
-    command == "i" || command == "instructions"
-  end
+def play?
+  command == 'p' || command == 'play'
+end
 
-  def quit?
-    command == "q" || command == "quit"
-  end
+def instructions?
+  command == 'i' || command == 'instructions'
+end
+
+def quit?
+  command == 'q' || command == 'quit'
+end

data/lib/colors.rb

@@ -1,7 +1,7 @@
 class Colors
   attr_reader :answer
   def initialize
-    @answer = ['r','r','r','r']
+    @answer = %w(r r r r)
   end
 
   def secret_answer
@@ -13,13 +13,10 @@ class Colors
   end
 
   def answer_options
-    ["r","g","b","y"]
+    %w(r g b y)
   end
 
   def shuffle
     answer_options.shuffle
   end
-
 end
-
-color = Colors.new

data/lib/game.rb

@@ -1,10 +1,8 @@
 require_relative '../lib/colors'
 require_relative '../lib/game_prompts'
-require_relative "../lib/validate"
+require_relative '../lib/validate'
 require_relative '../lib/table'
 
-
-
 class Game
   attr_reader :input,
               :output,
@@ -24,7 +22,7 @@ class Game
     @input       = input
     @output      = output
     @messages    = messages
-    @command     = ""
+    @command     = ''
     @guess_count = 0
     @old_guess   = []
   end
@@ -40,8 +38,7 @@ class Game
     end
   end
 
-
-private
+  private
 
   def turn_evaluation
     turn_visuals
@@ -70,7 +67,7 @@ private
   end
 
   def you_win
-   output.puts messages.winner(answer, guess_count, minutes, seconds)
+    output.puts messages.winner(answer, guess_count, minutes, seconds)
   end
 
   def turn_visuals
@@ -121,7 +118,7 @@ private
   end
 
   def quit?
-    command == "q" || command == "quit"
+    command == 'q' || command == 'quit'
   end
 
   def validator
@@ -144,5 +141,4 @@ private
   def save_guess
     @old_guess << @command
   end
-
 end

data/lib/game_prompts.rb

@@ -4,42 +4,41 @@ class GamePrompts
   attr_reader :intro_message                                                                                 # => nil
 
   def intro_message
-    %x( say "so check me out")
+    ` say "so check me out"`
     "Welcome to MASTERMIND\n".green +
-    "Would you like to (p)lay, read the (i)nstructions, or (q)uit?".light_blue
+      'Would you like to (p)lay, read the (i)nstructions, or (q)uit?'.light_blue
   end
 
   def lose
-    "Nice try you " + "DUMMY. ".blue.bold + play_again
+    'Nice try you ' + 'DUMMY. '.blue.bold + play_again
   end
 
   def winner(answer, guess_count, minutes, seconds)
-    "WINNER! You guessed the sequence '#{answer.join('').upcase}' with #{guess_count} guesses in #{minutes} minutes and #{seconds} seconds.\n(p)lay again or (q)uit?"
+    "WINNER! You guessed the sequence '#{answer.join('').upcase}' with #{guess_count} guesses in #{minutes} minutes and #{seconds} seconds. \n(p)lay again or (q)uit?"
   end
 
   def game_start
-    "I have generated a beginner sequence with four elements made up of:\n" + "(r)".red + "ed, " + "(g)".green + "reen, " + "(b)".light_blue + "lue, " + "and " +"(y)".yellow + "ellow.\n Use (q)uit at any time to end the game."
+    "I have generated a beginner sequence with four elements made up of:\n" + '(r)'.red + 'ed, ' + '(g)'.green + 'reen, ' + '(b)'.light_blue + 'lue, ' + 'and ' + '(y)'.yellow + "ellow.\n Use (q)uit at any time to end the game.\n\n"
   end
 
   def mastermind_logo
-  puts
-%q{
-                      _                      _           _
-                     | |                    (_)         | |
-  _ __ ___   __ _ ___| |_ ___ _ __ _ __ ___  _ _ __   __| |
- | '_ ` _ \ / _` / __| __/ _ \ '__| '_ ` _ \| | '_ \ / _` |
- | | | | | | (_| \__ \ ||  __/ |  | | | | | | | | | | (_| |
- |_| |_| |_|\__,_|___/\__\___|_|  |_| |_| |_|_|_| |_|\__,_|
- }.cyan
-
+    puts
+    %q{
+                          _                      _           _
+                         | |                    (_)         | |
+      _ __ ___   __ _ ___| |_ ___ _ __ _ __ ___  _ _ __   __| |
+     | '_ ` _ \ / _` / __| __/ _ \ '__| '_ ` _ \| | '_ \ / _` |
+     | | | | | | (_| \__ \ ||  __/ |  | | | | | | | | | | (_| |
+     |_| |_| |_|\__,_|___/\__\___|_|  |_| |_| |_|_|_| |_|\__,_|
+     }.cyan
   end
 
   def play
-    "begin the game."
+    'begin the game.'
   end
 
   def player_input
-    "Enter Choice: ".yellow
+    'Enter Choice: '.yellow
   end
 
   def instructions
@@ -47,34 +46,34 @@ class GamePrompts
   end
 
   def quit
-    "Your father was right about you, you are a quitter.".red
+    'Your father was right about you, you are a quitter.'.red
   end
 
   def invalid
-    "Your argument is invalid. Try again.".red
+    'Your argument is invalid. Try again.'.red
   end
 
   def guess_prompt
-    "Take your guess: ".yellow
+    'Take your guess: '.yellow
   end
 
   def guess_again
-    "The guess must only be 4 colors and either" +" r, ".red + "g, ".green + "b, ".light_blue + "or y.".yellow
+    'The guess must only be 4 colors and either' + ' r, '.red + 'g, '.green + 'b, '.light_blue + 'or y.'.yellow
   end
 
   def guess_count(guess_count)
     if guess_count == 1
-      "You have taken" + " #{guess_count}".red + " guess."
+      'You have taken' + " #{guess_count}".red + ' guess.'
     else
-      "You have taken " + " #{guess_count}".red + " guesses."
+      'You have taken ' + " #{guess_count}".red + ' guesses.'
     end
   end
 
-  def after_guess(guess,number_correct, position_right)
-    "Your guess " + "'#{guess.upcase}'".magenta + " has " + "#{number_correct}".magenta + " correct colors with " + "#{position_right}".magenta + " in the correct position."
+  def after_guess(guess, number_correct, position_right)
+    'Your guess ' + "'#{guess.upcase}'".magenta + ' has ' + "#{number_correct}".magenta + ' correct colors with ' + "#{position_right}".magenta + ' in the correct position.'
   end
 
   def play_again
-    "(p)lay again or (q)uit?"
+    '(p)lay again or (q)uit?'
   end
 end

data/lib/table.rb

@@ -5,15 +5,14 @@ class Table
               :rows
 
   def initialize
-  @rows = []
-  @rows <<   ['Answer', '????', 'XX','XX']
-  @table = create_table
-  table_style
-
+    @rows = []
+    @rows <<   ['Answer', '????', 'XX', 'XX']
+    @table = create_table
+    table_style
   end
 
   def table_style
-    table.style = {:width => 40, :padding_left => 3, :border_x => "=", :border_i => "X"}
+    table.style = { width: 40, padding_left: 3, border_x: '=', border_i: 'X' }
   end
 
   def show
@@ -21,12 +20,12 @@ class Table
   end
 
   def hidden_answer(answer)
-      @rows[0] = ['Answer', answer.join(''), 'XX','XX']
+    @rows[0] = ['Answer', answer.join(''), 'XX', 'XX']
   end
 
-  def update(guess_number, guess,number_correct, position, answer)
+  def update(guess_number, guess, number_correct, position, answer)
     if guess_number < 10
-      @rows << [guess_number, guess, number_correct ,position]
+      @rows << [guess_number, guess, number_correct, position]
     else
       hidden_answer(answer)
     end
@@ -35,7 +34,7 @@ class Table
   end
 
   def create_table
-    Terminal::Table.new :headings => ['Round', 'Guess', 'Color', 'Pos'],
-                        :rows => rows
+    Terminal::Table.new headings: %w(Round Guess Color Pos),
+                        rows: rows
   end
 end

data/lib/validate.rb

@@ -1,10 +1,5 @@
-# determine how many colors correct
-# determine how many positions correct
-# verify user guess with answer array
-# track number of guesses - guess 1, guess 2, etc. && "you have X number of guess left"
 require_relative '../lib/colors'
 
-
 class Validate
   attr_reader :answer,
               :guess
@@ -16,21 +11,21 @@ class Validate
   def position_check(guess)
     difference = 0
     4.times do |index|
-        difference += 1 if guess[index] == @answer[index]
-      end
+      difference += 1 if guess[index] == @answer[index]
+    end
     difference
   end
 
   def number_correct(guess)
-  number_correct = 0
-  new_answer = @answer
-  new_answer.each do |letter|
-    if guess.include?(letter)
-      guess.delete_at(guess.index(letter))
-       number_correct += 1
+    number_correct = 0
+    new_answer = @answer
+    new_answer.each do |letter|
+      if guess.include?(letter)
+        guess.delete_at(guess.index(letter))
+        number_correct += 1
+      end
     end
-  end
-  number_correct
+    number_correct
   end
 
   def correct?(user_guess)
@@ -38,7 +33,7 @@ class Validate
   end
 
   def letters?(guess)
-    valid_letters = ['r', 'g', 'b', 'y']
+    valid_letters = %w(r g b y)
     guess.chars.all? { |letter| valid_letters.include?(letter) }
   end
 

data/mastermind-scott.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'mastermind-scott'
-  s.version     = '2.0.3'
+  s.version     = '2.0.4'
   s.date        = '2014-11-12'
   s.summary     = "Try to guess the secret code."
   s.description = "The Mastermind Game"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastermind-scott
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Scott Crawford