console-blackjack 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a13818b9e5b9d157b766e6d85b71772de6e999f11a3d6f9887283234fc38e1ef
-  data.tar.gz: d323d6b39bc477bfa0d8649ba4589384256dacf614599b261b0eb19214fb6914
+  metadata.gz: a97facbefaaf3b5fad5b2051e997180a69ec440671f113d42185af30f2083dfa
+  data.tar.gz: c5d018999a9fa12d3c61a0c871deefc3196cfd79bb560dd0caacd4987b6b9a39
 SHA512:
-  metadata.gz: 551f764d674ca224996464c49d5d1e12defe6578880798c9a6d8ae07fc4baf88ed72fff6ac500bf3516f895d76f3ec4aa185581c2a39914372ffad27a587b71b
-  data.tar.gz: ee9ba85aad2cf47fe4248b62110112934c229cdaa240cada8817cfb0905b2ce1aab6297f9330c1cbfda7a00107ba764a54fb2fe9094c36da848f7701b32d1282
+  metadata.gz: f7e7b7079ae568d62bf9bf0ede19b1815a64c0b346c81a14830b02bc5133d116bfcc3f74f5a5408933a2ac5c584d96eceb7544fb163d54166a01b312a5e35497
+  data.tar.gz: 1f261b2eea702d06f3936c30e678e1c74594379a423e58583ac74b6de98ef8855519dcc3390aeddfa71beb841eac8a5996161193c2beadadcb3726904d1b5496

data/Gemfile

@@ -1,13 +1,14 @@
 # frozen_string_literal: true
 
+ruby '3.0.3'
+
 source 'https://rubygems.org'
 
-gem 'coveralls', require: false
 gem 'factory_bot'
 gem 'pry'
 gem 'rake'
-gem 'rest-client', '>= 1.8.0'
 gem 'rspec'
 gem 'rubocop', require: false
+gem 'rubocop-rake'
 gem 'rubocop-rspec'
 gem 'simplecov', require: false

data/Gemfile.lock

@@ -1,115 +1,86 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    diff-lcs (1.4.4)
-    docile (1.3.5)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    factory_bot (6.1.0)
+    concurrent-ruby (1.1.10)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
-    http-accept (1.7.0)
-    http-cookie (1.0.3)
-      domain_name (~> 0.5)
-    i18n (1.8.10)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0225)
-    minitest (5.14.4)
-    multi_json (1.15.0)
-    netrc (0.11.0)
-    parallel (1.20.1)
-    parser (3.0.1.1)
+    minitest (5.15.0)
+    parallel (1.22.1)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    rest-client (2.1.0)
-      http-accept (>= 1.7.0, < 2.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 4.0)
-      netrc (~> 0.8)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.2.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)
+    rspec (3.11.0)
+      rspec-core (~> 3.11.0)
+      rspec-expectations (~> 3.11.0)
+      rspec-mocks (~> 3.11.0)
+    rspec-core (3.11.0)
+      rspec-support (~> 3.11.0)
+    rspec-expectations (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.11.0)
+    rspec-mocks (3.11.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.13.0)
+      rspec-support (~> 3.11.0)
+    rspec-support (3.11.0)
+    rubocop (1.26.1)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.5.0)
-      parser (>= 3.0.1.1)
-    rubocop-rspec (2.3.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.9.0)
+      rubocop (~> 1.19)
     ruby-progressbar (1.11.0)
     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.2)
-    sync (0.5.0)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
-    thor (1.1.0)
-    tins (1.28.0)
-      sync
+    simplecov_json_formatter (0.1.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.7)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (2.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coveralls
   factory_bot
   pry
   rake
-  rest-client (>= 1.8.0)
   rspec
   rubocop
+  rubocop-rake
   rubocop-rspec
   simplecov
 
+RUBY VERSION
+   ruby 3.0.3p157
+
 BUNDLED WITH
-   2.1.4
+   2.2.32

data/README.md

@@ -1,6 +1,8 @@
 # console-blackjack-ruby
 
-![Blackjack](https://raw.githubusercontent.com/gdonald/console-blackjack-ruby/master/bj.png)
+![Blackjack](https://raw.githubusercontent.com/gdonald/console-blackjack-ruby/master/ss2.png)
+
+![Blackjack](https://raw.githubusercontent.com/gdonald/console-blackjack-ruby/master/ss1.png)
 
 ## Getting Started
 
@@ -15,7 +17,6 @@ Run:
 ## Status
 
 [![Ruby](https://github.com/gdonald/console-blackjack-ruby/workflows/Ruby/badge.svg)](https://github.com/gdonald/console-blackjack-ruby/actions)
-[![Coverage Status](https://coveralls.io/repos/github/gdonald/console-blackjack-ruby/badge.svg?branch=master)](https://coveralls.io/github/gdonald/console-blackjack-ruby?branch=master)
 [![Downloads](https://ruby-gem-downloads-badge.herokuapp.com/console-blackjack?color=blue&type=total&total_label=)](https://rubygems.org/gems/console-blackjack)
 
 ## License

data/bj.txt

@@ -1 +1 @@
-1|11000|500
+1|1|1|9000|500

data/console-blackjack.gemspec

@@ -3,9 +3,9 @@
 require 'rake'
 
 Gem::Specification.new do |spec|
+  spec.required_ruby_version = '>= 3.0'
   spec.name = 'console-blackjack'
-  spec.version = '1.0.7'
-  spec.date = '2021-05-02'
+  spec.version = '1.1.0'
   spec.summary = 'Console Blackjack'
   spec.description = 'Blackjack for your console, full version.'
   spec.author = 'Greg Donald'
@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
                         'spec/**/*.rb'].to_a
   spec.homepage = 'https://github.com/gdonald/console-blackjack-ruby'
   spec.metadata = {
-    'source_code_uri' => 'https://github.com/gdonald/console-blackjack-ruby'
+    'source_code_uri' => 'https://github.com/gdonald/console-blackjack-ruby',
+    'rubygems_mfa_required' => 'true'
   }
   spec.license = 'MIT'
   spec.post_install_message = "\nType `console-blackjack` to run!\n\n"

data/lib/blackjack/card.rb

@@ -1,16 +1,18 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 class Card
-  attr_reader :value, :suit
+  attr_reader :blackjack, :value, :suit
 
-  def initialize(value, suit)
+  def initialize(blackjack, value, suit)
+    @blackjack = blackjack
     @value = value
     @suit = suit
   end
 
   def to_s
-    Card.faces[value][suit]
+    return Card.faces[value][suit] if blackjack.face_type == 1
+
+    Card.faces2[value][suit]
   end
 
   def ace?
@@ -33,4 +35,14 @@ class Card
      %w[🂩 🂹 🃉 🃙], %w[🂪 🂺 🃊 🃚], %w[🂫 🂻 🃋 🃛], %w[🂭 🂽 🃍 🃝],
      %w[🂮 🂾 🃎 🃞], %w[🂠]]
   end
+
+  def self.faces2
+    [%w[A♠ A♥ A♣ A♦], %w[2♠ 2♥ 2♣ 2♦],
+     %w[3♠ 3♥ 3♣ 3♦], %w[4♠ 4♥ 4♣ 4♦],
+     %w[5♠ 5♥ 5♣ 5♦], %w[6♠ 6♥ 6♣ 6♦],
+     %w[7♠ 7♥ 7♣ 7♦], %w[8♠ 8♥ 8♣ 8♦],
+     %w[9♠ 9♥ 9♣ 9♦], %w[T♠ T♥ T♣ T♦],
+     %w[J♠ J♥ J♣ J♦], %w[Q♠ Q♥ Q♣ Q♦],
+     %w[K♠ K♥ K♣ K♦], %w[??]]
+  end
 end

data/lib/blackjack/dealer_hand.rb

@@ -37,7 +37,7 @@ class DealerHand < Hand
   def draw
     out = String.new(' ')
     cards.each_with_index do |card, index|
-      out << (index == 1 && hide_down_card ? Card.faces[13][0] : card).to_s
+      out << (index == 1 && hide_down_card ? Card.new(blackjack, 13, 0) : card).to_s
       out << ' '
     end
     out << ' ⇒  ' << value(SOFT).to_s

data/lib/blackjack/hand.rb

@@ -28,6 +28,6 @@ class Hand
   def blackjack?
     return false if cards.size != 2
 
-    cards.first.ace? && cards.last.ten? || cards.first.ten? && cards.last.ace?
+    (cards.first.ace? && cards.last.ten?) || (cards.first.ten? && cards.last.ace?)
   end
 end

data/lib/blackjack/menus.rb

@@ -2,7 +2,7 @@
 
 module Menus
   def draw_game_options
-    puts ' (N) Number of Decks  (T) Deck Type  (B) Back'
+    puts ' (N) Number of Decks  (T) Deck Type  (F) Face Type  (B) Back'
     loop do
       c = Blackjack.getc
       case c
@@ -11,12 +11,15 @@ module Menus
       when 't'
         clear_draw_hands_new_deck_type
         clear_draw_hands_bet_options
+      when 'f'
+        clear_draw_hands_new_face_type
+        clear_draw_hands_bet_options
       when 'b'
         clear_draw_hands_bet_options
       else
         clear_draw_hands_game_options
       end
-      break if %w[n t b].include?(c)
+      break if %w[n t b f].include?(c)
     end
   end
 
@@ -26,7 +29,9 @@ module Menus
       c = Blackjack.getc.to_i
       case c
       when (1..6)
+        self.deck_type = c
         shoe.send("new_#{SHOES[c]}")
+        save_game
       else
         clear_draw_hands_new_deck_type
       end
@@ -34,6 +39,21 @@ module Menus
     end
   end
 
+  def new_face_type
+    puts ' (1) 🂡  (2) A♠'
+    loop do
+      c = Blackjack.getc.to_i
+      case c
+      when (1..2)
+        self.face_type = c
+        save_game
+      else
+        clear_draw_hands_new_face_type
+      end
+      break if (1..2).include?(c)
+    end
+  end
+
   def ask_insurance
     puts ' Insurance?  (Y) Yes  (N) No'
     loop do
@@ -52,22 +72,19 @@ module Menus
 
   def draw_bet_options
     puts ' (D) Deal Hand  (B) Change Bet  (O) Options  (Q) Quit'
-    loop do
-      c = Blackjack.getc
-      case c
-      when 'd'
-        deal_new_hand
-      when 'b'
-        new_bet
-      when 'o'
-        clear_draw_hands_game_options
-      when 'q'
-        clear
-        exit
-      else
-        clear_draw_hands_bet_options
-      end
-      break if %w[d b o].include?(c)
+    c = Blackjack.getc
+    case c
+    when 'd'
+      deal_new_hand
+    when 'b'
+      new_bet
+    when 'o'
+      clear_draw_hands_game_options
+    when 'q'
+      clear
+      exit
+    else
+      clear_draw_hands_bet_options
     end
   end
 end

data/lib/blackjack/player_hand.rb

@@ -92,21 +92,18 @@ class PlayerHand < Hand
 
   def action?
     draw_actions
-    loop do
-      c = Blackjack.getc
-      case c
-      when 'h'
-        hit
-      when 's'
-        stand
-      when 'p'
-        blackjack.split_current_hand
-      when 'd'
-        dbl
-      else
-        clear_draw_hands_action
-      end
-      break if %w[h s p d].include?(c)
+    c = Blackjack.getc
+    case c
+    when 'h'
+      hit
+    when 's'
+      stand
+    when 'p'
+      blackjack.split_current_hand
+    when 'd'
+      dbl
+    else
+      clear_draw_hands_action
     end
   end
 
@@ -117,11 +114,11 @@ class PlayerHand < Hand
   end
 
   def draw_actions
-    out = String.new(' ')
-    out << '(H) Hit  ' if can_hit?
-    out << '(S) Stand  ' if can_stand?
-    out << '(P) Split  ' if can_split?
-    out << '(D) Double  ' if can_dbl?
-    puts out
+    actions = []
+    actions << '(H) Hit' if can_hit?
+    actions << '(S) Stand' if can_stand?
+    actions << '(P) Split' if can_split?
+    actions << '(D) Double' if can_dbl?
+    puts " #{actions.join('  ')}"
   end
 end

data/lib/blackjack/shoe.rb

@@ -12,9 +12,12 @@ SHOES = {
 }.freeze
 
 class Shoe
-  attr_accessor :num_decks, :cards
+  CARDS_PER_DECK = 52
 
-  def initialize(num_decks = 1)
+  attr_accessor :blackjack, :num_decks, :cards
+
+  def initialize(blackjack, num_decks)
+    @blackjack = blackjack
     @num_decks = num_decks
     @cards = []
   end
@@ -22,7 +25,6 @@ class Shoe
   def needs_to_shuffle?
     return true if cards.size.zero?
 
-    total_cards = num_decks * 52
     cards_dealt = total_cards - cards.size
     used = cards_dealt / total_cards.to_f * 100.0
 
@@ -38,62 +40,49 @@ class Shoe
     num_decks.times do
       (0..3).each do |suit_value|
         (0..12).each do |value|
-          cards << Card.new(value, suit_value)
+          cards << Card.new(blackjack, value, suit_value)
         end
       end
     end
     shuffle
   end
 
-  def new_aces
+  def new_irregular(values = [])
     self.cards = []
-    (num_decks * 10).times do
+    while cards.count < total_cards
       (0..3).each do |suit_value|
-        cards << Card.new(0, suit_value)
+        next if cards.count >= total_cards
+
+        values.each do |value|
+          cards << Card.new(blackjack, value, suit_value)
+        end
       end
     end
     shuffle
   end
 
+  def total_cards
+    num_decks * CARDS_PER_DECK
+  end
+
+  def new_aces
+    new_irregular([0])
+  end
+
   def new_jacks
-    self.cards = []
-    (num_decks * 10).times do
-      (0..3).each do |suit_value|
-        cards << Card.new(10, suit_value)
-      end
-    end
-    shuffle
+    new_irregular([10])
   end
 
   def new_aces_jacks
-    self.cards = []
-    (num_decks * 10).times do
-      (0..3).each do |suit_value|
-        cards << Card.new(0, suit_value)
-        cards << Card.new(10, suit_value)
-      end
-    end
-    shuffle
+    new_irregular([0, 10])
   end
 
   def new_sevens
-    self.cards = []
-    (num_decks * 10).times do
-      (0..3).each do |suit_value|
-        cards << Card.new(6, suit_value)
-      end
-    end
-    shuffle
+    new_irregular([6])
   end
 
   def new_eights
-    self.cards = []
-    (num_decks * 10).times do
-      (0..3).each do |suit_value|
-        cards << Card.new(7, suit_value)
-      end
-    end
-    shuffle
+    new_irregular([7])
   end
 
   def next_card

data/lib/blackjack/utils.rb

@@ -3,7 +3,7 @@
 module Utils
   def save_game
     File.open(SAVE_FILE, 'w') do |file|
-      file.puts "#{num_decks}|#{money}|#{current_bet}"
+      file.puts "#{num_decks}|#{deck_type}|#{face_type}|#{money}|#{current_bet}"
     end
   end
 
@@ -11,9 +11,11 @@ module Utils
     return unless File.readable?(SAVE_FILE)
 
     a = File.read(SAVE_FILE).split('|')
-    self.num_decks = a[0].to_i
-    self.money = a[1].to_i
-    self.current_bet = a[2].to_i
+    self.num_decks   = a[0].to_i
+    self.deck_type   = a[1].to_i
+    self.face_type   = a[2].to_i
+    self.money       = a[3].to_i
+    self.current_bet = a[4].to_i
   end
 
   def clear_draw_hands
@@ -31,6 +33,11 @@ module Utils
     new_deck_type
   end
 
+  def clear_draw_hands_new_face_type
+    clear_draw_hands
+    new_face_type
+  end
+
   def clear_draw_hands_ask_insurance
     clear_draw_hands
     ask_insurance

data/lib/blackjack.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'pry'
+
 require_relative 'blackjack/dealer_hand'
 require_relative 'blackjack/format'
 require_relative 'blackjack/menus'
@@ -17,17 +19,20 @@ class Blackjack
   include SplitHand
   include Utils
 
-  attr_accessor :shoe, :money, :player_hands, :dealer_hand, :num_decks, :current_bet, :current_hand
+  attr_accessor :shoe, :money, :player_hands, :dealer_hand, :num_decks,
+                :deck_type, :face_type, :current_bet, :current_hand
 
   def initialize
     @num_decks = 1
+    @face_type = 1
+    @deck_type = 1
     @money = 10_000
     @current_bet = 500
   end
 
   def run
     load_game
-    @shoe = Shoe.new(num_decks)
+    @shoe = Shoe.new(self, num_decks)
     deal_new_hand
   end
 
@@ -51,7 +56,7 @@ class Blackjack
   end
 
   def deal_new_hand
-    shoe.new_regular if shoe.needs_to_shuffle?
+    shoe.send("new_#{SHOES[deck_type]}") if shoe.needs_to_shuffle?
     player_hand = build_new_hand
 
     if dealer_hand.upcard_is_ace? && !player_hand.blackjack?
@@ -135,7 +140,7 @@ class Blackjack
     puts " Current Bet: $#{Format.money(current_bet / 100)}\n"
     print ' Enter New Bet: $'
 
-    self.current_bet = STDIN.gets.to_i * 100
+    self.current_bet = $stdin.gets.to_i * 100
 
     normalize_current_bet
     deal_new_hand
@@ -144,7 +149,7 @@ class Blackjack
   def new_num_decks
     puts " Number Of Decks: #{num_decks}"
     print ' New Number Of Decks (1-8): '
-    self.num_decks = STDIN.gets.to_i
+    self.num_decks = $stdin.gets.to_i
 
     normalize_num_decks
     clear_draw_hands_game_options
@@ -204,7 +209,7 @@ class Blackjack
   def self.getc
     begin
       system('stty raw -echo')
-      c = STDIN.getc
+      c = $stdin.getc
     ensure
       system('stty -raw echo')
     end

data/spec/factories/blackjack_factory.rb

@@ -7,6 +7,7 @@ FactoryBot.define do
     player_hands { [] }
     dealer_hand { nil }
     num_decks { 1 }
+    face_type { 1 }
     current_bet { 500 }
     current_hand { 0 }
   end

data/spec/factories/card_factory.rb

@@ -2,6 +2,7 @@
 
 FactoryBot.define do
   factory :card do
+    blackjack { nil }
     value { 0 }
     suit { 0 }
 
@@ -37,6 +38,6 @@ FactoryBot.define do
       value { 9 }
     end
 
-    initialize_with { new(value, suit) }
+    initialize_with { new(blackjack, value, suit) }
   end
 end