codebreaker_dmitriev 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7953790376d20c4c0fdeea17496564434f344fa0f3db29ad7a875eadfb1bba1
-  data.tar.gz: 0dbcab1cde0637f14b8a6b452e97f6b5cbc1be34ee0232458c8fce1ae77bbede
+  metadata.gz: 05e12443dab6ab9acbfea4d6893c727ac640e9d8b6348579031db4078d3e2151
+  data.tar.gz: abdd9f4dd78c96dcdf61c658ca561d818c6b5f63389ce91b373814b0d9467b32
 SHA512:
-  metadata.gz: 39324fb095949394bf296666f1259df7beb9312aac005836ece4cad63cb115546b2a6b0ae3683aa82b6f45ad78d7aa948dae0870bdc8a0f143f9a2aa79f4e1c5
-  data.tar.gz: 2ab28acfefe83253fa745bcc20c9dc04601f1f00d3c9262630d49c9e040270fa598ff5fdbbf9ae6f6133ddf6c96fcbc6af2908b4bb3e2cc5913805c34145192a
+  metadata.gz: 60a57b275110c7f12362b7d4b94108463c156f3c0d8164ad5b3131f1e1da456a67d1d6e0f7be66845d6fd2e3202a7ed93cdd61ac285b989844d164277d8ad046
+  data.tar.gz: e26e5e638abae5019e61a067597b3d93b8b60dcf310f09de77666f33a806810a7e471c994fa37fb17adb3385d8f2c3e72c119dc878290988e751afb2038d770f

data/.rubocop.yml

@@ -12,11 +12,5 @@ Style/FrozenStringLiteralComment:
 Metrics/BlockLength:
   ExcludedMethods: ['describe']
 
-Metrics/AbcSize:
-  Max: 30
-
-Metrics/MethodLength:
-  Max: 15
-
 RSpec/MessageSpies:
   Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker_dmitriev (0.1.0)
+    codebreaker_dmitriev (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/autoload.rb

@@ -1,2 +1,3 @@
+require_relative './lib/codebreaker/constants'
 require_relative './lib/codebreaker/validation'
 require_relative './lib/codebreaker/game'

data/config/locales/en.yml

@@ -3,11 +3,11 @@ en:
   goodbye: "Goodbye!"
   rules: "You need to guess a number that the computer generated.\nYou have some attempts and some hints.\nGood luck :)"
   menu: "Please, choose one:\n* start\n* rules\n* stats\n* exit"
-  difficult: "* Easy - 15 attempts, 2 hints\n* Medium - 10 attempts, 1 hint\n* Hell - 5 attempts, 1 hint"
-  set_name: "Choose name (min 3 characters):"
+  difficult: "* Easy\n* Medium\n* Hell"
+  set_name: "Choose name (min %{min} characters):"
   set_difficult: "Choose level:"
   unknown_command: "Wrong command!"
-  name_error: "Name must be between 3 and 20 characters!"
+  name_error: "Name must be between %{min} and %{max} characters!"
   difficult_error: "Wrong difficult!"
   hint_error: "Sorry, but you don`t have a hints :("
   win: "Congratz. You win!"
@@ -21,8 +21,8 @@ en:
   show_stats: "Rating: %{rating}; 
   Name: %{name}; 
   Difficult: %{difficult}; 
-  Attempts total: %{a}; 
-  Attempts used: %{a_used};
-  Hints total: %{h}; 
-  Hints used: %{h_used};"
+  Attempts total: %{attempts}; 
+  Attempts used: %{attempts_used};
+  Hints total: %{hints}; 
+  Hints used: %{hints_used};"
   stats_error: "Statistics is empty."

data/lib/codebreaker/constants.rb

@@ -0,0 +1,24 @@
+module Constants
+  PLUS = '+'.freeze
+  MINUS = '-'.freeze
+
+  DIFFICULTS = {
+    easy: {
+      name: 'easy',
+      attempts: 15,
+      hints: 2
+    },
+    medium: {
+      name: 'medium',
+      attempts: 10,
+      hints: 1
+    },
+    hell: {
+      name: 'hell',
+      attempts: 5,
+      hints: 1
+    }
+  }.freeze
+
+  WIN_RESULT = '++++'.freeze
+end

data/lib/codebreaker/game.rb

@@ -2,18 +2,15 @@ module Codebreaker
   include Validation
 
   class Game
-    PLUS = '+'.freeze
-    MINUS = '-'.freeze
+    include Constants
 
-    attr_reader :name, :difficult, :secret, :attempts, :hints, :hints_used, :attempts_used
+    attr_reader :name, :difficult, :secret, :attempts, :hints
 
     def initialize(name, difficult)
       @name = name
       @difficult = difficult
       @attempts = get_attempts(difficult)
       @hints = get_hints(difficult)
-      @attempts_used = 0
-      @hints_used = 0
 
       generate_secret
       @secret_chars = @secret.chars.shuffle
@@ -22,56 +19,73 @@ module Codebreaker
     def decrement_attempts
       return false if @attempts.zero?
 
-      @attempts_used += 1
       @attempts -= 1
     end
 
     def use_hint
       return false if @hints.zero?
 
-      @hints_used += 1
       @hints -= 1
       @secret_chars.pop
     end
 
     def win?(matches)
-      matches == '++++'
+      matches == WIN_RESULT
+    end
+
+    def used_attempts
+      get_attempts(@difficult) - @attempts
+    end
+
+    def used_hints
+      get_hints(@difficult) - @hints
     end
 
     def check_number(guess, secret_code = @secret)
       secret = secret_code.chars
       input = guess.chars
 
-      grouped = secret.zip(input).group_by { |values| values.first == values.last }
-      grouped.default = []
+      grouped = group_arrays(secret, input)
 
       plus = grouped[true].size
-      return PLUS * plus if plus == 4
+      return result(plus) if plus == 4
 
-      secret, input = grouped[false].transpose
-      minus = (secret & input).inject(0) { |count, number| count + [secret.count(number), input.count(number)].min }
-      PLUS * plus << MINUS * minus
+      minus = get_minuses_count(grouped)
+      result(plus, minus)
     end
 
     private
 
+    def result(plus, minus = 0)
+      PLUS * plus << MINUS * minus
+    end
+
+    def get_minuses_count(grouped)
+      secret, input = grouped[false].transpose
+      (secret & input).inject(0) do |count, number|
+        count + [secret.count(number), input.count(number)].min
+      end
+    end
+
+    def group_arrays(secret, input)
+      grouped = secret
+                .zip(input)
+                .group_by { |values| values.first == values.last }
+      grouped.default = []
+
+      grouped
+    end
+
     def generate_secret
       @secret = (1..4).map { rand(1..6) }.join
     end
 
-    def get_attempts(difficult)
-      case difficult
-      when 'easy' then 15
-      when 'medium' then 10
-      when 'hell' then 5
-      end
+    def get_attempts(level)
+      DIFFICULTS[level.to_sym][:attempts]
     end
 
-    def get_hints(difficult)
-      case difficult
-      when 'easy' then 2
-      else 1
-      end
+    def get_hints(level)
+      DIFFICULTS[level.to_sym][:hints]
     end
   end
 end

data/lib/codebreaker/validation.rb

@@ -1,10 +1,4 @@
 module Validation
-  DIFFICULTS = {
-    easy: 'easy',
-    medium: 'medium',
-    hell: 'hell'
-  }.freeze
-
   def name_valid?(name)
     name.length.between? 3, 20
   end
@@ -13,7 +7,7 @@ module Validation
     /^[1-6]{4}$/.match? guess
   end
 
-  def difficult_valid?(difficult)
-    DIFFICULTS.values.include? difficult.downcase
+  def difficult_valid?(level)
+    !Constants::DIFFICULTS[level.to_sym].nil?
   end
 end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/console_app/console.rb

@@ -17,7 +17,6 @@ class Console
     Messages.show_greeting
 
     loop do
-      print '~> '
       case gets.chomp.downcase
       when COMMANDS[:start] then return register
       when COMMANDS[:rules] then Messages.show_rules
@@ -35,9 +34,9 @@ class Console
       name: game.name,
       difficult: @difficult,
       attempts: game.attempts,
-      attempts_used: game.attempts_used,
+      attempts_used: game.used_attempts,
       hints: game.hints,
-      hints_used: game.hints_used
+      hints_used: game.used_hints
     }
   end
 
@@ -50,7 +49,12 @@ class Console
 
   def start_game(game)
     Messages.game_commands
+    game_process(game)
+    start_new_game
+  end
 
+  def game_process(game)
+    puts game.secret
     loop do
       break Messages.lose if game.attempts.zero?
 
@@ -63,8 +67,6 @@ class Console
       result = get_result(game, guess)
       break win_game(game) if result
     end
-
-    start_new_game
   end
 
   def start_new_game

data/lib/console_app/difficult.rb

@@ -1,33 +1,21 @@
-require_relative './errors/errors'
-
 class Difficult
-  include Errors
-
-  DIFFICULTS = {
-    easy: 'easy',
-    medium: 'medium',
-    hell: 'hell'
-  }.freeze
-
   attr_reader :level
 
   def initialize(level)
-    raise WrongDifficultError unless valid? level
-
     @level = level.downcase
   end
 
   def to_i
-    case @level.downcase
-    when DIFFICULTS[:hell] then 1
-    when DIFFICULTS[:medium] then 2
-    when DIFFICULTS[:easy] then 3
+    case @level
+    when name('hell') then 1
+    when name('medium') then 2
+    when name('easy') then 3
     end
   end
 
   private
 
-  def valid?(level)
-    level.is_a?(String) && DIFFICULTS.values.include?(level.downcase)
+  def name(difficult)
+    Codebreaker::Game::DIFFICULTS[difficult.to_sym][:name]
   end
 end

data/lib/console_app/output.rb

@@ -12,9 +12,14 @@ module Output
       end
 
       def show_stats(stat)
-        puts I18n.t(:show_stats, rating: stat[:rating], name: stat[:name], difficult: stat[:difficult].level,
-                                 a: (stat[:attempts] + stat[:attempts_used]), a_used: stat[:attempts_used],
-                                 h: (stat[:hints] + stat[:hints_used]), h_used: stat[:hints_used])
+        puts I18n.t(:show_stats,
+                    rating: stat[:rating],
+                    name: stat[:name],
+                    difficult: stat[:difficult].level,
+                    attempts: (stat[:attempts] + stat[:attempts_used]),
+                    attempts_used: stat[:attempts_used],
+                    hints: (stat[:hints] + stat[:hints_used]),
+                    hints_used: stat[:hints_used])
       end
 
       def show_greeting
@@ -52,7 +57,7 @@ module Output
       end
 
       def show_name
-        puts I18n.t :set_name
+        puts I18n.t :set_name, min: 3
         print ARROW
       end
 
@@ -75,7 +80,7 @@ module Output
       end
 
       def name_error
-        puts I18n.t :name_error
+        puts I18n.t :name_error, min: 3, max: 20
       end
 
       def lose

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_dmitriev
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alexey Dmitriev
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2019-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -162,13 +162,13 @@ files:
 - config/i18n.rb
 - config/locales/en.yml
 - lib/codebreaker.rb
+- lib/codebreaker/constants.rb
 - lib/codebreaker/game.rb
 - lib/codebreaker/validation.rb
 - lib/codebreaker/version.rb
 - lib/console_app/console.rb
 - lib/console_app/database.rb
 - lib/console_app/difficult.rb
-- lib/console_app/errors/errors.rb
 - lib/console_app/output.rb
 - main.rb
 homepage: https://github.com/legendado/codebreaker

data/lib/console_app/errors/errors.rb

@@ -1,7 +0,0 @@
-module Errors
-  class WrongDifficultError < StandardError
-    def initialize
-      super('Wrong difficult!')
-    end
-  end
-end