codebreaker_bo 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88a70ddf89ed560f9d096907eac75c768cef0b7a4c27e52b453905bef4679049
-  data.tar.gz: 27a3f505dc0024cff4175d0f1c7c0b144a62d79f9121fd4287f71715860ac5bd
+  metadata.gz: 9944c5101dc90e5ff2ef8fa18e8692c76a17ee53377560ed1004d7ccf0431fd8
+  data.tar.gz: 9050baa0eeaaaee224a1b458d4c71eeff6269b57645eab0f35d33ca3901a60e7
 SHA512:
-  metadata.gz: 4f48bea86b1be586809aef0121ec82c492d4b077e7292423affe69814a55d4dbdc504dfede511c6c2d4759a426c287b7feb7e69447c057be46a57505b3293433
-  data.tar.gz: c6d829aecc343d4a5bf3cd4ff306051b9c1327276cb36749c44ec76a2bf1399c8c08ec17d83f75568111d35e36dedbd5f51852576551c2e9d6b10cfb69544647
+  metadata.gz: e40e2ff6dee2172547206c1bb62da931b411675c4ba0a88c431a031d7d844666011080af6210406c2143fbd41c1aa22d302f2743d173e55c64e722c748b1b250
+  data.tar.gz: eccc9f39f593bd893e8f8b61fa9c6fee27a0fdc549d3d0c5c2b9963c4435319c60c783559cd18ec59a294fb898d45a57e6cfcfab199a91e8e4e86804b91ef959

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker_bo (0.1.3)
+    codebreaker_bo (0.1.5)
       json (~> 2.6.1)
 
 GEM

data/data/statistic.yml

@@ -0,0 +1,13 @@
+---
+- :user_name: WEWEE
+  :difficulty: easy
+  :attempts_total: 15
+  :attempts_used: 15
+  :hints_total: 2
+  :hints_used: 2
+- :user_name: TWTWTWT
+  :difficulty: medium
+  :attempts_total: 10
+  :attempts_used: 10
+  :hints_total: 1
+  :hints_used: 1

data/e_attempts

@@ -0,0 +1,20 @@
+
+
From:
 /home/bo/rubypr/codebreaker/lib/codebreaker/Console.rb:75 Console#game_process:
+
+    74: def game_process
+ => 75:   binding.pry
+    76:   if !game.decrease_attempts == game.secret_code && 'lose'
+    77:       p game
+    78:       game_actions
+    79:   end
+    80: 
+    81:   # if !game.used_attempts.nil? && !game.used_attempts.zero?
+    82:   #   p game
+    83:   #   game_actions
+    84:   # else
+    85:   #   p 'attempts finished'
+    86:   #   lose
+    87:   #   new_process
+    88:   # end
+    89: end
+

data/lib/codebreaker/constant.rb

@@ -6,7 +6,7 @@ module Constants
 
   MEDIUM = { attempts: 10,
              hints: 1 }.freeze
-  HELL = { attempts: 1,
+  HELL = { attempts: 5,
            hints: 1 }.freeze
   PLUS = '+'
   MINUS = '-'
@@ -15,4 +15,5 @@ module Constants
   LENGTH_RANGE = (3..20).freeze
   RANGE = (1..6).freeze
   NUMBER_OF_DIGITS = 4
+  PATH = './data/statistic.yml'
 end

data/lib/codebreaker/game.rb

@@ -2,12 +2,28 @@
 
 module Codebreaker
   class Game < BaseClass
-    attr_accessor :user_hints
-    attr_reader :secret_code, :total_attempts, :used_attempts, :level, :stats
+    attr_reader :secret_code, :total_attempts, :used_attempts, :total_hints, :used_hints, :stats, :level
 
     def initialize
       super()
       @secret_code = generate_code
+      @stat = Statistic.new
+    end
+
+    def decrease_attempts
+      return secret_code && 'lose' if @used_attempts.zero?
+
+      @used_attempts -= 1
+    end
+
+    def save_stats
+      hash = { user_name: @player_name, difficulty: level, attempts_total: total_attempts, attempts_used: used_attempts,
+               hints_total: total_hints, hints_used: used_hints }
+      @stat.collect_statistic(hash)
+    end
+
+    def load_stats
+      @stat.show_statistic
     end
 
     def create_settings(name, level)
@@ -38,7 +54,8 @@ module Codebreaker
       return unless @level.nil?
 
       @level = level
-      @user_hints = choice_level[:hints]
+      @used_hints = choice_level[:hints]
+      @total_hints = choice_level[:hints]
       @total_attempts = choice_level[:attempts]
       @used_attempts = choice_level[:attempts]
     end
@@ -46,83 +63,46 @@ module Codebreaker
     def check_guess(numbers)
       return show_errors unless guess_valid?(numbers)
 
-      decrease_attempts
       array_choose_numbers = numbers.to_s.each_char.map(&:to_i)
       return win if secret_code == array_choose_numbers
 
+      decrease_attempts
       codebreaker_result(array_choose_numbers)
     end
 
     def use_hint
-      return 'Hints are over' if @user_hints.zero?
+      return 'Hints are over' if @used_hints.zero?
 
-      @user_hints -= 1
+      @used_hints -= 1
       secret_code.sample
     end
 
-    def collect_statistic
-      @stats = [{
-        user_name: @player_name,
-        game_status: 'WIN',
-        difficulty: level,
-        attempts_total: total_attempts,
-        attempts_used: used_attempts,
-        hints_total: user_hints,
-        hints_used: use_hint
-      }]
-      save_statistic
-    end
-
-    def show_statistic
-      stats_load
-      multi_sort
-      @items.each_with_index.map do |stat, index|
-        [index.next, stat[:user_name], stat[:difficulty], stat[:attempts_total],
-         stat[:attempts_used], stat[:hints_total], stat[:hints_total]]
-      end
-    end
-
     def win
       "#{Constants::PLUS * Constants::WIN_NUMBER}(win)"
     end
 
     private
 
-    def save_statistic
-      yaml_data = YAML.load_file('./data/statistic.yml')
-      yaml_data = [] if yaml_data.nil?
-      yaml_data << stats
-      File.open('./data/statistic.yml', 'r+') { |file| file.write YAML.dump(yaml_data.flatten) }
-    end
-
-    def stats_load
-      @items = YAML.load_file('./data/statistic.yml')
-    end
-
-    def multi_sort
-      @items.sort_by! { |game| [game[:difficulty], game[:attempts_used], game[:hints_total]] }
-    end
-
     def generate_code
       Array.new(Constants::NUMBER_OF_DIGITS) { rand Constants::RANGE }
     end
 
     def codebreaker_result(array_choose_numbers)
-      result = []
+      full_match = []
       array_choose_numbers.each_with_index do |code, index|
         next unless code == secret_code[index]
 
-        result << Constants::PLUS
+        full_match << code
         array_choose_numbers[index] = nil
       end
-      array_choose_numbers.compact.uniq.each { |number| result << Constants::MINUS if secret_code.include? number }
-      result.join
+      partial_match = array_choose_numbers.compact.uniq.select { |number| secret_code.include? number }
+      partial_match = partial_match.reject { |number| full_match.include? number }
+      create_result(full_match, partial_match)
     end
 
-    def decrease_attempts
-      return secret_code && 'lose' if @used_attempts.zero?
-
-      @used_attempts -= 1
+    def create_result(full_match, partial_match)
+      result = full_match.map { Constants::PLUS } + partial_match.map { Constants::MINUS }
+      result.join
     end
   end
 end

data/lib/codebreaker/statistic.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Codebreaker
+  class Statistic
+    def collect_statistic(hash)
+      @stat = [{
+        user_name: hash[:user_name],
+        difficulty: hash[:difficulty],
+        attempts_total: hash[:attempts_total],
+        attempts_used: hash[:attempts_used],
+        hints_total: hash[:hints_total],
+        hints_used: hash[:hints_used]
+      }]
+      save_statistic
+    end
+
+    def show_statistic
+      @items = YAML.load_file(Constants::PATH)
+      @items.sort_by! { |game| [game[:difficulty], game[:attempts_used], game[:hints_used]] }
+      @items.each_with_index.map do |stat, index|
+        [index.next, stat[:user_name], stat[:difficulty], stat[:attempts_total],
+         stat[:attempts_used], stat[:hints_total], stat[:hints_used]]
+      end
+    end
+
+    def save_statistic
+      yaml_data = YAML.load_file(Constants::PATH)
+      yaml_data = [] if yaml_data.nil?
+      yaml_data << @stat
+      File.open(Constants::PATH, 'r+') { |file| file.write YAML.dump(yaml_data.flatten) }
+    end
+  end
+end

data/lib/codebreaker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Codebreaker
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/codebreaker.rb

@@ -7,4 +7,5 @@ module Codebreaker
   require 'codebreaker/game'
   require 'codebreaker/user'
   require 'codebreaker/validation'
+  require 'codebreaker/statistic'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_bo
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Oladko Bohdan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -173,12 +173,12 @@ files:
 - README.md
 - Rakefile
 - data/statistic.yml
+- e_attempts
 - lib/codebreaker.rb
 - lib/codebreaker/base_class.rb
 - lib/codebreaker/constant.rb
 - lib/codebreaker/game.rb
-- lib/codebreaker/statistic.yml
-- lib/codebreaker/test_console.rb
+- lib/codebreaker/statistic.rb
 - lib/codebreaker/user.rb
 - lib/codebreaker/validation.rb
 - lib/codebreaker/version.rb

data/lib/codebreaker/test_console.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-# require 'yaml'
-#
-# require 'codebreaker'
-# require_relative 'console'
-# require 'pry'
-#
-# c = Console.new
-# c.choose_action
-# c.multi_sort
-# c.take_stats
-
-# p c.registration
-# p c
-# p c.game_process