mastermind-scott 1.0.3 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b72d5bb9aae3cf0386f0012e7f1a415fcbe4a51d
-  data.tar.gz: dce8c7cb02b0b2389b90904cee539ae9a60ddc78
+  metadata.gz: 97de0bdd2f5f54df55087874472037230ccd7b3c
+  data.tar.gz: f9511f74f739dc58abd105af0fa380d089964cfa
 SHA512:
-  metadata.gz: 5dffdc80db0597d369d844bd3a14accd7fcb12a50618b03a70d370fa39328c553061d2f5538368f0eaa6ea025a5c1e12ecb07a370cf0b417b1147c110b439b96
-  data.tar.gz: 0264c63dd8a0998e62f40570e257e4a44414bcab5a1e7a397f935ca7d662d9e1b606ca3445bbd1b60228bfafecc2260cd933d5ef79c3ada7977ef4074f0b6b51
+  metadata.gz: b41c25e72b070b83a456311a91af85ed645aaa0df171dd62492108f6047303dc1a5f51258460434c64e268485c64b5a3bbf7ec42272f4c27ba34fe87ea90a8b2
+  data.tar.gz: 2b7592f0ce1e1e1acbc4440fedc3d77d8d773648ddff383f1d6534e6e6a28a8782f67b859abca0fd1209e93add428b24efb1926b83d013598c8f3b51272f5420

data/lib/game.rb

@@ -44,23 +44,39 @@ class Game
 private
 
   def turn_evaluation
+    turn_visuals
+    case
+    when quit? then abort(messages.quit)
+    when win? then you_win
+    when !valid_size? || !valid_letters? then invalid
+    when lose? then you_lose
+    else turn_validate
+    end
+  end
+
+  def invalid
+    output.puts messages.guess_again
+    @guess_count -= 1
+  end
+
+  def you_lose
+    output.puts messages.lose
+  end
+
+  def turn_validate
+    validator
+    output.puts messages.after_guess(command, number_correct, position_right)
+    output.puts messages.guess_count(guess_count)
+  end
+
+  def you_win
+   output.puts messages.winner(answer, guess_count, minutes, seconds)
+  end
+
+  def turn_visuals
     output.puts messages.mastermind_logo
     table_update
     output.puts table.show
-    case
-    when quit?
-      abort(messages.quit)
-    when win?
-      output.puts messages.winner(answer, guess_count, minutes, seconds)
-    when !valid_size? || !valid_letters?
-      output.puts messages.guess_again
-      @guess_count -= 1
-    when lose?
-      output.puts messages.lose
-    else validator
-      output.puts messages.after_guess(command, number_correct, position_right)
-      output.puts messages.guess_count(guess_count)
-    end
   end
 
   def guess_counter
@@ -79,7 +95,6 @@ private
     total_time / 60
   end
 
-
   def total_time
     (end_time - @start_time).to_i
   end

data/lib/game_prompts.rb

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

data/lib/table.rb

@@ -35,7 +35,7 @@ class Table
   end
 
   def create_table
-    Terminal::Table.new :headings => ['Round', 'G', 'C', 'P'],
+    Terminal::Table.new :headings => ['Round', 'Guess', 'Color', 'Pos'],
                         :rows => rows
   end
 end

data/mastermind-scott.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'mastermind-scott'
-  s.version     = '1.0.3'
+  s.version     = '2.0.3'
   s.date        = '2014-11-12'
   s.summary     = "Try to guess the secret code."
   s.description = "The Mastermind Game"
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.executables << 'mastermind-scott'
 
   s.add_runtime_dependency 'terminal-table', '~> 1.4.5', '>= 1.4.5'
+  s.add_runtime_dependency 'colorize', '>= 0.7.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastermind-scott
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.3
 platform: ruby
 authors:
 - Scott Crawford
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 description: The Mastermind Game
 email: scottcrawford03@gmail.com
 executables: