mastermind_ruby 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b265a9601800fa81f1b0ccff86b65c5d57066b4
-  data.tar.gz: e8f10788313f1e9faf38c2e644175f0aae8a5d6f
+  metadata.gz: 26d01f387e4fb94d8102ab2a0f6e2ed6a2d898ef
+  data.tar.gz: bee194613ef7e7df4a2bad11920a5fe8ed6e9f72
 SHA512:
-  metadata.gz: bfc794183bf2b29fa43d958a6259707755bfcb9bdaf7d64b9b1122e27c8a5f5e9c8dee520b67576db3b73ea89d53964e31c0cdfa6db685c5a189a0702643cd95
-  data.tar.gz: d4eeede3205907fed91e63293c867bf1ee7f758feb000564e50c4524fe683645f602ff38ccdba5cedc5044023d30e6f342fe90ffe763a4a955e45959b52b5550
+  metadata.gz: fac781566dc456a832bb6834a5f928f200a943e5eece7ee821b2fb8c0fd76f93c6355c361db9d81d3fffa15964e55ac60d503e458621d8f41d10373294044aec
+  data.tar.gz: 2f9646f64a4a0b5d9ff49c18e3936a6527afa370a354465c4159636c02e4a8911a37a66a6a40456f7f0809d6b13c52bb3df3d17c104e4d036489e6072f7f6992

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mastermind_ruby (0.0.3)
+    mastermind_ruby (0.0.4)
 
 GEM
   remote: https://rubygems.org/

data/Rakefile

@@ -24,3 +24,7 @@ end
 task :run do
   trap(0) { system "exe/mastermind" }
 end
+
+task :console do
+  trap(0) { system "irb -r'mastermind_ruby'" }
+end

data/lib/mastermind_ruby/code.rb

@@ -1,7 +1,6 @@
 module MastermindRuby
   class Code
     AVAILABLE_CHARACTERS = %w(R Y G O M P)
-    CODE_PATTERN = /\A[#{AVAILABLE_CHARACTERS.join("")}]{4}\z/
 
     def initialize(code)
       @code = code
@@ -11,27 +10,22 @@ module MastermindRuby
     # Params:
     # +str+:: the string which is to parse to a code object
     def self.parse(str)
-      new str.split('')
+      new str.upcase.split('')
     end
 
     # Method to generate a code
-    def self.random
-      new 4.times.map { AVAILABLE_CHARACTERS.sample }
+    def self.random(length)
+      new length.times.map { AVAILABLE_CHARACTERS.sample }
     end
 
     # Returns a code object containing 'BBBB'
-    def self.solution
-      @solution ||= Code.parse('BBBB')
+    def self.solution(length)
+      new length.times.map{ 'B' }
     end
 
-    # Checks if a code is valid (must be 4 characters long and can only contain the available characters)
+    # Returns if a code is valid (matches the code pattern (R, Y, G, O, M, P))
     def valid?
-      @code.join =~ CODE_PATTERN
-    end
-
-    # Returns true if code is 'BBBB'
-    def solution?
-      self == Code.solution
+      self === /\A[#{AVAILABLE_CHARACTERS.join}]+\z/
     end
 
     # Get assesment for solution
@@ -89,6 +83,10 @@ module MastermindRuby
       end
     end
 
+    def ===(other)
+      other === to_s
+    end
+
     def [](index)
       @code[index]
     end

data/lib/mastermind_ruby/console_interface.rb

@@ -10,6 +10,7 @@ module MastermindRuby
   # Must have methods
   # * :read_playername
   # * :read_next_guess
+  # * :read_code_length
   # * :display_welcome_message
   # * :display_assessment
   # * :display_invalid_code
@@ -23,6 +24,18 @@ module MastermindRuby
       gets.chomp
     end
 
+    # Method which reads the code length
+    # Return the length of the code you want as an Fixnum
+    def read_code_length
+      print 'How long should the code be (Hit enter for default): '
+      code = gets.strip.to_i
+      if code != 0
+        code
+      else
+        4
+      end
+    end
+
     # Method which is called when the next turn is initiated
     # Return next guess as Code object
     # Params:
@@ -36,9 +49,8 @@ module MastermindRuby
     # Params:
     # +playername+:: the playername which was read before with :read_playername
     def display_welcome_message(playername)
-      puts '-------- Mastermind Ruby Project -------'
       puts "Hello #{playername}, your code is generated!"
-      puts "Avaliable Characters:\t#{MastermindRuby::Code::AVAILABLE_CHARACTERS.join("\t")}"
+      puts "Avaliable Characters:\t#{MastermindRuby::Code::AVAILABLE_CHARACTERS.join("\t")} (Case insensitive)"
     end
 
     # Method which is called when the guess is evaluated

data/lib/mastermind_ruby/game.rb

@@ -2,7 +2,7 @@ module MastermindRuby
   class Game
     attr_reader :try_count
 
-    def initialize(ui, solution: Code.random)
+    def initialize(ui, solution: nil)
       @solution_code = solution
       @ui = ui
       @try_count = 1
@@ -10,25 +10,39 @@ module MastermindRuby
     end
 
     # Method to start a game
-    # Requests by calling read_playername for the playername on the UI
+    # Requests by calling :read_playername on the UI for the playername
+    # Requests by calling :read_code_length on the UI for the code_length
+    # Requests by calling :display_welcome_message on the UI for displaying the welcome message
     def start
       @started = true
       @playername = @ui.read_playername
+      @code_length = @ui.read_code_length
+      @solution_code ||= Code.random(@code_length)
       @ui.display_welcome_message(@playername)
       run
     end
 
     private
 
+    # Checks if the guess has a valid length
+    def guess_valid_length?(guess)
+      guess === /\A.{#{@code_length}}\z/
+    end
+
+    # Returns if the result passed is the solution
+    def result_solution?(result)
+      result == Code.solution(@code_length)
+    end
+
     # Method to run the game (prevent from dying if the solution was not found yet)
-    # Requests by calling read_next_guess for a new guess on the UI
-    # Shows an assessment on the UI by calling display_assessment
+    # Requests by calling :read_next_guess for a new guess on the UI
+    # Shows an assessment on the UI by calling :display_assessment
     def run
       while running?
         guess = @ui.read_next_guess(@try_count)
-        if guess.valid?
+        if guess_valid_length?(guess) && guess.valid?
           result = guess.assessment_for_solution(@solution_code)
-          if result.solution?
+          if result_solution?(result)
             stop
           else
             @try_count += 1

data/lib/mastermind_ruby/version.rb

@@ -1,3 +1,3 @@
 module MastermindRuby
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mastermind_ruby
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yves Siegrist