codeguessing 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bd4ea46cffddc9ac2c2b8f477b10e0b3954f77e
-  data.tar.gz: 78c4704c19a987743c9ef6e425c8dd59abf07010
+  metadata.gz: 61b21ffaab19a1a63dcb02b74ae830577b491f19
+  data.tar.gz: 06fbebd32d6c8d8cc650fe6a5a10b6aa97f2ce77
 SHA512:
-  metadata.gz: 33cdfbbf867d5a0b03a714aee3c2336ebd810db0db61cf081f8100dbe0722851d3e13ddabd3b6b41dddff9dce0ee1d47832758cb44af6256a02c5b35caf1df11
-  data.tar.gz: fb09f6de2f4a84390614d962822c1eb19b0ce0bf04082e44e70becfa12b83044c52ada50f54cc9cff7b4db8f715c2e49a24bae9c9e44793c0b5c766ab82632ea
+  metadata.gz: 96063313e8e199857583e99e07bdfc69849648a156c44e12281364b642e19cee3b6dff54d6f8d7f8cc497994e765451da7d62ed058c330755ba6e73fd7691ec2
+  data.tar.gz: a87df9cec2e9f84de0535190c2ca1cb37046b5b055990c64ca97f3d836971d85e8faab851c4f66539187c5483af29f7a53bdb16da5ee8d73cb5f4714d757649b

data/lib/codeguessing/console.rb

@@ -2,36 +2,37 @@ module Codeguessing
   class Console
     attr_reader :game, :scores, :path
 
+    RULES = [
+      '-----------------Rules!----------------------',
+      "You need guess secret code. This four-digit number with symbols from 1 to 6",
+      "You have #{Game::MAX_ATTEMPTS} attempt(s) and #{Game::MAX_HINT} hint(s)",
+      "If you want get hint write 'hint'",
+      '---------------------------------------------'
+    ]
+
     def initialize(opt = {})
       @path = File.join(File.dirname(__FILE__), 'scores.yml')
       @scores = load(@path)
       @game = Game.new(opt)
     end
 
-    def go(know = true)
-      rules if know
+    def go(knowed = false)
+      rules unless knowed
       puts "Attempt(s): #{@game.attempts} | Hint(s): #{@game.hint_count}"
-      case @game.state
-        when 'true'
-          win
-        when 'false'
-          loose
-        else
-          gaming
+      case @game.win?
+      when true
+        win
+      when false
+        loose
+      else
+        gaming
       end
     end
 
     def	rules
       puts "Do you know rules? (Y/N)"
-      rules = [
-        '-----------------Rules!----------------------',
-        "You need guess secret code. This four-digit number with symbols from 1 to 6",
-        "You have #{@game.attempts} attempt(s) and #{@game.hint_count} hint(s)",
-        "If you want get hint write 'hint'",
-        '---------------------------------------------'
-      ]
       unless confirm?
-        puts rules.join("\n")
+        puts RULES.join("\n")
       end
     end
 
@@ -59,7 +60,7 @@ module Codeguessing
     end
 
     def save!(name = 'Anonim')
-      if @game.state != 'true'
+      unless @game.win?
         return puts 'You cant save game'
       end
       name.chomp!
@@ -96,7 +97,7 @@ module Codeguessing
       puts 'Do you want start again? (Y/N)'
       if confirm?
         @game = Game.new
-        return go(false)
+        return go(true)
       else
         puts '-----------Scores----------'
         p @scores

data/lib/codeguessing/game.rb

@@ -14,59 +14,42 @@ module Codeguessing
       @answer = opt[:answer] || ''
     end
 
-    def guess(code)
-      loose unless check?(use_attempt)
+    def guess(code)
+      @state = 'loose' unless check?(use_attempt)
+      @state = 'win' if code == secret_code
+      @answer = get_mark(code)
+    end
+
+    def get_mark(code)
       return false unless valid?(code)
       hash = {}
-      res = ''
-      remaine_chars = code
-      right_chars = []
+      res = ''
       secret_code.each_char.with_index do |char, i|
-        case
-        when code[i] == char
-          res += '+'
-          right_chars << char
-          remaine_chars[i] = '*'
-          hash.delete(char) if right_chars.include?(char)
-        when remaine_chars.include?(char)
-          hash[char] = '-'
+        if code[i] == char
+          res += '+'
+          code[i] = '_'
+          hash.delete(char)
+        elsif code.include?(char)
+          hash[char] = '-'
         end
       end
       res += hash.values.join('')
-      win if res == '+' * MAX_SIZE
-      @answer = res
     end
 
     def hint
-      res = ''
-      need_index = rand(0...MAX_SIZE)
-      secret_code.each_char.with_index do |char, index|
-        if index == need_index
-          res += char
-        else
-          res += '*'
-        end
-      end
       return '' unless check?(hint_count)
       use_hint
-      res
-    end
-
-    def cur_game
-      hash = {}
-      self.instance_variables.each do |k, v|
-        new_k = k.to_s.gsub('@','').to_sym
-        hash[new_k] = self.instance_variable_get(k)
-      end
-      hash
+      hint = '*' * MAX_SIZE
+      index = rand(0...MAX_SIZE)
+      code_char = secret_code[index]
+      hint[index] = code_char
+      hint
     end
 
     def cur_score(name = 'Anonim')
       hash = cur_game
       hash[:name] = name
       hash[:date] = Time.now.to_i
-      hash.delete(:answer)
-      hash.delete(:state)
       hash
     end
 
@@ -75,11 +58,6 @@ module Codeguessing
       false
     end
 
-    def check?(varible)
-      return false if varible == 0
-      true
-    end
-
     def use_attempt
       @attempts -= 1
     end
@@ -88,13 +66,19 @@ module Codeguessing
       @hint_count -= 1
     end
 
-    def win
-      @state = 'true'
+    def win?
+      case @state
+      when 'win' then true
+      when 'loose' then false
+      end
     end
 
-    def loose
-      @state = 'false'
-    end
+    private
+
+    def check?(varible)
+      return false if varible == 0
+      true
+    end
 
     def random
       code = ''
@@ -102,5 +86,14 @@ module Codeguessing
       code
     end
 
+    def cur_game
+      hash = {}
+      self.instance_variables.each do |k, v|
+        new_k = k.to_s.gsub('@','').to_sym
+        hash[new_k] = self.instance_variable_get(k)
+      end
+      hash
+    end
+
   end
 end

data/lib/codeguessing/version.rb

@@ -1,3 +1,3 @@
 module Codeguessing
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeguessing
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - bezrukavyi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize