codebreaker_kub 0.1.6 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a49f0af67627baefe1e347796218ea5ea54d8155e1187ded572e04c28729c0f
-  data.tar.gz: f4d02d1790d23a479d48f3f24d2e62a20264d231c42c3d7a6c23a1a2532aabd2
+  metadata.gz: 051607a50601d334aa48d9d28785323e8d5c221c0aef317be4b4a5ceee34386e
+  data.tar.gz: 6a7ef0f973f7f648ab9ec282631d77f18f62ab2b8d271fa1959e6a4d50286225
 SHA512:
-  metadata.gz: 10154c1f27c0dcb29b36280731de9b3c261eb69e5aebab8947f519a70012e035126f2f412be3bef4d70f41533b4432f23c88e5b88385d1ec00ac8566e22a6359
-  data.tar.gz: 7a3f12d5f012885f3a0a89e940f5515f4569f0200e31f8bccf301ffdb241496b6388d1ad1c88ba14be31ea063893a689d1fffc74a22690d69ef8a89e2b21e16c
+  metadata.gz: a60a49f8ea3d902cc5455fba5e1acf75a1290d013bc4dda5ff4ca6cadabddd8795c8a8e25f697cfed92b1c10973e410b64070a5d48bc73e52afb252ec3c2da46
+  data.tar.gz: 50d31ee1829a607075be8ec34df7b77eea7aa5c783ea62b5f12bfdc119f4c9df5db751b2d195a2c19970375422442f4a797e6e8326b327a2325765fbba717f99

data/.rubocop.yml

@@ -7,9 +7,6 @@ Style/Documentation:
 Layout/LineLength:
   Max: 110
 
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 Metrics/BlockLength:
   Enabled: false
   

data/Gemfile

@@ -1,7 +1,6 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in codebreaker.gemspec
 gemspec
-
-gem 'rake', '~> 12.0'
-gem 'rspec', '~> 3.0'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker_kub (0.1.5)
+    codebreaker_kub (0.2.1)
 
 GEM
   remote: https://rubygems.org/
@@ -65,7 +65,7 @@ DEPENDENCIES
   fasterer (~> 0.8)
   i18n (~> 1.8)
   rake (~> 12.0)
-  rspec (~> 3.0)
+  rspec (~> 3.9)
   rubocop (~> 0.87)
   simplecov (~> 0.18)
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require 'bundler/setup'
 require 'codebreaker'

data/codebreaker.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'lib/codebreaker/version'
 
 Gem::Specification.new do |spec|
@@ -28,6 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'fasterer', '~>0.8'
   spec.add_development_dependency 'i18n', '~>1.8'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~>3.9'
   spec.add_development_dependency 'rubocop', '~>0.87'
   spec.add_development_dependency 'simplecov', '~>0.18'

data/lib/codebreaker.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require_relative 'codebreaker/guess_checker'
 require_relative 'codebreaker/game'
 require_relative 'codebreaker/loader'
 require_relative 'codebreaker/output'

data/lib/codebreaker/data/locales/en.yml

@@ -19,11 +19,11 @@
   wrong_difficulty: "There is no such level. Select from available, please"
   get_hint: "You can choose get hint - puts 'hint'"
   no_hints: "You have no hints"
+  enter_guess: "Enter your guess, please"
   wrong_input: "Your input is invalid or there is no such command."
   win: "YOU WIN!"
   lose: "You lose, sorry("
   code: "The code was: "
   no_stats: "Sorry, you have not any statistic yet"
   save_result: "Do you want to save result y/n"
-  game_over: "GAME OVER"
   

data/lib/codebreaker/game.rb

@@ -1,10 +1,20 @@
+# frozen_string_literal: true
+
 module Codebreaker
   class Game
+    include Codebreaker::GuessChecker
+
     attr_accessor :input_code, :code, :name, :difficulties, :difficulty, :hints_left, :attempts_left
+    attr_reader :minuse, :plus, :none, :hints_code
+
+    CODE_LENGTH = 4
+    CODE_RANGE = (1..6).freeze
 
     def initialize
       @difficulties = Codebreaker::Loader.load('difficulties')
       @code = generate_code
+      @hints_code = @code.chars.shuffle
+      symbols
     end
 
     def game_option(name, difficulty)
@@ -22,47 +32,36 @@ module Codebreaker
     end
 
     def hints_left?
-      @hints_left.positive?
+      hints_left.positive?
     end
 
     def input_operation(input_code)
-      @input_code = input_code
       return unless attempts_left?
 
       @attempts_left -= 1
-      check_input
+      check_input(@code, input_code)
     end
 
     def attempts_left?
-      @attempts_left.positive?
+      attempts_left.positive?
     end
 
     def win?
-      @input_code == @code
+      input_code == code
     end
 
     def save
-      Codebreaker::Loader.save(to_h, 'stat')
+      Codebreaker::Loader.save(to_h, 'stats')
     end
 
     private
 
-    def check_input(code = @code.chars)
-      input = @input_code.chars
-      minuses = (code & input).map { |element| [code.count(element), input.count(element)].min }.sum
-      result = '-' * minuses
-      input.each.with_index do |element, index|
-        result.sub!('-', '+') if element == code[index]
-      end
-      result
-    end
-
     def generate_code
-      Array.new(4) { rand(1..6) }.join
+      Array.new(CODE_LENGTH) { rand(CODE_RANGE) }.join
     end
 
     def generate_hint
-      @code.chars.shuffle.pop
+      @hints_code.pop
     end
 
     def difficulty_option
@@ -76,9 +75,8 @@ module Codebreaker
         attempts: difficulty_option[:attempts],
         hints: difficulty_option[:hints],
         code: @code,
-        attempts_left: @attempts_left,
-        hints_left: @hints_left,
-        win: win?
+        used_attempts: difficulty_option[:attempts] - @attempts_left,
+        used_hints: difficulty_option[:hints] - @hints_left
       }
     end
   end

data/lib/codebreaker/loader.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Codebreaker
   module Loader
     PATH = File.join(File.dirname(__FILE__), 'data/').freeze
-    EXTENCTION = '.yml'.freeze
+    EXTENCTION = '.yml'
     def self.load(file_name)
       file_name = PATH + file_name + EXTENCTION.to_s
       if File.exist?(file_name)

data/lib/codebreaker/output.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Codebreaker
   class Output
     attr_reader :stats
     def initialize
       I18n.load_path << Dir[File.expand_path(File.join(File.dirname(__FILE__), 'data/locales/')) + '/*.yml']
       I18n.config.available_locales = :en
-      @stats = Codebreaker::Loader.load('stat')
+      @stats = Codebreaker::Loader.load('stats')
     end
 
     def greeting
@@ -27,16 +29,23 @@ module Codebreaker
       puts I18n.t(:rules)
     end
 
+    def sort_stats
+      @stats = @stats.sort_by do |game|
+        [game[:attempts], game[:used_attempts],
+         game[:used_hints]]
+      end
+    end
+
     def show_stats
-      @stats.each do |game|
+      sort_stats
+      @stats.each_with_index do |game, index|
         puts "Hey, #{game[:name]}
+        Rating: #{index + 1}
         Attempts: #{game[:attempts]}
         Hints: #{game[:hints]}
-        Code: #{game[:code]}
         Chosen difficulty: #{game[:difficulty]}
-        Unused attempts: #{game[:attempts_left]}
-        Unused hints: #{game[:hints_left]}
-        Win: #{game[:win]}"
+        Used attempts: #{game[:used_attempts]}
+        Used hints: #{game[:used_hints]}"
       end
     end
 
@@ -50,7 +59,6 @@ module Codebreaker
 
     def no_hints
       puts I18n.t(:no_hints)
-      puts I18n.t(:code)
     end
 
     def choose_difficulty
@@ -61,6 +69,10 @@ module Codebreaker
       puts I18n.t(:wrong_difficulty)
     end
 
+    def enter_guess
+      puts I18n.t(:enter_guess)
+    end
+
     def wrong_input
       puts I18n.t(:wrong_input)
     end
@@ -71,6 +83,7 @@ module Codebreaker
 
     def lose
       puts I18n.t(:lose)
+      puts I18n.t(:code)
     end
 
     def save_result
@@ -80,9 +93,5 @@ module Codebreaker
     def goodbye
       puts I18n.t(:goodbye)
     end
-
-    def game_over
-      puts I18n.t(:game_over)
-    end
   end
 end

data/lib/codebreaker/validation.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 module Codebreaker
   module Validation
+    MIN_NAME_LENGTH = 3
+    MAX_NAME_LENGTH = 20
     def name_is_valid?(name)
-      name.instance_of?(String) && name.length.between?(3, 20)
+      name.instance_of?(String) && name.length.between?(MIN_NAME_LENGTH, MAX_NAME_LENGTH)
     end
 
     def input_is_valid?(input)

data/lib/codebreaker/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Codebreaker
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_kub
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.2
 platform: ruby
 authors:
 - katia kub
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fasterer
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement