console-blackjack 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a97facbefaaf3b5fad5b2051e997180a69ec440671f113d42185af30f2083dfa
-  data.tar.gz: c5d018999a9fa12d3c61a0c871deefc3196cfd79bb560dd0caacd4987b6b9a39
+  metadata.gz: 1200cfab5226e842230a10d390124668b36ca0b889099cad6cf293d01311dbd6
+  data.tar.gz: ae0e5612e1bfc3c29cb22b07aaad391d12a7b477e86b2cdc4996b58480a12e4d
 SHA512:
-  metadata.gz: f7e7b7079ae568d62bf9bf0ede19b1815a64c0b346c81a14830b02bc5133d116bfcc3f74f5a5408933a2ac5c584d96eceb7544fb163d54166a01b312a5e35497
-  data.tar.gz: 1f261b2eea702d06f3936c30e678e1c74594379a423e58583ac74b6de98ef8855519dcc3390aeddfa71beb841eac8a5996161193c2beadadcb3726904d1b5496
+  metadata.gz: 28668e7ba8c3c412a6ab2ae0e5bc426157cba6beb3a29d76062ac2f311c2f952d642b3f86d84274a2b42cc967315ce4f3352c6de56638294ba534ef4dc60997f
+  data.tar.gz: 44224e3eaed8a420d86912093f4f9d9398c853f24a5fe464f8101eeee5b208345c1bb6f0c76c9a1c76c465a119885608330f402b141083809ed835ea1bd224dd

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby '3.0.3'
+ruby '3.1.2'
 
 source 'https://rubygems.org'
 

data/Gemfile.lock

@@ -1,70 +1,75 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.2.3)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.10)
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
     method_source (1.0.0)
-    minitest (5.15.0)
+    minitest (5.17.0)
     parallel (1.22.1)
-    parser (3.1.1.0)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.1)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
-    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)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.1)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-support (3.11.0)
-    rubocop (1.26.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.44.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.1.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
       parser (>= 3.1.1.0)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.9.0)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.4)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
@@ -80,7 +85,7 @@ DEPENDENCIES
   simplecov
 
 RUBY VERSION
-   ruby 3.0.3p157
+   ruby 3.1.2p20
 
 BUNDLED WITH
-   2.2.32
+   2.3.15

data/README.md

@@ -22,3 +22,19 @@ Run:
 ## License
 
 [![GitHub](https://img.shields.io/github/license/gdonald/console-blackjack-ruby?color=aa0000)](https://github.com/gdonald/console-blackjack-ruby/blob/master/LICENSE)
+
+## Alternative Implementations:
+
+I've written Blackjack in several other languages:
+
+- [Rust](https://github.com/gdonald/console-blackjack-rust)
+- [Typescript](https://github.com/gdonald/blackjack-js)
+- [Raku](https://github.com/gdonald/Console-Blackjack)
+- [Perl](https://github.com/gdonald/console-blackjack-perl)
+- [C](https://github.com/gdonald/blackjack-c)
+- [C++](https://github.com/gdonald/blackjack-cpp)
+- [Crystal](https://github.com/gdonald/blackjack-cr)
+- [Go](https://github.com/gdonald/blackjack-go)
+- [Elixir](https://github.com/gdonald/blackjack-ex)
+- [Python](https://github.com/gdonald/blackjack-py)
+- [C with SDL](https://github.com/gdonald/blackjack-c-sdl)

data/bj.txt

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

data/console-blackjack.gemspec

@@ -3,9 +3,9 @@
 require 'rake'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '>= 3.0'
+  spec.required_ruby_version = '>= 3.1'
   spec.name = 'console-blackjack'
-  spec.version = '1.1.0'
+  spec.version = '1.1.1'
   spec.summary = 'Console Blackjack'
   spec.description = 'Blackjack for your console, full version.'
   spec.author = 'Greg Donald'

data/lib/blackjack/card.rb

@@ -24,9 +24,11 @@ class Card
   end
 
   def self.value(card, count_method, total)
-    value = card.value + 1
-    v = value > 9 ? 10 : value
-    count_method == SOFT && v == 1 && total < 11 ? 11 : v
+    value = card.value.succ
+    value = 10 if value > 9
+    return 11 if value == 1 && count_method == :soft && total < 11
+
+    value
   end
 
   def self.faces

data/lib/blackjack/dealer_hand.rb

@@ -3,33 +3,23 @@
 require_relative 'hand'
 
 class DealerHand < Hand
-  attr_accessor :blackjack, :hide_down_card
+  attr_accessor :blackjack, :hide_first_card
 
   def initialize(blackjack)
     super(blackjack)
-    @hide_down_card = true
+    @hide_first_card = true
   end
 
   def value(count_method)
-    total = total_card_value(count_method)
+    total = value_for_method(count_method)
 
-    if count_method == SOFT && total > 21
-      value(HARD)
+    if count_method == :soft && total > 21
+      value(:hard)
     else
       total
     end
   end
 
-  def total_card_value(count_method)
-    total = 0
-    cards.each_with_index do |card, index|
-      next if index == 1 && hide_down_card
-
-      total += Card.value(card, count_method, total)
-    end
-    total
-  end
-
   def upcard_is_ace?
     cards.first.ace?
   end
@@ -37,10 +27,10 @@ class DealerHand < Hand
   def draw
     out = String.new(' ')
     cards.each_with_index do |card, index|
-      out << (index == 1 && hide_down_card ? Card.new(blackjack, 13, 0) : card).to_s
+      out << (index.zero? && hide_first_card ? Card.new(blackjack, 13, 0) : card).to_s
       out << ' '
     end
-    out << ' ⇒  ' << value(SOFT).to_s
+    out << ' ⇒  ' << value(:soft).to_s
   end
 
   def deal_required_cards
@@ -52,14 +42,26 @@ class DealerHand < Hand
   end
 
   def both_values
-    [value(SOFT), value(HARD)]
+    [value(:soft), value(:hard)]
   end
 
   def play
     playing = blackjack.need_to_play_dealer_hand?
-    self.hide_down_card = false if blackjack? || playing
+    self.hide_first_card = false if blackjack? || playing
     deal_required_cards if playing
     self.played = true
     blackjack.pay_hands
   end
+
+  private
+
+  def value_for_method(count_method)
+    total = 0
+    cards.each_with_index do |card, index|
+      next if index.zero? && hide_first_card
+
+      total += Card.value(card, count_method, total)
+    end
+    total
+  end
 end

data/lib/blackjack/hand.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-UNKNOWN = 0
-WON = 1
-LOST = 2
-PUSH = 3
-
-SOFT = 4
-HARD = 5
-
 class Hand
   attr_accessor :cards, :blackjack, :played
 
@@ -18,7 +10,7 @@ class Hand
   end
 
   def busted?
-    value(SOFT) > 21
+    value(:soft) > 21
   end
 
   def deal_card

data/lib/blackjack/menus.rb

@@ -4,7 +4,7 @@ module Menus
   def draw_game_options
     puts ' (N) Number of Decks  (T) Deck Type  (F) Face Type  (B) Back'
     loop do
-      c = Blackjack.getc
+      c = Blackjack.getc($stdin)
       case c
       when 'n'
         clear_draw_hands_new_num_decks
@@ -26,7 +26,7 @@ module Menus
   def new_deck_type
     puts ' (1) Regular  (2) Aces  (3) Jacks  (4) Aces & Jacks  (5) Sevens  (6) Eights'
     loop do
-      c = Blackjack.getc.to_i
+      c = Blackjack.getc($stdin).to_i
       case c
       when (1..6)
         self.deck_type = c
@@ -42,7 +42,7 @@ module Menus
   def new_face_type
     puts ' (1) 🂡  (2) A♠'
     loop do
-      c = Blackjack.getc.to_i
+      c = Blackjack.getc($stdin).to_i
       case c
       when (1..2)
         self.face_type = c
@@ -57,7 +57,7 @@ module Menus
   def ask_insurance
     puts ' Insurance?  (Y) Yes  (N) No'
     loop do
-      c = Blackjack.getc
+      c = Blackjack.getc($stdin)
       case c
       when 'y'
         insure_hand
@@ -72,12 +72,12 @@ module Menus
 
   def draw_bet_options
     puts ' (D) Deal Hand  (B) Change Bet  (O) Options  (Q) Quit'
-    c = Blackjack.getc
+    c = Blackjack.getc($stdin)
     case c
     when 'd'
       deal_new_hand
     when 'b'
-      new_bet
+      new_bet($stdin)
     when 'o'
       clear_draw_hands_game_options
     when 'q'

data/lib/blackjack/player_hand.rb

@@ -15,7 +15,7 @@ class PlayerHand < Hand
   def initialize(blackjack, bet)
     super(blackjack)
     @bet = bet
-    @status = UNKNOWN
+    @status = :unknown
     @payed = false
     @stood = false
   end
@@ -24,14 +24,14 @@ class PlayerHand < Hand
     return if payed
 
     self.payed = true
-    player_hand_value = value(SOFT)
+    player_hand_value = value(:soft)
 
     if player_hand_won?(dealer_busted, dealer_hand_value, player_hand_value)
       pay_won_hand
     elsif player_hand_lost?(dealer_hand_value, player_hand_value)
       collect_lost_hand
     else
-      self.status = PUSH
+      self.status = :push
     end
   end
 
@@ -45,20 +45,20 @@ class PlayerHand < Hand
 
   def collect_lost_hand
     blackjack.money -= bet
-    self.status = LOST
+    self.status = :lost
   end
 
   def pay_won_hand
     self.bet *= 1.5 if blackjack?
     blackjack.money += bet
-    self.status = WON
+    self.status = :won
   end
 
   def value(count_method)
     total = cards.inject(0) { |sum, card| sum + Card.value(card, count_method, sum) }
 
-    if count_method == SOFT && total > 21
-      value(HARD)
+    if count_method == :soft && total > 21
+      value(:hard)
     else
       total
     end
@@ -74,12 +74,12 @@ class PlayerHand < Hand
 
   def collect_busted_hand
     self.payed = true
-    self.status = LOST
+    self.status = :lost
     blackjack.money -= bet
   end
 
   def no_more_actions?
-    played || stood || blackjack? || busted? || value(SOFT) == 21 || value(HARD) == 21
+    played || stood || blackjack? || busted? || value(:soft) == 21 || value(:hard) == 21
   end
 
   def process
@@ -92,7 +92,7 @@ class PlayerHand < Hand
 
   def action?
     draw_actions
-    c = Blackjack.getc
+    c = Blackjack.getc($stdin)
     case c
     when 'h'
       hit

data/lib/blackjack/player_hand_actions.rb

@@ -20,7 +20,7 @@ module PlayerHandActions
   end
 
   def can_hit?
-    !(played || stood || value(HARD) == 21 || blackjack? || busted?)
+    !(played || stood || value(:hard) == 21 || blackjack? || busted?)
   end
 
   def hit

data/lib/blackjack/player_hand_draw.rb

@@ -12,11 +12,11 @@ module PlayerHandDraw
 
   def draw_status
     case status
-    when LOST
+    when :lost
       draw_lost_str
-    when WON
+    when :won
       draw_won_str
-    when PUSH
+    when :push
       'Push'
     else
       ''
@@ -33,8 +33,8 @@ module PlayerHandDraw
 
   def draw_money(index)
     out = String.new('')
-    out << '-' if status == LOST
-    out << '+' if status == WON
+    out << '-' if status == :lost
+    out << '+' if status == :won
     out << '$' << Format.money(bet / 100.0)
     out << ' ⇐' if !played && index == blackjack.current_hand
     out << '  '
@@ -44,7 +44,7 @@ module PlayerHandDraw
   def draw_cards
     out = String.new('')
     out << cards.map { |card| "#{card} " }.join
-    out << ' ⇒  ' << value(SOFT).to_s << '  '
+    out << ' ⇒  ' << value(:soft).to_s << '  '
     out
   end
 end

data/lib/blackjack/utils.rb

@@ -25,7 +25,7 @@ module Utils
 
   def clear_draw_hands_new_num_decks
     clear_draw_hands
-    new_num_decks
+    new_num_decks($stdin)
   end
 
   def clear_draw_hands_new_deck_type

data/lib/blackjack.rb

@@ -63,7 +63,7 @@ class Blackjack
       draw_hands
       ask_insurance
     elsif player_hand.done?
-      dealer_hand.hide_down_card = false
+      dealer_hand.hide_first_card = false
       pay_hands
       draw_hands
       draw_bet_options
@@ -97,7 +97,7 @@ class Blackjack
   end
 
   def pay_hands
-    dealer_hand_value = dealer_hand.value(SOFT)
+    dealer_hand_value = dealer_hand.value(:soft)
     dealer_busted = dealer_hand.busted?
 
     player_hands.each do |player_hand|
@@ -133,23 +133,23 @@ class Blackjack
     out
   end
 
-  def new_bet
+  def new_bet(input)
     clear
     draw_hands
 
     puts " Current Bet: $#{Format.money(current_bet / 100)}\n"
     print ' Enter New Bet: $'
 
-    self.current_bet = $stdin.gets.to_i * 100
+    self.current_bet = input.gets.to_i * 100
 
     normalize_current_bet
     deal_new_hand
   end
 
-  def new_num_decks
+  def new_num_decks(input)
     puts " Number Of Decks: #{num_decks}"
     print ' New Number Of Decks (1-8): '
-    self.num_decks = $stdin.gets.to_i
+    self.num_decks = input.gets.to_i
 
     normalize_num_decks
     clear_draw_hands_game_options
@@ -165,7 +165,7 @@ class Blackjack
     player_hand.bet /= 2
     player_hand.played = true
     player_hand.payed = true
-    player_hand.status = LOST
+    player_hand.status = :lost
 
     self.money -= player_hand.bet
 
@@ -175,7 +175,7 @@ class Blackjack
 
   def no_insurance
     if dealer_hand.blackjack?
-      dealer_hand.hide_down_card = false
+      dealer_hand.hide_first_card = false
 
       pay_hands
       draw_hands
@@ -206,10 +206,10 @@ class Blackjack
     self.current_bet = money if current_bet > money
   end
 
-  def self.getc
+  def self.getc(input)
     begin
       system('stty raw -echo')
-      c = $stdin.getc
+      c = input.getc
     ensure
       system('stty -raw echo')
     end

data/spec/factories/card_factory.rb

@@ -38,6 +38,10 @@ FactoryBot.define do
       value { 9 }
     end
 
+    trait :jack do
+      value { 10 }
+    end
+
     initialize_with { new(blackjack, value, suit) }
   end
 end

data/spec/factories/dealer_hand_factory.rb

@@ -3,7 +3,7 @@
 FactoryBot.define do
   factory :dealer_hand do
     blackjack { nil }
-    hide_down_card { true }
+    hide_first_card { true }
 
     initialize_with { new(blackjack) }
   end

data/spec/factories/player_hand_factory.rb

@@ -4,7 +4,7 @@ FactoryBot.define do
   factory :player_hand do
     game { nil }
     bet { 500 }
-    status { UNKNOWN }
+    status { :unknown }
     payed { false }
     stood { false }
 

data/spec/lib/blackjack/card_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Card do
   let(:blackjack) { build(:blackjack) }
-  let(:card) { build(:card, blackjack: blackjack) }
+  let(:card) { build(:card, blackjack:) }
 
   describe '.new' do
     it 'creates a card' do
@@ -63,4 +63,39 @@ RSpec.describe Card do
       expect(described_class.faces[4][3]).to eq('🃕')
     end
   end
+
+  describe '.value' do
+    let(:card) { build(:card, blackjack:) }
+    let(:count_method) { :soft }
+    let(:total) { 0 }
+    let(:result) { described_class.value(card, count_method, total) }
+
+    it 'returns 11' do
+      expect(result).to eq(11)
+    end
+
+    context 'with a hard count' do
+      let(:count_method) { :hard }
+
+      it 'returns 1' do
+        expect(result).to eq(1)
+      end
+    end
+
+    context 'with a total of 11' do
+      let(:total) { 11 }
+
+      it 'returns 1' do
+        expect(result).to eq(1)
+      end
+    end
+
+    context 'with a face card' do
+      let(:card) { build(:card, :jack, blackjack:) }
+
+      it 'returns 10' do
+        expect(result).to eq(10)
+      end
+    end
+  end
 end

data/spec/lib/blackjack/dealer_hand_spec.rb

@@ -3,9 +3,9 @@
 RSpec.describe DealerHand do
   let(:shoe) { build(:shoe, :new_regular) }
   let(:blackjack) { build(:blackjack) }
-  let(:dealer_hand) { build(:dealer_hand, blackjack: blackjack) }
-  let(:ace) { build(:card, :ace, blackjack: blackjack) }
-  let(:ten) { build(:card, :ten, blackjack: blackjack) }
+  let(:dealer_hand) { build(:dealer_hand, blackjack:) }
+  let(:ace) { build(:card, :ace, blackjack:) }
+  let(:ten) { build(:card, :ten, blackjack:) }
 
   describe '.new' do
     it 'creates a dealer_hand' do
@@ -24,7 +24,7 @@ RSpec.describe DealerHand do
 
     it 'returns true' do
       dealer_hand.cards << ten << ten << ten
-      dealer_hand.hide_down_card = false
+      dealer_hand.hide_first_card = false
       expect(dealer_hand).to be_busted
     end
   end
@@ -32,31 +32,31 @@ RSpec.describe DealerHand do
   describe '#value' do
     context 'with a soft count' do
       it 'returns 10' do
-        dealer_hand.cards << ten << ace
-        expect(dealer_hand.value(SOFT)).to eq(10)
+        dealer_hand.cards << ace << ten
+        expect(dealer_hand.value(:soft)).to eq(10)
       end
 
       it 'returns 11' do
-        dealer_hand.cards << ace << ten
-        expect(dealer_hand.value(SOFT)).to eq(11)
+        dealer_hand.cards << ten << ace
+        expect(dealer_hand.value(:soft)).to eq(11)
       end
 
       it 'returns 12' do
         dealer_hand.cards << ten << ace << ace
-        dealer_hand.hide_down_card = false
-        expect(dealer_hand.value(SOFT)).to eq(12)
+        dealer_hand.hide_first_card = false
+        expect(dealer_hand.value(:soft)).to eq(12)
       end
     end
 
     context 'with a hard count' do
       it 'returns 10' do
-        dealer_hand.cards << ten << ace
-        expect(dealer_hand.value(HARD)).to eq(10)
+        dealer_hand.cards << ace << ten
+        expect(dealer_hand.value(:hard)).to eq(10)
       end
 
       it 'returns 1' do
-        dealer_hand.cards << ace << ten
-        expect(dealer_hand.value(HARD)).to eq(1)
+        dealer_hand.cards << ten << ace
+        expect(dealer_hand.value(:hard)).to eq(1)
       end
     end
   end
@@ -74,21 +74,21 @@ RSpec.describe DealerHand do
   end
 
   describe '#draw' do
-    it 'returns " 🂪 🂠 ⇒ 10"' do
-      dealer_hand.cards << ten << ace
-      expected = ' 🂪 🂠  ⇒  10'
+    it 'returns " 🂠 🂪 ⇒ 10"' do
+      dealer_hand.cards << ace << ten
+      expected = ' 🂠 🂪  ⇒  10'
       expect(dealer_hand.draw).to eq(expected)
     end
 
-    it 'returns " 🂡 🂠 ⇒ 11"' do
-      dealer_hand.cards << ace << ten
-      expected = ' 🂡 🂠  ⇒  11'
+    it 'returns " 🂠 🂡 ⇒ 11"' do
+      dealer_hand.cards << ten << ace
+      expected = ' 🂠 🂡  ⇒  11'
       expect(dealer_hand.draw).to eq(expected)
     end
 
     it 'returns " 🂡 🂪 ⇒ 21"' do
       dealer_hand.cards << ace << ten
-      dealer_hand.hide_down_card = false
+      dealer_hand.hide_first_card = false
       expected = ' 🂡 🂪  ⇒  21'
       expect(dealer_hand.draw).to eq(expected)
     end
@@ -97,30 +97,30 @@ RSpec.describe DealerHand do
   describe '#both_values' do
     context 'with a soft count' do
       it 'returns [10, 10]' do
-        dealer_hand.cards << ten << ace
+        dealer_hand.cards << ace << ten
         expect(dealer_hand.both_values).to eq([10, 10])
       end
 
       it 'returns [11, 1]' do
-        dealer_hand.cards << ace << ten
+        dealer_hand.cards << ten << ace
         expect(dealer_hand.both_values).to eq([11, 1])
       end
 
       it 'returns [12, 12]' do
         dealer_hand.cards << ten << ace << ace
-        dealer_hand.hide_down_card = false
+        dealer_hand.hide_first_card = false
         expect(dealer_hand.both_values).to eq([12, 12])
       end
     end
 
     context 'with a hard count' do
       it 'returns [10, 10]' do
-        dealer_hand.cards << ten << ace
+        dealer_hand.cards << ace << ten
         expect(dealer_hand.both_values).to eq([10, 10])
       end
 
       it 'returns [11, 1]' do
-        dealer_hand.cards << ace << ten
+        dealer_hand.cards << ten << ace
         expect(dealer_hand.both_values).to eq([11, 1])
       end
     end
@@ -172,13 +172,13 @@ RSpec.describe DealerHand do
       it 'hides down card when no blackjack' do
         allow(dealer_hand).to receive(:blackjack?).and_return(false)
         dealer_hand.play
-        expect(dealer_hand.hide_down_card).to be_truthy
+        expect(dealer_hand.hide_first_card).to be_truthy
       end
 
       it 'shows down card if blackjack' do
         allow(dealer_hand).to receive(:blackjack?).and_return(true)
         dealer_hand.play
-        expect(dealer_hand.hide_down_card).to be_falsey
+        expect(dealer_hand.hide_first_card).to be_falsey
       end
 
       it 'does not deal any cards' do
@@ -197,13 +197,13 @@ RSpec.describe DealerHand do
       it 'shows down card if not blackjack' do
         allow(dealer_hand).to receive(:blackjack?).and_return(false)
         dealer_hand.play
-        expect(dealer_hand.hide_down_card).to be_falsey
+        expect(dealer_hand.hide_first_card).to be_falsey
       end
 
       it 'shows down card if blackjack' do
         allow(dealer_hand).to receive(:blackjack?).and_return(true)
         dealer_hand.play
-        expect(dealer_hand.hide_down_card).to be_falsey
+        expect(dealer_hand.hide_first_card).to be_falsey
       end
 
       it 'deals required cards' do

data/spec/lib/blackjack/hand_spec.rb

@@ -2,8 +2,8 @@
 
 RSpec.describe Hand do
   let(:shoe) { build(:shoe, :new_regular) }
-  let(:blackjack) { build(:blackjack, shoe: shoe) }
-  let(:hand) { build(:hand, blackjack: blackjack) }
+  let(:blackjack) { build(:blackjack, shoe:) }
+  let(:hand) { build(:hand, blackjack:) }
 
   describe '.new' do
     it 'creates a hand' do

data/spec/lib/blackjack/player_hand_spec.rb

@@ -2,10 +2,10 @@
 
 RSpec.describe PlayerHand do
   let(:blackjack) { build(:blackjack, shoe: build(:shoe, :new_regular)) }
-  let(:player_hand) { build(:player_hand, blackjack: blackjack) }
-  let(:dealer_hand) { build(:dealer_hand, blackjack: blackjack) }
-  let(:ace) { build(:card, :ace, blackjack: blackjack) }
-  let(:ten) { build(:card, :ten, blackjack: blackjack) }
+  let(:player_hand) { build(:player_hand, blackjack:) }
+  let(:dealer_hand) { build(:dealer_hand, blackjack:) }
+  let(:ace) { build(:card, :ace, blackjack:) }
+  let(:ten) { build(:card, :ten, blackjack:) }
 
   describe '.new' do
     it 'creates a player_hand' do
@@ -21,7 +21,7 @@ RSpec.describe PlayerHand do
     end
 
     it 'has an unknown status' do
-      expect(player_hand.status).to eq(UNKNOWN)
+      expect(player_hand.status).to eq(:unknown)
     end
 
     it 'has not been payed' do
@@ -38,21 +38,21 @@ RSpec.describe PlayerHand do
 
     it 'draws a lost hand' do
       player_hand.cards << ace << ace
-      player_hand.status = LOST
+      player_hand.status = :lost
       expected = " 🂡 🂡  ⇒  12  -$5.00  Lose!\n\n"
       expect(player_hand.draw(1)).to eq(expected)
     end
 
     it 'draws a won hand' do
       player_hand.cards << ace << ace
-      player_hand.status = WON
+      player_hand.status = :won
       expected = " 🂡 🂡  ⇒  12  +$5.00  Won!\n\n"
       expect(player_hand.draw(1)).to eq(expected)
     end
 
     it 'draws a push hand' do
       player_hand.cards << ace << ace
-      player_hand.status = PUSH
+      player_hand.status = :push
       expected = " 🂡 🂡  ⇒  12  $5.00  Push\n\n"
       expect(player_hand.draw(1)).to eq(expected)
     end
@@ -73,19 +73,19 @@ RSpec.describe PlayerHand do
     context 'with a soft count' do
       it 'returns 21' do
         player_hand.cards << ten << ace
-        expect(player_hand.value(SOFT)).to eq(21)
+        expect(player_hand.value(:soft)).to eq(21)
       end
 
       it 'returns 12' do
         player_hand.cards << ten << ace << ace
-        expect(player_hand.value(SOFT)).to eq(12)
+        expect(player_hand.value(:soft)).to eq(12)
       end
     end
 
     context 'with a hard count' do
       it 'returns 11' do
         player_hand.cards << ten << ace
-        expect(player_hand.value(HARD)).to eq(11)
+        expect(player_hand.value(:hard)).to eq(11)
       end
     end
   end
@@ -328,7 +328,7 @@ RSpec.describe PlayerHand do
     end
 
     context 'when done' do
-      let(:dealer_hand) { build(:dealer_hand, blackjack: blackjack) }
+      let(:dealer_hand) { build(:dealer_hand, blackjack:) }
 
       before do
         allow(player_hand).to receive(:done?).and_return(true)
@@ -560,7 +560,7 @@ RSpec.describe PlayerHand do
     context 'when dealer busted' do
       it 'hand is won' do
         player_hand.pay(22, true)
-        expect(player_hand.status).to eq(WON)
+        expect(player_hand.status).to eq(:won)
       end
     end
 
@@ -574,7 +574,7 @@ RSpec.describe PlayerHand do
       it 'hand status is won' do
         player_hand.cards << ten << ten
         player_hand.pay(18, false)
-        expect(player_hand.status).to eq(WON)
+        expect(player_hand.status).to eq(:won)
       end
 
       it 'blackjack money is increased by player hand bet' do
@@ -592,7 +592,7 @@ RSpec.describe PlayerHand do
       it 'hand is lost' do
         player_hand.cards << ten << build(:card, :seven)
         player_hand.pay(18, false)
-        expect(player_hand.status).to eq(LOST)
+        expect(player_hand.status).to eq(:lost)
       end
 
       it 'blackjack money is descreased by player hand bet' do
@@ -604,7 +604,7 @@ RSpec.describe PlayerHand do
       it 'hand is push' do
         player_hand.cards << ten << build(:card, :seven)
         player_hand.pay(17, false)
-        expect(player_hand.status).to eq(PUSH)
+        expect(player_hand.status).to eq(:push)
       end
 
       it 'blackjack money is unaltered' do

data/spec/lib/blackjack/shoe_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Shoe do
   let(:blackjack) { build(:blackjack) }
-  let(:shoe) { build(:shoe, blackjack: blackjack) }
+  let(:shoe) { build(:shoe, blackjack:) }
 
   describe 'CARDS_PER_DECK' do
     it 'returns 52' do
@@ -28,7 +28,7 @@ RSpec.describe Shoe do
     end
 
     context 'with a new regular shoe' do
-      let(:shoe) { build(:shoe, :new_regular, blackjack: blackjack) }
+      let(:shoe) { build(:shoe, :new_regular, blackjack:) }
 
       it 'returns false' do
         expect(shoe).to_not be_needs_to_shuffle
@@ -36,7 +36,7 @@ RSpec.describe Shoe do
     end
 
     context 'with 42 cards being dealt' do
-      let(:shoe) { build(:shoe, :new_regular, blackjack: blackjack) }
+      let(:shoe) { build(:shoe, :new_regular, blackjack:) }
 
       before do
         42.times { shoe.next_card }
@@ -49,7 +49,7 @@ RSpec.describe Shoe do
   end
 
   describe '#shuffle' do
-    let(:shoe) { build(:shoe, blackjack: blackjack) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'calls shuffle' do
       cards = instance_double(Array)
@@ -61,7 +61,7 @@ RSpec.describe Shoe do
   end
 
   describe '#new_regular' do
-    let(:shoe) { build(:shoe, blackjack: blackjack) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_regular
@@ -76,7 +76,7 @@ RSpec.describe Shoe do
   end
 
   describe '#new_aces' do
-    let(:shoe) { build(:shoe, blackjack: blackjack) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_aces
@@ -91,7 +91,7 @@ RSpec.describe Shoe do
   end
 
   describe '#new_jacks' do
-    let(:shoe) { build(:shoe, blackjack: blackjack) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_jacks
@@ -106,7 +106,7 @@ RSpec.describe Shoe do
   end
 
   describe '#new_aces_jacks' do
-    let(:shoe) { build(:shoe, blackjack: blackjack) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_aces_jacks
@@ -121,7 +121,7 @@ RSpec.describe Shoe do
   end
 
   describe '#new_sevens' do
-    let(:shoe) { build(:shoe, blackjack: blackjack) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_sevens
@@ -136,7 +136,7 @@ RSpec.describe Shoe do
   end
 
   describe '#new_eights' do
-    let(:shoe) { build(:shoe, blackjack: blackjack) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_eights
@@ -151,11 +151,10 @@ RSpec.describe Shoe do
   end
 
   describe '#next_card' do
-    let(:shoe) { build(:shoe, :new_regular, blackjack: blackjack) }
+    let(:shoe) { build(:shoe, :new_regular, blackjack:) }
 
     it 'removes the next card' do
-      shoe.next_card
-      expect(shoe.cards.size).to eq(51)
+      expect { shoe.next_card }.to change(shoe.cards, :size).by(-1)
     end
 
     it 'returns a Card' do

data/spec/lib/blackjack_spec.rb

@@ -2,10 +2,11 @@
 
 RSpec.describe Blackjack do
   let(:blackjack) { build(:blackjack, shoe: build(:shoe, :new_regular)) }
-  let(:player_hand) { build(:player_hand, blackjack: blackjack) }
-  let(:dealer_hand) { build(:dealer_hand, blackjack: blackjack) }
-  let(:ace) { build(:card, :ace, blackjack: blackjack) }
-  let(:ten) { build(:card, :ten, blackjack: blackjack) }
+  let(:player_hand) { build(:player_hand, blackjack:) }
+  let(:dealer_hand) { build(:dealer_hand, blackjack:) }
+  let(:ace) { build(:card, :ace, blackjack:) }
+  let(:ten) { build(:card, :ten, blackjack:) }
+  let(:input) { StringIO.new }
 
   describe '#current_player_hand' do
     it 'returns the current hand' do
@@ -27,8 +28,8 @@ RSpec.describe Blackjack do
 
   describe '#getc' do
     it 'get a single character from stdin' do
-      allow($stdin).to receive(:getc).and_return('q')
-      c = described_class.getc
+      allow(input).to receive(:getc).and_return('q')
+      c = described_class.getc(input)
       expect(c).to eq('q')
     end
   end
@@ -100,7 +101,7 @@ RSpec.describe Blackjack do
   end
 
   describe '#save_game' do
-    let(:file) { instance_double('File') }
+    let(:file) { instance_double(File) }
 
     before do
       allow(File).to receive(:open).with(SAVE_FILE, 'w').and_yield(file)
@@ -109,8 +110,9 @@ RSpec.describe Blackjack do
 
     it 'opens and put save file data' do
       blackjack.save_game
-      fields = %i[num_decks deck_type face_type money current_bet]
-      expected = fields.map { |f| blackjack.send(f) }.join('|')
+      expected = %i[num_decks deck_type face_type money current_bet].map do |f|
+        blackjack.send(f)
+      end.join('|')
       expect(file).to have_received(:puts).with(expected)
     end
   end
@@ -324,7 +326,7 @@ RSpec.describe Blackjack do
 
       it 'shows dealer down card' do
         blackjack.deal_new_hand
-        expect(dealer_hand.hide_down_card).to be_falsey
+        expect(dealer_hand.hide_first_card).to be_falsey
       end
 
       it 'hands are paid' do
@@ -391,7 +393,7 @@ RSpec.describe Blackjack do
 
     it 'draws the hands' do
       blackjack.draw_hands
-      expected = "\n Dealer:\n 🂪 🂠  ⇒  10\n\n Player $100.00:\n 🂡 🂪  ⇒  21  $5.00 ⇐  \n\n"
+      expected = "\n Dealer:\n 🂠 🂪  ⇒  10\n\n Player $100.00:\n 🂡 🂪  ⇒  21  $5.00 ⇐  \n\n"
       expect(blackjack).to have_received(:puts).with(expected)
     end
   end
@@ -399,7 +401,7 @@ RSpec.describe Blackjack do
   describe '#new_bet' do
     before do
       blackjack.dealer_hand = dealer_hand
-      allow($stdin).to receive(:gets).and_return('10')
+      allow(input).to receive(:gets).and_return('10')
       allow(described_class).to receive(:getc).and_return('s', 'q')
       allow(blackjack).to receive(:print)
       allow(blackjack).to receive(:puts)
@@ -410,33 +412,33 @@ RSpec.describe Blackjack do
     end
 
     it 'clears the screen' do
-      blackjack.new_bet
+      blackjack.new_bet(input)
       expect(blackjack).to have_received(:clear)
     end
 
     it 'draws hands' do
-      blackjack.new_bet
+      blackjack.new_bet(input)
       expect(blackjack).to have_received(:draw_hands)
     end
 
     it 'draws the current bet' do
-      blackjack.new_bet
+      blackjack.new_bet(input)
       expected = " Current Bet: $5.00\n"
       expect(blackjack).to have_received(:puts).with(expected)
     end
 
     it 'updates current bet' do
-      blackjack.new_bet
+      blackjack.new_bet(input)
       expect(blackjack.current_bet).to eq(1000)
     end
 
     it 'normalizes the bet' do
-      blackjack.new_bet
+      blackjack.new_bet(input)
       expect(blackjack).to have_received(:normalize_current_bet)
     end
 
     it 'deals a new hand' do
-      blackjack.new_bet
+      blackjack.new_bet(input)
       expect(blackjack).to have_received(:deal_new_hand)
     end
   end
@@ -584,7 +586,7 @@ RSpec.describe Blackjack do
   describe '#new_num_decks' do
     before do
       blackjack.dealer_hand = dealer_hand
-      allow($stdin).to receive(:gets).and_return('2')
+      allow(input).to receive(:gets).and_return('2')
       allow(described_class).to receive(:getc).and_return('b', 'q')
       allow(blackjack).to receive(:print)
       allow(blackjack).to receive(:puts)
@@ -595,22 +597,22 @@ RSpec.describe Blackjack do
     end
 
     it 'clears screen' do
-      blackjack.new_num_decks
+      blackjack.new_num_decks(input)
       expect(blackjack).to have_received(:clear)
     end
 
     it 'draws hands' do
-      blackjack.new_num_decks
+      blackjack.new_num_decks(input)
       expect(blackjack).to have_received(:draw_hands)
     end
 
     it 'gets new number of decks' do
-      blackjack.new_num_decks
+      blackjack.new_num_decks(input)
       expect(blackjack.num_decks).to eq(2)
     end
 
     it 'normalizes number of decks' do
-      blackjack.new_num_decks
+      blackjack.new_num_decks(input)
       expect(blackjack).to have_received(:normalize_num_decks)
     end
   end
@@ -814,9 +816,9 @@ RSpec.describe Blackjack do
       expect(player_hand.payed).to be_truthy
     end
 
-    it 'sets hand status as LOST' do
+    it 'sets hand status as :lost' do
       blackjack.insure_hand
-      expect(player_hand.status).to eq(LOST)
+      expect(player_hand.status).to eq(:lost)
     end
 
     it 'updates blackjack money' do
@@ -852,7 +854,7 @@ RSpec.describe Blackjack do
 
       it 'shows dealer down card' do
         blackjack.no_insurance
-        expect(dealer_hand.hide_down_card).to be_falsey
+        expect(dealer_hand.hide_first_card).to be_falsey
       end
 
       it 'pays hands' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-blackjack
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Greg Donald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-26 00:00:00.000000000 Z
+date: 2023-02-07 00:00:00.000000000 Z
 dependencies: []
 description: Blackjack for your console, full version.
 email: gdonald@gmail.com
@@ -24,9 +24,7 @@ files:
 - Rakefile
 - bin/console-blackjack
 - bj.txt
-- console-blackjack-1.0.7.gem
-- console-blackjack-1.0.8.gem
-- console-blackjack-1.0.9.gem
+- console-blackjack-1.1.0.gem
 - console-blackjack.gemspec
 - lib/blackjack.rb
 - lib/blackjack/card.rb
@@ -73,14 +71,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Console Blackjack