codebreaker_artem 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '056680463d26bc82bcde45002724db966ed5fc50'
-  data.tar.gz: 4c394660eb8fbca917bafb022f630c64d84d8dd8
+  metadata.gz: cd99d3fb633085334c68785632f6767c2a168744
+  data.tar.gz: e55b8e107182619e3526d7bde7df41b731ba7e22
 SHA512:
-  metadata.gz: 8047618ac8da41e254767769c12cc0fbfa7a3019e86304748cebd4ba03cab7a7908f2d4b256c9e41ca8b9defae99fb4419251350af61e316f5c23a6b9c4694bf
-  data.tar.gz: 3743e9b166af684ce964de77d433adc0638cb26e45b782cae69df1998c9b0c3a32384cc522e38fcb0ed1d0f62f8fd4170833de4ecd3fbcce6e2c8b2a4249af2c
+  metadata.gz: 32a7e7611a3f35650065cf0d1adc6b1a2f6a913daed4f6b816f38c12ac0333315ea6fdb6130570ac77165570a9d71617eb169e0085710c4bb46bcde8c623b3cf
+  data.tar.gz: 24ade59249028cc2e1ed52e04fed85f0cbf29a8af699ba3f452ba9de7576d7cf9aaf89b0a44b125380cd4296317a335131c20cadc06484dc6f25c17bc179eed8

data/lib/codebreaker_artem/cli.rb

@@ -31,7 +31,7 @@ module CodebreakerArtem
       end
 
       def show_mark(mark)
-        puts mark
+        puts "Mark corresponding your guess: #{mark}"
       end
 
       def win(code, score)
@@ -49,7 +49,7 @@ module CodebreakerArtem
       end
 
       def lose_msg(max_guess_number)
-        puts "GAME OVER. You've used all #{max_guess_number} attempts\n"
+        puts "\nGAME OVER. You've used all #{max_guess_number} attempts\n"
       end
 
       def finish_game(code, score)

data/lib/codebreaker_artem/game.rb

@@ -7,11 +7,12 @@ module CodebreakerArtem
     attr_reader :secret_code, :guess_count, :score
 
     def initialize
-      initial_values_set
+      @guess_count = 0
+      @score = 0
+      @hint_available = true
     end
 
     def start
-      initial_values_set
       generate_secret_code
     end
 
@@ -19,8 +20,8 @@ module CodebreakerArtem
       return false unless Validator.code_valid? guess
       @guess_count += 1
       counts = plus_minus_count(guess)
-      score_set(counts[0], counts[1])
-      '' << ('+' * counts[0]) << ('-' * counts[1])
+      score_set(counts[:pluses], counts[:minuses])
+      '' << ('+' * counts[:pluses]) << ('-' * counts[:minuses])
     end
 
     def hint
@@ -32,23 +33,16 @@ module CodebreakerArtem
 
     private
 
-    def initial_values_set
-      @guess_count = 0
-      @score = 0
-      @hint_available = true
-    end
-
     def generate_secret_code
-      @secret_code = ''
-      4.times { @secret_code << rand(1..6).to_s }
+      @secret_code = Array.new(4) { rand(1..6) }.join
     end
 
     def plus_minus_count(guess)
+      return { pluses: 4, minuses: 0 } if @secret_code == guess
       zipped = @secret_code.split('').zip(guess.split(''))
       not_plus = zipped.delete_if { |item| item.uniq.one? }
-      return [4, 0] if not_plus.empty?
       plus_count = 4 - not_plus.count
-      [plus_count, minus_count(not_plus)]
+      { pluses: plus_count, minuses: minus_count(not_plus) }
     end
 
     def minus_count(not_plus)

data/lib/codebreaker_artem/starter.rb

@@ -3,7 +3,7 @@ require_relative 'cli'
 
 module CodebreakerArtem
   class Starter
-    MAX = CodebreakerArtem::Game::MAX_GUESS_NUMBER
+    MAX = Game::MAX_GUESS_NUMBER
 
     def self.start
       game = CodebreakerArtem::Game.new
@@ -22,7 +22,7 @@ module CodebreakerArtem
         else
           mark = game.mark_guess(input)
           CLI.show_mark(mark)
-          return CLI.win(input, game.score) if mark == '++++'
+          return CLI.win(input, game.score) if Validator.win_mark?(mark)
         end
         return CLI.lose(game.secret_code, game.score, MAX) if game.guess_count >= MAX
       end

data/lib/codebreaker_artem/validator.rb

@@ -2,4 +2,8 @@ module Validator
   def self.code_valid?(input)
     true if input =~ /^[1-6]{4}$/
   end
+
+  def self.win_mark?(mark)
+    true if mark == '++++'
+  end
 end

data/lib/codebreaker_artem/version.rb

@@ -1,3 +1,3 @@
 module CodebreakerArtem
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/codebreaker_artem.rb

@@ -1,5 +1,8 @@
 require "codebreaker_artem/version"
 require 'codebreaker_artem/game'
+require 'codebreaker_artem/cli'
+require 'codebreaker_artem/validator'
+require 'codebreaker_artem/starter'
 
 module CodebreakerArtem
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_artem
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - b-artem
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler