new_super_codebreaker_2021 0.4.4 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 310473574af90875c8838fadf808a3293e7667f1452c90b28618906f20f4d43d
-  data.tar.gz: 7df218a49809e4811ed1adc27093fc4bc9a7353c23b82bf81160421989b7c5a3
+  metadata.gz: 26b37e2d9e16f4e0976f62163e3e1c69eb224495de4ca2a845987672de45132d
+  data.tar.gz: b9acc9f22a9b6f8a425be538b9685ee5feb9d7a049275b2639c7246a69450ec9
 SHA512:
-  metadata.gz: 690e606a26291342c8fe91387db9d467403e179bbed937f9bc0ad1ae11cb9f7a7970d51ea2295a836910a500a7b73608f51cbbaab24190f2f4fff58d5cd84f07
-  data.tar.gz: 7b89164a1189f3a81f360fec5cf5fe839708c314b9497e1dbd307b12f607be24e083fa4a78f3790b6b225936fe0e3d925a4bd5e39756cc44bf5e02b21c3f73ea
+  metadata.gz: dd7c966984d2b7257492611fe2018dfd4b5dc2541eb34213783196aeadd73dac063209ccbd37a20aadee711b2a8804622a1ce7fa8a3d813d47b3a83139fe498b
+  data.tar.gz: 7f11831e008fb7463258b792799fa787a23735138cbbea0470f61e4210a18e9bcda3fdb740473c828514e50ebf6bd7c065a153b307aa11f62b127e88dab5190f

data/lib/loader.rb

@@ -0,0 +1,8 @@
+require 'yaml'
+require_relative 'new_super_codebreaker_2021/user'
+require_relative 'new_super_codebreaker_2021/show_content'
+require_relative 'new_super_codebreaker_2021/db_methods'
+require_relative 'new_super_codebreaker_2021/validate'
+require_relative 'new_super_codebreaker_2021/new_super_codebreaker_2021'
+require_relative 'new_super_codebreaker_2021/game'
+require_relative 'new_super_codebreaker_2021/version'

data/lib/new_super_codebreaker_2021/db_methods.rb

@@ -0,0 +1,17 @@
+module NewSuperCodebreaker2021
+  module DBMethods
+    def save(user, file)
+      rating = load_file(file)
+      rating.push(user)
+      File.open(file, 'w') do |filename|
+        YAML.dump(rating, filename)
+      end
+    end
+
+    def load_file(file)
+      YAML.load_file(file)
+    rescue Errno::ENOENT
+      []
+    end
+  end
+end

data/lib/{game.rb → new_super_codebreaker_2021/game.rb}

@@ -1,16 +1,16 @@
-require 'yaml'
-require_relative 'validate'
-require_relative 'show_content'
-require_relative 'db_methods'
-require_relative 'user'
+require_relative '../loader'
+
 module NewSuperCodebreaker2021
   class Game
-    include Validate
-    include ShowContent
     include DBMethods
+    include ShowContent
+    include Validate
+
+    attr_reader :code
 
     def initialize
       @code = generate_code
+      @code_copy = @code.dup
     end
 
     GUESS_COMMANDS = %i[hint rules exit].freeze
@@ -36,23 +36,18 @@ module NewSuperCodebreaker2021
     end
 
     def user_guess(code)
-      if code.to_i != 0
-        validate_user_code(code)
-      elsif GUESS_COMMANDS.include?(code.to_sym)
-        code.to_sym
-      else false
-      end
+      return validate_user_code(code) unless code.to_i.zero?
+
+      symbol_code = code.to_sym
+      GUESS_COMMANDS.include?(symbol_code) ? symbol_code : nil
     end
 
     def take_hint(user, used_hints)
-      code_copy = @code.dup
-      if user.hints_total > user.hints_used
-        user.hints_used += 1
-        used_hints.each { |hint| code_copy.delete(hint) }
-        code_copy.sample
-      else
-        false
-      end
+      return unless user.hints_total > user.hints_used
+
+      user.hints_used += 1
+      used_hints.each { |hint| @code_copy.delete(hint) }
+      @code_copy.sample
     end
 
     def after_game_commands(command)
@@ -64,27 +59,34 @@ module NewSuperCodebreaker2021
     end
 
     def compare_codes(user_code)
-      matches, u_char = number_on_right_place(user_code)
-      number_in_secret_code(user_code, matches, u_char)
+      matches, user_code, code_copy = number_on_right_place(user_code)
+      number_in_secret_code(user_code, matches, code_copy)
     end
 
     private
 
     def number_on_right_place(user_code)
+      code_copy = @code.dup
       matches = []
-      u_char = []
       user_code.each_index do |i|
-        if @code[i] == user_code[i]
-          matches.unshift('+')
-          u_char << user_code[i]
-        end
+        next unless @code[i] == user_code[i]
+
+        matches.unshift('+')
+        user_code[i] = nil
+        code_copy[i] = false
       end
-      [matches, u_char]
+      [matches, user_code, code_copy]
     end
 
-    def number_in_secret_code(user_code, matches, u_char)
+    def number_in_secret_code(user_code, matches, code_copy)
+      amount_numbers_in_secret_code = Hash.new(0)
+      amount_numbers_in_user_code = Hash.new(0)
+      code_copy.each { |number| amount_numbers_in_secret_code[number] += 1 }
       user_code.each do |element|
-        matches.push('-') if @code.include?(element) && !u_char.include?(element)
+        if code_copy.include?(element) && amount_numbers_in_user_code[element] < amount_numbers_in_secret_code[element]
+          matches.push('-')
+          amount_numbers_in_user_code[element] += 1
+        end
       end
       matches
     end

data/lib/new_super_codebreaker_2021/new_super_codebreaker_2021.rb

@@ -0,0 +1,10 @@
+require 'game'
+require 'user'
+require 'show_content'
+require 'validate'
+require 'db_methods'
+require_relative 'version'
+
+module NewSuperCodebreaker2021
+  class Error < StandardError; end
+end

data/lib/new_super_codebreaker_2021/show_content.rb

@@ -0,0 +1,10 @@
+module NewSuperCodebreaker2021
+  module ShowContent
+    def show_stats(file)
+      data = YAML.load_file(file) || []
+      data.sort_by! { |game| [-game.difficulty, game.attempts_used, game.hints_used] }
+    rescue Errno::ENOENT
+      []
+    end
+  end
+end

data/lib/new_super_codebreaker_2021/user.rb

@@ -0,0 +1,28 @@
+module NewSuperCodebreaker2021
+  class User
+    attr_reader :name, :difficulty, :hints_total, :attempts_total
+    attr_accessor :hints_used, :attempts_used
+
+    DIFFICULTY = {
+      easy: { attempts: 15, hints: 2 },
+      medium: { attempts: 10, hints: 1 },
+      hell: { attempts: 5, hints: 1 }
+    }.freeze
+
+    def initialize(name, difficulty)
+      @name = name
+      @difficulty = difficulty
+      @hints_used = 0
+      @attempts_used = 0
+      set_total_fields
+    end
+
+    private
+
+    def set_total_fields
+      difficulty = DIFFICULTY.keys[@difficulty]
+      @hints_total = DIFFICULTY[difficulty][:hints]
+      @attempts_total = DIFFICULTY[difficulty][:attempts]
+    end
+  end
+end

data/lib/new_super_codebreaker_2021/validate.rb

@@ -0,0 +1,50 @@
+module NewSuperCodebreaker2021
+  module Validate
+    def validate_name(name)
+      name if valid_name?(name)
+    end
+
+    def validate_user_code(us_code)
+      arr_code = split_to_integer_array(us_code)
+      return unless valid_number?(arr_code)
+
+      arr_code
+    end
+
+    def check_input(input, command_list)
+      return unless valid_input?(input, command_list)
+
+      input.to_sym
+    end
+
+    private
+
+    def valid_input?(input, command_list)
+      input.to_i.zero? && command_list.include?(input.to_sym)
+    end
+
+    def valid_number?(arr_code)
+      arr_code && check_code_length?(arr_code) && check_numbers?(arr_code)
+    end
+
+    def split_to_integer_array(code)
+      code.chars.map!(&:to_i) if integer?(code)
+    end
+
+    def integer?(code)
+      code.to_i.to_s == code
+    end
+
+    def check_code_length?(code)
+      code.length == 4
+    end
+
+    def check_numbers?(code)
+      code.all? { |value| value.between?(1, 6) }
+    end
+
+    def valid_name?(name)
+      name.length >= 3 && name.length <= 20
+    end
+  end
+end

data/lib/new_super_codebreaker_2021/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module NewSuperCodebreaker2021
-  VERSION = '0.4.4'
+  VERSION = '0.4.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: new_super_codebreaker_2021
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.8
 platform: ruby
 authors:
 - Nazar Dakhno
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fasterer
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: ffaker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -101,21 +115,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
-- CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
-- lib/db_methods.rb
-- lib/game.rb
-- lib/new_super_codebreaker_2021.rb
+- lib/loader.rb
+- lib/new_super_codebreaker_2021/db_methods.rb
+- lib/new_super_codebreaker_2021/game.rb
+- lib/new_super_codebreaker_2021/new_super_codebreaker_2021.rb
+- lib/new_super_codebreaker_2021/show_content.rb
+- lib/new_super_codebreaker_2021/user.rb
+- lib/new_super_codebreaker_2021/validate.rb
 - lib/new_super_codebreaker_2021/version.rb
-- lib/show_content.rb
-- lib/user.rb
-- lib/validate.rb
 homepage: https://rubygems.org/gems/new_super_codebreaker_2021
 licenses:
 - MIT
@@ -123,7 +131,7 @@ metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
-- lib
+- lib/new_super_codebreaker_2021
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/CHANGELOG.md

@@ -1,5 +0,0 @@
-## [Unreleased]
-
-## [0.1.0] - 2021-08-17
-
-- Initial release

data/CODE_OF_CONDUCT.md

@@ -1,84 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
-
-## Our Standards
-
-Examples of behavior that contributes to a positive environment for our community include:
-
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the overall community
-
-Examples of unacceptable behavior include:
-
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Enforcement Responsibilities
-
-Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
-
-Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
-
-## Scope
-
-This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at dakhnonazar@gmail.com. All complaints will be reviewed and investigated promptly and fairly.
-
-All community leaders are obligated to respect the privacy and security of the reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within the community.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
-available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/Gemfile

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in new_super_codebreaker_2021.gemspec
-gemspec

data/Gemfile.lock

@@ -1,71 +0,0 @@
-PATH
-  remote: .
-  specs:
-    new_super_codebreaker_2021 (0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    colorize (0.8.1)
-    diff-lcs (1.4.4)
-    docile (1.4.0)
-    fasterer (0.9.0)
-      colorize (~> 0.7)
-      ruby_parser (>= 3.14.1)
-    parallel (1.20.1)
-    parser (3.0.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    rake (13.0.6)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.19.1)
-      parallel (~> 1.10)
-      parser (>= 3.0.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.10.0)
-      parser (>= 3.0.1.1)
-    ruby-progressbar (1.11.0)
-    ruby_parser (3.17.0)
-      sexp_processor (~> 4.15, >= 4.15.1)
-    sexp_processor (4.15.3)
-    simplecov (0.21.2)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-      simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.3)
-    unicode-display_width (2.0.0)
-
-PLATFORMS
-  x86_64-linux
-
-DEPENDENCIES
-  fasterer (~> 0.9.0)
-  new_super_codebreaker_2021!
-  rake (~> 13.0)
-  rspec (~> 3.10.0)
-  rubocop (~> 1.7)
-  simplecov
-
-BUNDLED WITH
-   2.2.26

data/Rakefile

@@ -1,9 +0,0 @@
-require 'bundler/gem_tasks'
-require 'rubocop/rake_task'
-
-begin
-  require 'rspec/core/rake_task'
-  RSpec::Core::RakeTask.new(:spec)
-rescue LoadError
-  # Ignored
-end

data/bin/console

@@ -1,15 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'bundler/setup'
-require 'new_super_codebreaker_2021'
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require 'irb'
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/lib/db_methods.rb

@@ -1,15 +0,0 @@
-module DBMethods
-  def save(user, file)
-    rating = load_file(file)
-    rating.push(user)
-    File.open(file, 'w') do |filename|
-      YAML.dump(rating, filename)
-    end
-  end
-
-  def load_file(file)
-    YAML.load_file(file)
-  rescue Errno::ENOENT
-    []
-  end
-end

data/lib/new_super_codebreaker_2021.rb

@@ -1,6 +0,0 @@
-require_relative 'new_super_codebreaker_2021/version'
-require 'game'
-
-module NewSuperCodebreaker2021
-  class Error < StandardError; end
-end

data/lib/show_content.rb

@@ -1,16 +0,0 @@
-require 'terminal-table'
-
-module ShowContent
-  DIFFICULTY = {
-    easy: { attempts: 15, hints: 2 },
-    medium: { attempts: 10, hints: 1 },
-    hell: { attempts: 5, hints: 1 }
-  }.freeze
-
-  def show_stats(file)
-    data = YAML.load_file(file) || []
-    data.sort_by(&:hints_used).sort_by(&:attempts_used).sort_by { |game| -game.difficulty }
-  rescue Errno::ENOENT
-    []
-  end
-end

data/lib/user.rb

@@ -1,32 +0,0 @@
-class User
-  attr_reader :name, :difficulty, :hints_total, :attempts_total
-  attr_accessor :hints_used, :attempts_used
-
-  def initialize(name, difficulty)
-    @name = name
-    @difficulty = difficulty
-    @hints_used = 0
-    @attempts_used = 0
-    check_difficulty(difficulty)
-  end
-
-  private
-
-  def check_difficulty(difficulty)
-    case difficulty
-    when 0
-      set_total_fields(2, 15)
-    when 1
-      set_total_fields(1, 10)
-    when 2
-      set_total_fields(1, 5)
-    else
-      false
-    end
-  end
-
-  def set_total_fields(hints_total, attempts_total)
-    @hints_total = hints_total
-    @attempts_total = attempts_total
-  end
-end

data/lib/validate.rb

@@ -1,50 +0,0 @@
-module Validate
-  def validate_name(name)
-    if name.length >= 3 && name.length <= 20
-      name
-    else
-      false
-    end
-  end
-
-  def validate_user_code(us_code)
-    arr_code = check_splitting(us_code)
-    if valid_number?(arr_code)
-      arr_code
-    else
-      false
-    end
-  end
-
-  def check_input(input, command_list)
-    if input.to_i.zero? && command_list.include?(input.to_sym)
-      input.to_sym
-    else false
-    end
-  end
-
-  private
-
-  def valid_number?(arr_code)
-    arr_code && check_length?(arr_code) && check_numbers?(arr_code)
-  end
-
-  def check_splitting(code)
-    code.chars.map!(&:to_i) if integer?(code)
-  end
-
-  def integer?(code)
-    code.to_i.to_s == code
-  end
-
-  def check_length?(code)
-    code.length == 4
-  end
-
-  def check_numbers?(code)
-    code.each do |number|
-      return if number < 1 || number > 6
-    end
-    true
-  end
-end