ep-codebreaker 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c45f4b036d900f69e000968330075913f5f1af45
-  data.tar.gz: 2af9d5774271a13681e99fb981cb843a80a450a3
+  metadata.gz: de0fd41f89af6ea0ec1d47b403970f9b78f16c6f
+  data.tar.gz: d04cb5e91d335f0bdc0f79174abd0caebef73b91
 SHA512:
-  metadata.gz: 881212ae0b7370863692c5934b19a55bd67cf3f05068fc6e1247a5c79985ba1b54fd64cb661627ad6f623430b280c315d9a7bf095dec759f74c56935cca1d5e7
-  data.tar.gz: 9c25651b2b33149c1cbffb589a3a0706b895766e325679a62cff1e48566f927ec557948503fdc4e2eb6abc91adbce51cb14c8df7640b7508212c881954c3ff1a
+  metadata.gz: 5bdf87c0a1ef1d5f0ee230b2943dc86164c0b2155d34c18be704e77cc12153fba56dce4d73ef06310a05eeb2fd578a031bd4beb6e6cdfa6e4b8f59b7227501a4
+  data.tar.gz: eac26be24f7a587464eddc775ac31f8409985e1286c865ee9ebaf75f47acc5060ad3708ec578f3a3db3ebedce08e8ba1433919c46b94584aa2a1b4ee658023a2

data/lib/ep-codebreaker/console_app.rb

@@ -38,14 +38,14 @@ module Codebreaker
         input = gets.chomp
 
         case input
-        when '1' then puts @game.use_hint, "\n"
+        when '1' then Messages.hint(@game.hint, @game.hints_left, @game.tries_left)
         when '0' then return
         else check_guess(input)
         end
       end
 
       if @game.won?
-        Messages.win(@game.answer, @game.tries)
+        Messages.win(@game.answer)
         save_score
       else
         Messages.lose(@game.answer)
@@ -59,7 +59,7 @@ module Codebreaker
 
       scores.map
             .with_index { |player, i| format("%2i #{player.formatted}", i + 1) }
-            .unshift(format('%2s %10s %5s', '', 'Name', 'Tries'))
+            .unshift(format('%2s %10s %6s', '', 'Name', 'Points'))
     end
 
     def check_guess(input)
@@ -77,7 +77,7 @@ module Codebreaker
       begin
         print 'Type your name: '
         @game.save_score(gets.chomp)
-        puts 'Your score was saved'
+        puts 'Your score was saved.'
       rescue ArgumentError => ex
         puts ex.message, "\n"
         retry

data/lib/ep-codebreaker/game.rb

@@ -2,12 +2,25 @@
 
 module Codebreaker
   class Game
-    attr_reader :tries_left
+    MIN = 1
+    MAX = 6
+    LENGTH = 4
+
+    REGEXP = Regexp.new("^[#{MIN}-#{MAX}]{#{LENGTH}}$")
+
+    TRIES = 10
+    HINTS = 3
+
+    private_constant :MIN, :MAX, :LENGTH, :REGEXP, :TRIES, :HINTS
+    attr_reader :tries_left, :hints_left
 
     def start
       @code = Array.new(LENGTH) { rand(MIN..MAX) }.join
-      @hint = @code.chars.sample
+      @array_for_hints = @code.chars
+
       @tries_left = TRIES
+      @hints_left = HINTS
+      
       @finished = false
       @won = false
     end
@@ -22,8 +35,15 @@ module Codebreaker
       result
     end
 
-    def use_hint
-      @hint
+    def hint
+      return false if @hints_left.zero?
+
+      @tries_left -= 1
+      @hints_left -= 1
+      define_stage
+
+      index = rand(@array_for_hints.length)
+      @array_for_hints.delete_at(index)
     end
 
     def finished?
@@ -34,20 +54,16 @@ module Codebreaker
       @won
     end
 
-    def tries
-      TRIES - @tries_left
-    end
-
     def answer
       @code if finished?
     end
 
     def save_score(name, file_name = 'scores.yml')
-      player = Player.new(name, tries)
+      player = Player.new(name, @tries_left, @hints_left)
 
       scores = process_file(file_name)
       scores << player
-      scores = scores.min_by(10, &:tries)
+      scores = scores.max_by(10, &:points)
 
       File.open(file_name, 'w') { |f| f.write scores.to_yaml }
     end
@@ -71,7 +87,7 @@ module Codebreaker
       ('+' * num_of_pluses) + ('-' * num_of_minuses)
     end
 
-    def define_stage(result)
+    def define_stage(result = '')
       if result == ('+' * LENGTH)
         @finished = true
         @won = true

data/lib/ep-codebreaker/messages.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Codebreaker
-  module Messages
+  class Messages
     class << self
       def logo
         puts " ]]]]    ]]]]   ]]]]]   ]]]]] \n" \
@@ -24,31 +24,39 @@ module Codebreaker
 
       def run
         puts "\n" \
-            "1 - play        \n" \
-            "2 - high scores \n" \
-            "0 - exit        \n" \
-            "\n"
+             "1 - play        \n" \
+             "2 - high scores \n" \
+             "0 - exit        \n" \
+             "\n"
       end
 
       def play
         puts "Let's go! \n" \
-            "\n" \
-            "1 - hint  \n" \
-            "0 - end   \n" \
-            "\n"
+             "\n" \
+             "1 - hint  \n" \
+             "0 - end   \n" \
+             "\n"
       end
 
-      def win(answer, tries)
-        puts 'Congratulations! You are the winner!'
-        puts "It was #{answer} and you did it in #{tries} tries", "\n"
+      def win(answer)
+        puts 'Congratulations! You are the winner!', "It was #{answer}.", "\n"
       end
 
       def lose(answer)
-        puts 'Sorry, you lose(((', "It was #{answer}"
+        puts 'Sorry, you lose(((', "It was #{answer}.", "\n"
       end
 
       def tries_left(tries_left)
-        puts "#{tries_left} tries left", "\n"
+        puts "#{tries_left} tries left.", "\n"
+      end
+
+      def hint(hint, hints_left, tries_left)
+        if hint
+          puts "Secret code contains #{hint}.", "#{hints_left} hints_left."
+          tries_left(tries_left)
+        else
+          puts 'No hints left.', "\n"
+        end
       end
 
       def bye
@@ -56,7 +64,7 @@ module Codebreaker
       end
 
       def wrong_option
-        puts 'Wrong option'
+        puts 'Wrong option!'
       end
     end
   end

data/lib/ep-codebreaker/player.rb

@@ -2,25 +2,28 @@
 
 module Codebreaker
   class Player
-    attr_reader :name, :tries
-
-    def initialize(name, tries)
+    def initialize(name, tries_left, hints_left)
       self.name = name
-      @tries = tries
+      @tries_left = tries_left
+      @hints_left = hints_left
     end
 
     def formatted
-      format('%10s %5i', @name, @tries)
+      format('%10s %6i', @name, points)
     end
 
     def as_json
-      { name: @name, tries: @tries }
+      { name: @name, points: points }
     end
 
     def to_json(*options)
       as_json.to_json(*options)
     end
 
+    def points
+      100 * (@tries_left + 1) + 75 * @hints_left
+    end
+
     private
 
     def name=(value)

data/lib/ep-codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = "0.1.2"
+  VERSION = '0.2.0'
 end

data/lib/ep-codebreaker.rb

@@ -4,15 +4,3 @@ require 'yaml'
 require 'ep-codebreaker/version'
 require 'ep-codebreaker/player'
 require 'ep-codebreaker/game'
-
-module Codebreaker
-  MIN = 1
-  MAX = 6
-  LENGTH = 4
-
-  REGEXP = Regexp.new("^[#{MIN}-#{MAX}]{#{LENGTH}}$")
-
-  TRIES = 10
-
-  private_constant :MIN, :MAX, :LENGTH, :REGEXP, :TRIES
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ep-codebreaker
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Eugene Poberezhny
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler