codebreaker_game 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c834fd35a0d502315d62fc4d1bf762d86c00358cd7f3c68ae625b7a205d9f21e
-  data.tar.gz: f55dd523970e01fe39e31caeb9c81c249242ae305c8977d257df62d5dc70f389
+  metadata.gz: f6fb4ec1bf52cb3b621494242b84d4403501a78caface7a7cbd641fe5a74af49
+  data.tar.gz: f1fc052e202d70a2871c6cbd7e307f1e45903e7ba8767aa47926aff7276ea764
 SHA512:
-  metadata.gz: 25f2e5c012907e01ee90e6277576503008a69786eec71bc2305e7c87a81ac519371f0ddbf7f1fcba1266e8b0a8c17f9c32340dc79881806dd84cb3cba24bf72a
-  data.tar.gz: 8514c94e16c2bb9ccc6472836605de32fbc20e434acde35524fbddb95fc0d58a040eebe349900d35b3b995fc66f0b636f2b3300297a001c681746d7e0fb89d79
+  metadata.gz: 6f775d699bf37cabc345832703e01db4fc580f318ff4c08b86e25e34cc427f3da8f764ddd7c9c071a6b300add29da17e615ef0a821208877a14905d7cb73d285
+  data.tar.gz: 552b206fd062d4c309d2732335a723d9ef234008bb57c6ee69c3863ca252a10ed1b4db84509ccf5a17240d86abaf5d653e52b3f3b2297fdb872457fe819fc918

data/.gitignore

@@ -1,3 +1,4 @@
+/.idea/
 /.bundle/
 /.yardoc
 /_yardoc/

data/.rakeTasks

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Settings><!--This file was automatically generated by Ruby plugin.
+You are allowed to: 
+1. Remove rake task
+2. Add existing rake tasks
+To add existing rake tasks automatically delete this file and reload the project.
+--><RakeGroup description="" fullCmd="" taksId="rake"><RakeTask description="Build codebreaker_game-0.1.1.gem into the pkg directory" fullCmd="build" taksId="build" /><RakeTask description="Remove any temporary products" fullCmd="clean" taksId="clean" /><RakeTask description="Remove any generated files" fullCmd="clobber" taksId="clobber" /><RakeTask description="Build and install codebreaker_game-0.1.1.gem into system gems" fullCmd="install" taksId="install" /><RakeGroup description="" fullCmd="" taksId="install"><RakeTask description="Build and install codebreaker_game-0.1.1.gem into system gems without network access" fullCmd="install:local" taksId="local" /></RakeGroup><RakeTask description="Create tag v0.1.1 and build and push codebreaker_game-0.1.1.gem to rubygems.org" fullCmd="release[remote]" taksId="release[remote]" /><RakeTask description="Run RSpec code examples" fullCmd="spec" taksId="spec" /><RakeTask description="" fullCmd="default" taksId="default" /><RakeTask description="" fullCmd="release" taksId="release" /><RakeGroup description="" fullCmd="" taksId="release"><RakeTask description="" fullCmd="release:guard_clean" taksId="guard_clean" /><RakeTask description="" fullCmd="release:rubygem_push" taksId="rubygem_push" /><RakeTask description="" fullCmd="release:source_control_push" taksId="source_control_push" /></RakeGroup></RakeGroup></Settings>

data/Gemfile.lock

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

data/lib/codebreaker_game.rb

@@ -24,8 +24,7 @@ module CodebreakerGame
       @secret_number = generate_secret(SECRET_LENGTH)
       @status = STATUS_IN_PROGRESS
       @hints = @secret_number.to_s.chars.shuffle
-      @storage = yaml_store
-      @difficulty_factory = CodebreakerGame::DifficultyFactory.new
+      @storage = CodebreakerGame::Game.new_store
       save_storage unless CodebreakerGame::Game.storage_exists?
       synchronize_storage
     end
@@ -49,7 +48,7 @@ module CodebreakerGame
     end
 
     def create_difficulty(difficulty:)
-      @difficulty_factory.difficulty_by_name(difficulty)
+      CodebreakerGame::DifficultyFactory.new.difficulty_by_name(difficulty)
     end
 
     def attempt(user_number)
@@ -70,11 +69,16 @@ module CodebreakerGame
       @hints.pop
     end
 
+    def save_storage
+      @storage.transaction do
+        @storage[:winners] = @winners || []
+      end
+    end
+
     private
 
     def win
       @winners << user
-      save_storage
       @status = STATUS_WIN
     end
 
@@ -86,16 +90,16 @@ module CodebreakerGame
     def compare_numbers(number, number_two)
       secret_digits = number.to_s.chars
       user_digits = number_two.to_s.chars
-      response = pluses(secret_digits, user_digits)
-      response += minuses(secret_digits, user_digits)
+      response = strong_intersections(secret_digits, user_digits)
+      response += not_strong_intersections(secret_digits, user_digits)
       win if response == STRONG_INTERSECTION * SECRET_LENGTH
       response
     end
 
-    def pluses(secret_digits, user_digits)
+    def strong_intersections(secret_digits, user_digits)
       response = ''
       secret_digits.each_with_index do |digit, index|
-        next if digit != user_digits[index]
+        next unless digit == user_digits[index]
 
         response += STRONG_INTERSECTION
         secret_digits[index] = nil
@@ -104,12 +108,13 @@ module CodebreakerGame
       response
     end
 
-    def minuses(secret_digits, user_digits)
+    def not_strong_intersections(secret_digits, user_digits)
       response = ''
-      secret_digits.each_with_index do |digit, index|
-        next unless digit != user_digits[index] && user_digits.include?(digit)
+      secret_digits.each do |digit|
+        next if digit.nil? || !user_digits.include?(digit)
 
         response += NOT_STRONG_INTERSECTION
+        user_digits.delete_at(user_digits.index(digit))
       end
       response
     end
@@ -119,15 +124,5 @@ module CodebreakerGame
         @winners = @storage[:winners]
       end
     end
-
-    def save_storage
-      @storage.transaction do
-        @storage[:winners] = @winners || []
-      end
-    end
-
-    def yaml_store
-      YAML::Store.new(CodebreakerGame::Game.storage_file)
-    end
   end
 end

data/lib/codebreaker_game/storage.rb

@@ -13,5 +13,9 @@ module CodebreakerGame
     def flush
       File.delete(STAT_FILE) if storage_exists?
     end
+
+    def new_store(filename = STAT_FILE)
+      YAML::Store.new(filename)
+    end
   end
 end

data/lib/codebreaker_game/version.rb

@@ -1,3 +1,3 @@
 module CodebreakerGame
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_game
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2019-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,7 @@ files:
 - ".circleci/config.yml"
 - ".fasterer.yml"
 - ".gitignore"
+- ".rakeTasks"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"