codebreaker2018 0.3.2.0 → 0.3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e939f4dbfde225f7704f87b6446a43d99c23c68bde623002b89f71c41c0d7b34
-  data.tar.gz: 66c37dfbee641cad5eb61257aa39c5a930cb73bcb4d22a8a873db95b2491f3d3
+  metadata.gz: 00ea58537c3077f4a1e42e014774cfcb738ea935ea9d2cee613797602ac240d6
+  data.tar.gz: 9a7ef487af42f4b4a14a8dfdad34c3e5bc138b81f36c8418660c7afe3755986e
 SHA512:
-  metadata.gz: fc2e54e5b4d281684ef89f39ed88889fa8ed9f256f35b892b380e840ca600c6282c6482df9e94758d47a7780a32f237dd5a542c6a8ed1a374e197b4aea5762af
-  data.tar.gz: 2d4d14b053ffdb3b28c11cb7aab709bd2ad02f8d92fe85ab8e07840241f8f78a2683ef29852574fdd8995a4e1b8c453ef09903c49c29ddbbf6828894569ca5c0
+  metadata.gz: 5013a43f848a620046e86131b91d2a4c225c819d5b40a17391f7511e27fd25886fd2f64541dc1c9dfa8b47ca4d58525a082ca01b4ba853656ff3ef632bda0a08
+  data.tar.gz: 354570b2147657593251fe140a3b2ac04fbe8c127bcb09b6958bf743d91fa4537d6fbf0c96928cc06e89f7a1fe31b583973ce9b19fed28bf22d20cdf6f98fb99

data/lib/codebreaker/console.rb

@@ -5,6 +5,7 @@ module Codebreaker
   class Console
     include Message
     include Motivation
+    include UserScore
     include Storage
 
     DEMO = Game.new('Demo User', 5, 2, :middle, :en)
@@ -60,18 +61,18 @@ module Codebreaker
     def user_interaction(input = EMPTY_INPUT)
       return if game.attempts.zero?
       status, step = false, 0
-        until status
-          begin
-            game.guess_valid?(input)
-            status = true
-          rescue => error
-            puts error.to_s.red unless step.zero? || input == HINT
-            puts "#{message['alerts']['guess']}:"
-            input = gets.chomp
-            step += 1
-            show_hint if input == HINT
-          end
+      until status
+        begin
+          game.guess_valid?(input)
+          status = true
+        rescue => error
+          puts error.to_s.red unless step.zero? || input == HINT
+          puts "#{message['alerts']['guess']}:"
+          input = gets.chomp
+          step += 1
+          show_hint if input == HINT
         end
+      end
       input
     end
 
@@ -98,10 +99,10 @@ module Codebreaker
 
     def input_selector
       input = EMPTY_INPUT
-        until %w(y n).include?(input)
-          print " (y/n) #{message['alerts']['yes_or_no']}:"
-          input = gets.chomp
-        end
+      until %w[y n].include?(input)
+        print " (y/n) #{message['alerts']['yes_or_no']}:"
+        input = gets.chomp
+      end
       input == YES
     end
 
@@ -117,20 +118,6 @@ module Codebreaker
       puts message['info']['successfully_saved'].green
     end
 
-    def save_user_score
-      scores << current_user_score
-    end
-
-    def current_user_score
-      Score.new do |save|
-        save.date = Time.now
-        save.player_name = game.configuration.player_name
-        save.winner = game.won?
-        save.level = game.configuration.level
-        save.score = game.score
-      end
-    end
-
     def new_game
       print message['alerts']['new_game']
       if input_selector

data/lib/codebreaker/localization.rb

@@ -45,7 +45,7 @@ module Codebreaker
     end
 
     def localizations
-      @localizations ||= Hash.new
+      @localizations ||= {}
     end
 
     def merge_localizations

data/lib/codebreaker/message.rb

@@ -1,6 +1,7 @@
 module Codebreaker
   module Message
     private
+
     def message
       @locale.localization
     end

data/lib/codebreaker/motivation.rb

@@ -1,6 +1,7 @@
 module Codebreaker
   module Motivation
     private
+
     def message_is_allowed?
       !game.won? && game.attempts == rand(1..game.configuration.max_attempts)
     end

data/lib/codebreaker/score.rb

@@ -2,6 +2,6 @@ module Codebreaker
   Score = Struct.new(:date, :player_name, :winner, :level, :score) do
     def initialize
       yield self if block_given?
-    end    
+    end
   end
 end

data/lib/codebreaker/storage.rb

@@ -3,13 +3,16 @@ require 'yaml'
 module Codebreaker
   module Storage
     attr_reader :storage_path
+
     private
+
     def apply_external_path(external_path = false)
       yml_file = 'scores.yml'
-      if external_path && !Dir.exists?(external_path)
+      if external_path && !Dir.exist?(external_path)
         raise ArgumentError, 'Invalid external path.'
       end
-      @storage_path = if external_path
+      @storage_path =
+      if external_path
         "#{external_path}/#{yml_file}"
       else
         File.expand_path("./data/#{yml_file}", File.dirname(__FILE__))
@@ -22,7 +25,7 @@ module Codebreaker
 
     def prepare_storage_dir
       storage_dir = File.dirname(storage_path)
-      Dir.mkdir(storage_dir) unless File.exists?(storage_dir)
+      Dir.mkdir(storage_dir) unless File.exist?(storage_dir)
     end
 
     def save_to_yml

data/lib/codebreaker/user_score.rb

@@ -0,0 +1,19 @@
+module Codebreaker
+  module UserScore
+    private
+
+    def current_user_score
+      Score.new do |save|
+        save.date = Time.now
+        save.player_name = game.configuration.player_name
+        save.winner = game.won?
+        save.level = game.configuration.level
+        save.score = game.score
+      end
+    end
+
+    def save_user_score
+      scores << current_user_score
+    end
+  end
+end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.3.2.0'
+  VERSION = '0.3.3.0'
 end

data/lib/codebreaker.rb

@@ -2,6 +2,7 @@ require_relative 'codebreaker/version'
 require_relative 'codebreaker/localization'
 require_relative 'codebreaker/message'
 require_relative 'codebreaker/motivation'
+require_relative 'codebreaker/user_score'
 require_relative 'codebreaker/storage'
 require_relative 'codebreaker/game'
 require_relative 'codebreaker/score'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker2018
 version: !ruby/object:Gem::Version
-  version: 0.3.2.0
+  version: 0.3.3.0
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -97,6 +97,7 @@ files:
 - lib/codebreaker/motivation.rb
 - lib/codebreaker/score.rb
 - lib/codebreaker/storage.rb
+- lib/codebreaker/user_score.rb
 - lib/codebreaker/version.rb
 homepage: https://github.com/bestwebua/homework-04-codebreaker
 licenses: