codeguessing 0.3.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 047e3995be8f530e9bdabfc971a420dd32bbf191
-  data.tar.gz: 83a0e3abad28f67917f85ff50b72e4ac7317c692
+  metadata.gz: e2be5270a620c86f26d398e9c6af49b43aa5c8f4
+  data.tar.gz: 1327eb3f6a111ee3581cdc8593d350f1283ce728
 SHA512:
-  metadata.gz: 963795b20259881a44a8f52b8ceb46df397c6516e954061876859cd264eb872cb5b22f5753da0165835e2cc3bc0ce7063f65d46a68e98f6a3b10b560dd19ddb5
-  data.tar.gz: f99eb025924bcbf607a4560209eea4491a66aa78a47e0a54d15a8548501d54ff239e6a21c225152b9bbe1491a83cca144f2cc3a093a609acf5f53a5f7e849dbc
+  metadata.gz: 6c6db8055afff298cf5d5c4abc09d7f88f32679c425bf08bb42a1a31c8a4913f3c20f2b53820d6bec01fa725634eda7bd34cee8e8ec09dc2173c9b7e781e26fe
+  data.tar.gz: fbc530de9fe44ed38e626068f01643c5dc41ac34cb84384082728a5be3c6fd9b29bb3d5a90b10c5539a23a575011e05c21ab8b74a7f9ae90f78ddf4631e335bc

data/lib/codeguessing/console.rb

@@ -1,94 +1,107 @@
 module Codeguessing
-  class Console
-    def initialize(again = false, opt = {})
+  class Console
+    attr_reader :game, :scores, :path
+
+    def initialize(opt = {})
       @path = File.join(File.dirname(__FILE__), 'scores.yml')
       @scores = load(@path)
-      @game = Game.new(opt)
-      return start if again
-      knowing
-    end
-
-    def	knowing
-      puts "Are you ready broke code? (Y/N)"
-      if confirm?
-        puts '-----------------Rules!----------------------'.yellow
-        puts "You need guess secret code. This four-digit number with symbols from 1 to 6".yellow
-        puts "You have #{@game.attempts} attempt(s) and #{@game.hint_count} hint(s)".yellow
-        puts "If you want get hint write 'hint'".yellow
-        puts '---------------------------------------------'.yellow
-        return start
-      else
-        puts 'Goodbie!'
-      end
-    end
-
-    def start
-      puts "Attempt(s): #{@game.attempts} | Hint(s): #{@game.hint_count}"
-      return loose if @game.state == 'false'
-      return win if @game.state == 'true'
-
-      action = gets.chomp
-      if action == 'hint'
-        puts @game.hint
-        return start
-      end
-      unless @game.valid?(action)
-        puts 'Invalid data'.red
-        return start
-      end
-      puts coloring(@game.guess(action))
-      start
-    end
-
-    def win
-      puts 'You win!'.green
-      puts 'Do you want save result? (Y/N)'
-      return puts 'Goodbie!' unless confirm?
-      puts 'Write your name'
-      save(gets.chomp)
-      again?
-    end
-
-    def loose
-      puts 'You loose!'.red
-      again?
-    end
-
-    def again?
-      puts 'Do you want start again? (Y/N)'
-      if confirm?
-        Console.new(true)
-      else
-        puts '-----------Scores----------'.yellow
-        puts @scores
-        puts '---------------------------'.yellow
-      end
+      @game = Game.new(opt)
     end
+
+    def go(know = true)
+      rules if know
+      puts "Attempt(s): #{@game.attempts} | Hint(s): #{@game.hint_count}"
+      case @game.state
+        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")
+      end
+    end
+
+    def gaming
+      action = gets.chomp
+      if action == 'hint'
+        puts @game.hint
+        return go(false)
+      end
+      if @game.valid?(action)
+        puts @game.guess(action)
+      else
+        puts 'Invalid data'
+      end
+      go(false)
+    end
 
     def confirm?(action = gets.chomp)
-      return true if action == 'Y'
+      return true if action.downcase == 'y'
       false
     end
 
-    def coloring(string)
-      color_s = ''
-      string.chars { |w| color_s += w == '+' ? '+'.green : '-'.red }
-      color_s
-    end
-
     def load(path)
       YAML.load(File.open(path)) if File.exist?(path)
     end
 
-    def save(name = 'Anonim')
-      return if @game.state != 'true'
-      @scores << @game.cur_score(name)
+    def save!(name = 'Anonim')
+      if @game.state != 'true'
+        return puts 'You cant save game'
+      end
+      name.chomp!
+      @scores << @game.cur_score(name)
       File.new(@path, 'w') unless File.exist?(@path)
       File.open(@path, "r+") do |f|
         f.write(@scores.to_yaml)
       end
       @scores
     end
+
+    private
+
+    def win
+      puts 'You win!'
+      save?
+      again?
+    end
 
+    def loose
+      puts 'You loose!'
+      again?
+    end
+
+    def save?
+      puts 'Do you want save result? (Y/N)'
+      return puts 'Goodbie!' unless confirm?
+      puts 'Write your name'
+      save!(gets)
+    end
+
+    def again?
+      puts 'Do you want start again? (Y/N)'
+      if confirm?
+        @game = Game.new
+        return go(false)
+      else
+        puts '-----------Scores----------'
+        p @scores
+        puts '---------------------------'
+      end
+    end
+
   end
 end

data/lib/codeguessing/game.rb

@@ -1,7 +1,6 @@
 module Codeguessing
   class Game
-    attr_reader :attempts, :hint_count, :state, :answer
-    attr_accessor :secret_code
+    attr_accessor :attempts, :hint_count, :state, :answer, :secret_code
 
     MAX_HINT = 2
     MAX_ATTEMPTS = 5
@@ -16,14 +15,17 @@ module Codeguessing
 
     def guess(code)
       loose unless check?(use_attempt)
+      hash = {}
       res = ''
       code.each_char.with_index do |char, i|
-        if char == secret_code[i]
-          res += '+'
-        else
-          res += '-'
-        end
+        case
+          when char == secret_code[i]
+            res += '+'
+          when secret_code.count(char) == 1
+            hash[char] = '-'
+          end
       end
+      res += hash.values.join('')
       win if res == '++++'
       @answer = res
     end

data/lib/codeguessing/scores.yml

@@ -1,22 +1,21 @@
 ---
-- :name: Yaroslav
-  :secret_code: '1234'
-  :attempts: 4
-  :hint_count: 2
-  :state: true
-- :name: '1234435'
-  :secret_code: '1234'
-  :attempts: 4
+- :secret_code: '2222'
+  :attempts: 5
   :hint_count: 2
-  :state: 'true'
-  :answer: "++++"
-- :name: '1384848484'
-  :secret_code: '1234'
+  :name: Yaroslav
+- :secret_code: '1222'
+  :attempts: 3
+  :hint_count: 1
+  :name: 'Yaroslav
+
+'
+- :secret_code: '1351'
+  :attempts: 1
+  :hint_count: 0
+  :name: 'Yaroslav
+
+'
+- :secret_code: '1111'
   :attempts: 4
-  :hint_count: 2
-  :state: 'true'
-  :answer: "++++"
-- :secret_code: '1234'
-  :attempts: 4
-  :hint_count: 2
-  :name: Yayryary
+  :hint_count: 0
+  :name: Ivan

data/lib/codeguessing/version.rb

@@ -1,3 +1,3 @@
 module Codeguessing
-  VERSION = "0.3.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codeguessing
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: '0.4'
 platform: ruby
 authors:
 - bezrukavyi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Codeguessing