console-blackjack 1.1.4 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a80968fb789ad02815a1d598eeaf4ceaabd4ea7d683fa7a5f392dcb116314355
-  data.tar.gz: 7e15b203fb77e927ceb9a3d630d7129244c15564f5ace1c33c16b34e69590e06
+  metadata.gz: 3e33af9b542767ff7bead274db11e41bd1b1f8d33ebf63c5baebfa93afc611d6
+  data.tar.gz: 3952bad7dd3a9d28a310a144aa23afc7f3c192a708a75199f69c1ec585f576b7
 SHA512:
-  metadata.gz: f8caf4b44ba2ffa0a6e2ae2dc16dfee13b0537ab68d1ee09b84ed48d0b78dd7eb80e93d74fb2212ebb85b7e3138b138faa20a9bf4e2c6080462cf804d9d69de9
-  data.tar.gz: 5fcd249be0447eca9aee18e6aace72834b93c63995555baf4e270d8a190fce78ff666c1eb876353e95103c3139b6b6a719bec106c85133230aa84ed668c06ac6
+  metadata.gz: 1b64f0be69a10c946a9fada714d31fdf09c233ff35938adad84401060956d76d26c1bdf26ab01eb9b5f46abb954769eb5722d2e7857fbd83213d3192fe196cf0
+  data.tar.gz: 05ce3a76552f6b551654674e1de88518507061ab0f008fdb0823ca3baa3140c17dd417c6730f58e0d187773b27869dcc07f9d0df6e4373df7f635eba74ffa9c4

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ruby '3.2.2'
+ruby '3.4.1'
 
 source 'https://rubygems.org'
 
@@ -8,6 +8,7 @@ gem 'factory_bot'
 gem 'rake'
 gem 'rspec'
 gem 'rubocop', require: false
+gem 'rubocop-factory_bot'
 gem 'rubocop-rake'
 gem 'rubocop-rspec'
 gem 'simplecov', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.1.2)
+    activesupport (7.1.3.4)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -13,68 +13,62 @@ GEM
       tzinfo (~> 2.0)
     ast (2.4.2)
     base64 (0.2.0)
-    bigdecimal (3.1.4)
-    concurrent-ruby (1.2.2)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     docile (1.4.0)
-    drb (2.2.0)
-      ruby2_keywords
-    factory_bot (6.4.2)
+    drb (2.2.1)
+    factory_bot (6.4.6)
       activesupport (>= 5.0.0)
-    i18n (1.14.1)
+    i18n (1.14.5)
       concurrent-ruby (~> 1.0)
-    json (2.7.1)
+    json (2.7.2)
     language_server-protocol (3.17.0.3)
-    minitest (5.20.0)
+    minitest (5.24.1)
     mutex_m (0.2.0)
-    parallel (1.23.0)
-    parser (3.2.2.4)
+    parallel (1.25.1)
+    parser (3.3.4.0)
       ast (~> 2.4.1)
       racc
-    racc (1.7.3)
+    racc (1.8.0)
     rainbow (3.1.1)
-    rake (13.1.0)
-    regexp_parser (2.8.3)
-    rexml (3.2.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.9)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    rubocop (1.58.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.65.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.4)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
+      regexp_parser (>= 2.4, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.30.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.30.0)
-      parser (>= 3.2.1.0)
-    rubocop-capybara (2.19.0)
-      rubocop (~> 1.41)
-    rubocop-factory_bot (2.24.0)
-      rubocop (~> 1.33)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.25.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
+    rubocop-rspec (3.0.3)
+      rubocop (~> 1.61)
     ruby-progressbar (1.13.0)
-    ruby2_keywords (0.0.5)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -94,12 +88,13 @@ DEPENDENCIES
   rake
   rspec
   rubocop
+  rubocop-factory_bot
   rubocop-rake
   rubocop-rspec
   simplecov
 
 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.4.1p0
 
 BUNDLED WITH
    2.4.22

data/README.md

@@ -23,19 +23,7 @@ Run:
 
 [![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)
-- [Emacs Lisp](https://github.com/gdonald/blackjack-el)
+### Other Blackjack Implementations:
+
+I've written Blackjack in [some other programming languages](https://github.com/gdonald?tab=repositories&q=blackjack&type=public&language=&sort=stargazers) too.  Check them out!
+

data/bj.txt

@@ -1 +1 @@
-1|1|1|9000|500
+1|1|1|10000|500

data/console-blackjack.gemspec

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

data/lib/blackjack/card.rb

@@ -10,9 +10,7 @@ class Card
   end
 
   def to_s
-    return Card.faces[value][suit] if blackjack.face_type == 1
-
-    Card.faces2[value][suit]
+    (blackjack.face_type == 1 ? Card.faces : Card.faces2)[value][suit]
   end
 
   def ace?

data/lib/blackjack/dealer_hand.rb

@@ -6,20 +6,10 @@ class DealerHand < Hand
   attr_accessor :blackjack, :hide_first_card
 
   def initialize(blackjack)
-    super(blackjack)
+    super
     @hide_first_card = true
   end
 
-  def value(count_method)
-    total = value_for_method(count_method)
-
-    if count_method == :soft && total > 21
-      value(:hard)
-    else
-      total
-    end
-  end
-
   def upcard_is_ace?
     cards.first.ace?
   end
@@ -30,7 +20,7 @@ class DealerHand < Hand
       out << (index.zero? && hide_first_card ? Card.new(blackjack, 13, 0) : card).to_s
       out << ' '
     end
-    out << ' ⇒  ' << value(:soft).to_s
+    out << ' ⇒  ' << value(:soft, hide_first_card:).to_s
   end
 
   def deal_required_cards
@@ -42,7 +32,7 @@ class DealerHand < Hand
   end
 
   def both_values
-    [value(:soft), value(:hard)]
+    [value(:soft, hide_first_card:), value(:hard, hide_first_card:)]
   end
 
   def play
@@ -52,16 +42,4 @@ class DealerHand < Hand
     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

@@ -18,8 +18,19 @@ class Hand
   end
 
   def blackjack?
-    return false if cards.size != 2
+    cards.size == 2 && value(:soft) == 21
+  end
+
+  def value(count_method, hide_first_card: false)
+    total = 0
+    cards.each_with_index do |card, index|
+      next if index.zero? && hide_first_card
+
+      total += Card.value(card, count_method, total)
+    end
+
+    return value(:hard, hide_first_card:) if count_method == :soft && total > 21
 
-    (cards.first.ace? && cards.last.ten?) || (cards.first.ten? && cards.last.ace?)
+    total
   end
 end

data/lib/blackjack/player_hand.rb

@@ -54,16 +54,6 @@ class PlayerHand < Hand
     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)
-    else
-      total
-    end
-  end
-
   def done?
     return false unless no_more_actions?
 
@@ -115,8 +105,8 @@ class PlayerHand < Hand
 
   def draw_actions
     actions = []
-    actions << '(H) Hit' if can_hit?
-    actions << '(S) Stand' if can_stand?
+    actions << '(H) Hit'
+    actions << '(S) Stand'
     actions << '(P) Split' if can_split?
     actions << '(D) Double' if can_dbl?
     puts " #{actions.join('  ')}"

data/lib/blackjack/player_hand_draw.rb

@@ -13,9 +13,9 @@ module PlayerHandDraw
   def draw_status
     case status
     when :lost
-      draw_lost_str
+      busted? ? 'Busted!' : 'Lose!'
     when :won
-      draw_won_str
+      blackjack? ? 'Blackjack!' : 'Won!'
     when :push
       'Push'
     else
@@ -23,14 +23,6 @@ module PlayerHandDraw
     end
   end
 
-  def draw_lost_str
-    busted? ? 'Busted!' : 'Lose!'
-  end
-
-  def draw_won_str
-    blackjack? ? 'Blackjack!' : 'Won!'
-  end
-
   def draw_money(index)
     out = String.new('')
     out << '-' if status == :lost

data/lib/blackjack/shoe.rb

@@ -35,54 +35,46 @@ class Shoe
     7.times { cards.shuffle! }
   end
 
-  def new_regular
-    self.cards = []
-    num_decks.times do
-      4.times do |suit_value|
-        13.times do |value|
-          cards << Card.new(blackjack, value, suit_value)
-        end
-      end
-    end
-    shuffle
+  def total_cards
+    @total_cards ||= num_decks * CARDS_PER_DECK
   end
 
-  def new_irregular(values = [])
+  def build_deck(values = [])
     self.cards = []
     while cards.count < total_cards
-      4.times do |suit_value|
+      4.times do |suit|
         next if cards.count >= total_cards
 
         values.each do |value|
-          cards << Card.new(blackjack, value, suit_value)
+          cards << Card.new(blackjack, value, suit)
         end
       end
     end
     shuffle
   end
 
-  def total_cards
-    num_decks * CARDS_PER_DECK
+  def new_regular
+    build_deck((0..12).to_a)
   end
 
   def new_aces
-    new_irregular([0])
+    build_deck([0])
   end
 
   def new_jacks
-    new_irregular([10])
+    build_deck([10])
   end
 
   def new_aces_jacks
-    new_irregular([0, 10])
+    build_deck([0, 10])
   end
 
   def new_sevens
-    new_irregular([6])
+    build_deck([6])
   end
 
   def new_eights
-    new_irregular([7])
+    build_deck([7])
   end
 
   def next_card

data/spec/blackjack/dealer_hand_spec.rb

@@ -33,12 +33,12 @@ RSpec.describe DealerHand do
     context 'with a soft count' do
       it 'returns 10' do
         dealer_hand.cards << ace << ten
-        expect(dealer_hand.value(:soft)).to eq(10)
+        expect(dealer_hand.value(:soft, hide_first_card: true)).to eq(10)
       end
 
       it 'returns 11' do
         dealer_hand.cards << ten << ace
-        expect(dealer_hand.value(:soft)).to eq(11)
+        expect(dealer_hand.value(:soft, hide_first_card: true)).to eq(11)
       end
 
       it 'returns 12' do
@@ -51,12 +51,12 @@ RSpec.describe DealerHand do
     context 'with a hard count' do
       it 'returns 10' do
         dealer_hand.cards << ace << ten
-        expect(dealer_hand.value(:hard)).to eq(10)
+        expect(dealer_hand.value(:hard, hide_first_card: true)).to eq(10)
       end
 
       it 'returns 1' do
         dealer_hand.cards << ten << ace
-        expect(dealer_hand.value(:hard)).to eq(1)
+        expect(dealer_hand.value(:hard, hide_first_card: true)).to eq(1)
       end
     end
   end

data/spec/blackjack/player_hand_spec.rb

@@ -496,20 +496,6 @@ RSpec.describe PlayerHand do
       end.to output(" (H) Hit  (S) Stand\n").to_stdout
     end
 
-    it 'cannot hit' do
-      allow(player_hand).to receive(:can_hit?).and_return(false)
-      expect do
-        player_hand.draw_actions
-      end.to output(" (S) Stand\n").to_stdout
-    end
-
-    it 'cannot stand' do
-      allow(player_hand).to receive(:can_stand?).and_return(false)
-      expect do
-        player_hand.draw_actions
-      end.to output(" (H) Hit\n").to_stdout
-    end
-
     it 'can split' do
       allow(player_hand).to receive(:can_split?).and_return(true)
       expect do
@@ -523,29 +509,46 @@ RSpec.describe PlayerHand do
         player_hand.draw_actions
       end.to output(" (H) Hit  (S) Stand  (D) Double\n").to_stdout
     end
-  end
-
-  describe '#draw_lost_str' do
-    it 'returns Busted!' do
-      allow(player_hand).to receive(:busted?).and_return(true)
-      expect(player_hand.draw_lost_str).to eq('Busted!')
-    end
 
-    it 'returns Lose!' do
-      allow(player_hand).to receive(:busted?).and_return(false)
-      expect(player_hand.draw_lost_str).to eq('Lose!')
+    it 'can split and double' do
+      allow(player_hand).to receive_messages(can_split?: true, can_dbl?: true)
+      expect do
+        player_hand.draw_actions
+      end.to output(" (H) Hit  (S) Stand  (P) Split  (D) Double\n").to_stdout
     end
   end
 
-  describe '#draw_won_str' do
-    it 'returns Blackjack!' do
-      allow(player_hand).to receive(:blackjack?).and_return(true)
-      expect(player_hand.draw_won_str).to eq('Blackjack!')
+  describe '#draw_status' do
+    context 'with a lost hand' do
+      before do
+        allow(player_hand).to receive(:status).and_return(:lost)
+      end
+
+      it 'returns Busted!' do
+        allow(player_hand).to receive(:busted?).and_return(true)
+        expect(player_hand.draw_status).to eq('Busted!')
+      end
+
+      it 'returns Lose!' do
+        allow(player_hand).to receive(:busted?).and_return(false)
+        expect(player_hand.draw_status).to eq('Lose!')
+      end
     end
 
-    it 'returns Won!' do
-      allow(player_hand).to receive(:blackjack?).and_return(false)
-      expect(player_hand.draw_won_str).to eq('Won!')
+    context 'with a won hand' do
+      before do
+        allow(player_hand).to receive(:status).and_return(:won)
+      end
+
+      it 'returns Blackjack!' do
+        allow(player_hand).to receive(:blackjack?).and_return(true)
+        expect(player_hand.draw_status).to eq('Blackjack!')
+      end
+
+      it 'returns Won!' do
+        allow(player_hand).to receive(:blackjack?).and_return(false)
+        expect(player_hand.draw_status).to eq('Won!')
+      end
     end
   end
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: console-blackjack
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.6
 platform: ruby
 authors:
 - Greg Donald
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-09 00:00:00.000000000 Z
+date: 2025-01-18 00:00:00.000000000 Z
 dependencies: []
 description: Blackjack for your console, full version.
 email: gdonald@gmail.com
@@ -25,6 +24,8 @@ files:
 - bin/console-blackjack
 - bj.txt
 - console-blackjack-1.1.3.gem
+- console-blackjack-1.1.4.gem
+- console-blackjack-1.1.5.gem
 - console-blackjack.gemspec
 - lib/blackjack.rb
 - lib/blackjack/card.rb
@@ -71,15 +72,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Console Blackjack
 test_files: []