codebreaker-rg-te 0.1.14 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 020310ae40a06b7de5cb7c1c8d4df8561c302141
-  data.tar.gz: 18146b099cbb27927321c03e42169fb76b5e3112
+  metadata.gz: d5bc73e3efb3c0ed966cf0714f5fd0caa4c3a8f8
+  data.tar.gz: '0094d8dec63d2938c89f42286b4985235a292a4b'
 SHA512:
-  metadata.gz: 3ec664379784d094d85e45155a86db85b3020184d994bc2fdf76ffb241f8dbdbd80ce322225f0e000024e5ddf1d9d54cb5ef587663019ba1fc71454abb97578c
-  data.tar.gz: 988dda9468fd84201c7dfa748e9cacc49d75af71b476d522c457205bc7d02ad13d859768b02e475a2b447a68702eaa190fc754b3fc4e926974efb6e5d448a3bf
+  metadata.gz: 05e272aa262a9e221290e4cdd9c79890958f848ef4d4676b4cbdbd3c4089a15f1728805faaa2afae2d6c832149dd2642d960b301b3e449450d2c73516e3193d5
+  data.tar.gz: d960c5c1e39030f6aa1e462e53222f89f8f6f387052f6877b1d6dcb04306e8d10c85c889505fa069466b5750db90f4381f0ddfd08a7d5053cbd0ea1dfc6cce27

data/lib/codebreaker.rb

@@ -1,12 +1,4 @@
-require 'i18n'
-require 'yaml'
-require 'codebreaker/storage/storage_interceptor.rb'
-require 'codebreaker/console.rb'
-require 'codebreaker/localization.rb'
-require 'codebreaker/validation.rb'
-require 'codebreaker/statistics.rb'
-require 'codebreaker/game.rb'
-require 'codebreaker.rb'
+require 'autoload.rb'
 
 module Codebreaker
 end

data/lib/codebreaker/console.rb

@@ -14,32 +14,22 @@ module Codebreaker
     ANSWERS = { yes: 'yes' }.freeze
 
     def launch
-      loop do
-        message(:start_game)
-        message(:wel_instruct, COMMANDS)
-        @answer = read_from_console
-        return check_answer
-      end
-    end
-
-    def start_game
-      @game = Codebreaker::Game.new
-      enter_name
-      enter_level
-      @game.new_game
-      round_game
+      message(:start_game)
+      message(:wel_instruct, COMMANDS)
+      @answer = read_from_console
+      check_answer
     end
 
     def round_game
       while @game.attempts.positive?
         user_answer = message_game_read_console
         next hint_show if user_answer == HINT
-        next message(:invalid_number) unless @game.validate_code(user_answer)
+        next message(:invalid_number) unless @game.validate_code(user_answer, Codebreaker::Game::USER_ANSWER_REX)
 
         @game.handle_guess(user_answer)
+        message_game_result
         return win if @game.equal_codes?(user_answer)
 
-        message_game_result
       end
       loose
     end
@@ -63,11 +53,6 @@ module Codebreaker
       continue_game? ? start_game : exit
     end
 
-    def continue_game?
-      message(:new_game)
-      read_from_console.eql? ANSWERS[:yes]
-    end
-
     def stats_show
       @stat = Codebreaker::Statistics.new
       return message(:empty_stat) unless data = @stat.stats
@@ -85,6 +70,19 @@ module Codebreaker
 
     private
 
+    def continue_game?
+      message(:new_game)
+      read_from_console.eql? ANSWERS[:yes]
+    end
+
+    def start_game
+      @game = Codebreaker::Game.new
+      enter_name
+      enter_level
+      @game.new_game
+      round_game
+    end
+
     def check_answer
       case @answer
       when COMMANDS[:start] then start_game

data/lib/codebreaker/game.rb

@@ -3,7 +3,7 @@
 module Codebreaker
   class Game
     include Validation
-    attr_reader :attempts, :hints, :level, :name, :level_num
+    attr_reader :attempts, :hints, :level, :name, :level_num, :current_time
     attr_reader :hints_index, :result
     attr_reader :user_code, :secret_code, :phrases
     RANGE = (1..6).freeze
@@ -17,6 +17,7 @@ module Codebreaker
     COUNTS_OF_HINTS = (0..3).freeze
     DIGITS_COUNT = 4
     USER_ANSWER_REX = /^[1-6]{4}$/.freeze
+    NAME_SIZE_RANGE = (3..20).freeze
 
     def new_game
       @secret_code = Array.new(DIGITS_COUNT) { rand(RANGE) }
@@ -34,7 +35,7 @@ module Codebreaker
     end
 
     def enter_name(name)
-      return unless validate_length(name)
+      return unless validate_length(name, NAME_SIZE_RANGE)
 
       @name = name
     end
@@ -65,8 +66,27 @@ module Codebreaker
     end
 
     def game_result
-      return '++++' if equal_codes?(@user_code.join)
+      puts @secret_code
+      count_plus + count_minus
+    end
+
+    def storage_data(codebreaker_data)
+      attempts_used = GAME_LEVELS.dig(level.to_sym, :attempts) - attempts
+      hints_used = GAME_LEVELS.dig(level.to_sym, :hints) - hints
+      game_date = Time.new.strftime "%Y/%m/%d %H:%M:%S"
+      hash_stat = { name: @name, level: @level, level_num: @level_num, attempts: @attempts, attempts_used: attempts_used, hints: @hints, hints_used: hints_used, game_date: game_date }
+      codebreaker_data << hash_stat
+    end
 
+    def save
+      storage = StorageInterceptor.new
+      codebreaker_data = storage.read_database || []
+      storage.write_database(storage_data(codebreaker_data))
+    end
+
+    private
+
+    def count_plus
       result = ''
       @secret_code_clone = @secret_code.clone
       @user_code.each_with_index do |digit, index|
@@ -76,7 +96,12 @@ module Codebreaker
         @secret_code_clone[index] = nil
         @user_code[index] = nil
       end
+      result
+    end
 
+    def count_minus
+      result = ''
+      @secret_code_clone = @secret_code.clone
       @user_code.compact.each_with_index do |digit, _index|
         next unless @secret_code_clone.include?(digit)
 
@@ -85,18 +110,5 @@ module Codebreaker
       end
       result
     end
-
-    def storage_data(codebreaker_data)
-      attempts_used = GAME_LEVELS.dig(level.to_sym, :attempts) - attempts
-      hints_used = GAME_LEVELS.dig(level.to_sym, :hints) - hints
-      hash_stat = { name: @name, level: @level, level_num: @level_num, attempts: @attempts, attempts_used: attempts_used, hints: @hints, hints_used: hints_used }
-      codebreaker_data << hash_stat
-    end
-
-    def save
-      storage = StorageInterceptor.new
-      codebreaker_data = storage.read_database || []
-      storage.write_database(storage_data(codebreaker_data))
-    end
   end
 end

data/lib/codebreaker/validation.rb

@@ -1,9 +1,9 @@
 module Validation
-  def validate_length(word)
-    word.size > 2 && word.size < 21
+  def validate_length(word, range)
+    range.include?(word.size)
   end
 
-  def validate_code(code)
-    code =~ Codebreaker::Game::USER_ANSWER_REX
+  def validate_code(code, regexp)
+    code =~ regexp
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker-rg-te
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.16
 platform: ruby
 authors:
 - Eugene Tereschenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: fasterer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement