console-blackjack 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afe559012781237762c59c0d59197c5771df140894892343bef7ffebe4e74107
-  data.tar.gz: 2f3d7036018fa36f382a228bac715386810bc6344418f4088ac5ab2cbe969599
+  metadata.gz: 980fc87d551f6423c15ec1c6f6396e23a0014130b925c74ba3218043f5e65842
+  data.tar.gz: 87452bf3571ee0468217cdd2d94e584ceb7318a0ee0ee10b9dd37e3fbab34948
 SHA512:
-  metadata.gz: 80262b3f810250f2ecbdf9f67e94fedbcb64d19ab8f57cdb0c1e9d5423a0a28329cf8a50b5f289dc91cbb7a137df9c19bf8287b547f712c7c13b988f975c2585
-  data.tar.gz: 85c14530a0c59c4f94b583bd20ac5408c5f6f91c1ee917733878c5ee9f0216882ed5e6f9ce98dcfba5d77593d443ca01c1fb32a586b3b675bb9126c67e2aac23
+  metadata.gz: a36bcc5836b977fc57c6a1e3b6de846076f29f1cc83ddb74859df260baf3d9e24de65093371ba34f4006209d37e45f4c5cf42a09731d54625a4b765c2958e19b
+  data.tar.gz: 2719e57e76289aad38e891bd34dc3f34d17a106a212361d4cfaa8e8c36627f2dc8df4c5bb5acb2fcba748d604734f5e00f47bb0c061dd13bed195350ac6b2562

data/Gemfile

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

data/Gemfile.lock

@@ -1,72 +1,94 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4.3)
+    activesupport (7.1.2)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.4)
     concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    factory_bot (6.2.1)
+    drb (2.2.0)
+      ruby2_keywords
+    factory_bot (6.4.2)
       activesupport (>= 5.0.0)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    minitest (5.18.0)
-    parallel (1.22.1)
-    parser (3.2.1.1)
+    json (2.7.1)
+    language_server-protocol (3.17.0.3)
+    minitest (5.20.0)
+    mutex_m (0.2.0)
+    parallel (1.23.0)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.3)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.7.0)
-    rexml (3.2.5)
+    rake (13.1.0)
+    regexp_parser (2.8.3)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     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-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.4)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.48.1)
+    rspec-support (3.12.1)
+    rubocop (1.58.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.26.0, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.27.0)
+    rubocop-ast (1.30.0)
       parser (>= 3.2.1.0)
-    rubocop-capybara (2.17.1)
+    rubocop-capybara (2.19.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.24.0)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.19.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (2.25.0)
+      rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     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)
+    strscan (3.1.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
+  arm64-darwin-22
   ruby
 
 DEPENDENCIES
@@ -79,7 +101,7 @@ DEPENDENCIES
   simplecov
 
 RUBY VERSION
-   ruby 3.2.1p31
+   ruby 3.3.1p55
 
 BUNDLED WITH
-   2.3.15
+   2.4.22

data/README.md

@@ -38,3 +38,4 @@ I've written Blackjack in several other languages:
 - [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)

data/bj.txt

@@ -1 +1 @@
-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.2'
+  spec.required_ruby_version = '>= 3.3'
   spec.name = 'console-blackjack'
-  spec.version = '1.1.3'
+  spec.version = '1.1.5'
   spec.summary = 'Console Blackjack'
   spec.description = 'Blackjack for your console, full version.'
   spec.author = 'Greg Donald'

data/lib/blackjack/player_hand.rb

@@ -10,20 +10,20 @@ class PlayerHand < Hand
 
   MAX_PLAYER_HANDS = 7
 
-  attr_accessor :blackjack, :bet, :status, :payed, :cards, :stood
+  attr_accessor :blackjack, :bet, :status, :paid, :cards, :stood
 
   def initialize(blackjack, bet)
     super(blackjack)
     @bet = bet
     @status = :unknown
-    @payed = false
+    @paid = false
     @stood = false
   end
 
   def pay(dealer_hand_value, dealer_busted)
-    return if payed
+    return if paid
 
-    self.payed = true
+    self.paid = true
     player_hand_value = value(:soft)
 
     if player_hand_won?(dealer_busted, dealer_hand_value, player_hand_value)
@@ -68,12 +68,12 @@ class PlayerHand < Hand
     return false unless no_more_actions?
 
     self.played = true
-    collect_busted_hand if !payed && busted?
+    collect_busted_hand if !paid && busted?
     true
   end
 
   def collect_busted_hand
-    self.payed = true
+    self.paid = true
     self.status = :lost
     blackjack.money -= bet
   end

data/lib/blackjack/shoe.rb

@@ -23,7 +23,7 @@ class Shoe
   end
 
   def needs_to_shuffle?
-    return true if cards.size.zero?
+    return true if cards.empty?
 
     cards_dealt = total_cards - cards.size
     used = cards_dealt / total_cards.to_f * 100.0
@@ -38,8 +38,8 @@ class Shoe
   def new_regular
     self.cards = []
     num_decks.times do
-      (0..3).each do |suit_value|
-        (0..12).each do |value|
+      4.times do |suit_value|
+        13.times do |value|
           cards << Card.new(blackjack, value, suit_value)
         end
       end
@@ -50,7 +50,7 @@ class Shoe
   def new_irregular(values = [])
     self.cards = []
     while cards.count < total_cards
-      (0..3).each do |suit_value|
+      4.times do |suit_value|
         next if cards.count >= total_cards
 
         values.each do |value|

data/lib/blackjack.rb

@@ -162,7 +162,7 @@ class Blackjack
     player_hand = current_player_hand
     player_hand.bet /= 2
     player_hand.played = true
-    player_hand.payed = true
+    player_hand.paid = true
     player_hand.status = :lost
 
     self.money -= player_hand.bet

data/spec/{lib/blackjack → blackjack}/player_hand_spec.rb

@@ -24,8 +24,8 @@ RSpec.describe PlayerHand do
       expect(player_hand.status).to eq(:unknown)
     end
 
-    it 'has not been payed' do
-      expect(player_hand.payed).to be_falsey
+    it 'has not been paid' do
+      expect(player_hand.paid).to be_falsey
     end
   end
 
@@ -550,8 +550,8 @@ RSpec.describe PlayerHand do
   end
 
   describe '#pay' do
-    it 'returns if already payed' do
-      player_hand.payed = true
+    it 'returns if already paid' do
+      player_hand.paid = true
       allow(player_hand).to receive(:value)
       player_hand.pay(18, false)
       expect(player_hand).to_not have_received(:value)
@@ -565,10 +565,10 @@ RSpec.describe PlayerHand do
     end
 
     context 'when dealer is not busted' do
-      it 'hand is set to payed' do
+      it 'hand is set to paid' do
         player_hand.cards << ten << ten
         player_hand.pay(18, false)
-        expect(player_hand.payed).to be_truthy
+        expect(player_hand.paid).to be_truthy
       end
 
       it 'hand status is won' do

data/spec/{lib/blackjack_spec.rb → blackjack_spec.rb}

@@ -48,16 +48,14 @@ RSpec.describe Blackjack do
 
     context 'when busted' do
       it 'returns false' do
-        allow(player_hand).to receive(:blackjack?).and_return(false)
-        allow(player_hand).to receive(:busted?).and_return(true)
+        allow(player_hand).to receive_messages(blackjack?: false, busted?: true)
         expect(blackjack).to_not be_need_to_play_dealer_hand
       end
     end
 
     context 'when blackjack' do
       it 'returns false' do
-        allow(player_hand).to receive(:busted?).and_return(false)
-        allow(player_hand).to receive(:blackjack?).and_return(true)
+        allow(player_hand).to receive_messages(busted?: false, blackjack?: true)
         expect(blackjack).to_not be_need_to_play_dealer_hand
       end
     end
@@ -811,9 +809,9 @@ RSpec.describe Blackjack do
       expect(player_hand.played).to be_truthy
     end
 
-    it 'sets hand as payed' do
+    it 'sets hand as paid' do
       blackjack.insure_hand
-      expect(player_hand.payed).to be_truthy
+      expect(player_hand.paid).to be_truthy
     end
 
     it 'sets hand status as :lost' do

data/spec/factories/player_hand_factory.rb

@@ -5,7 +5,7 @@ FactoryBot.define do
     game { nil }
     bet { 500 }
     status { :unknown }
-    payed { false }
+    paid { false }
     stood { false }
 
     initialize_with { new(game, bet) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-blackjack
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Greg Donald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2024-05-28 00:00:00.000000000 Z
 dependencies: []
 description: Blackjack for your console, full version.
 email: gdonald@gmail.com
@@ -24,9 +24,8 @@ files:
 - Rakefile
 - bin/console-blackjack
 - bj.txt
-- console-blackjack-1.1.0.gem
-- console-blackjack-1.1.1.gem
-- console-blackjack-1.1.2.gem
+- console-blackjack-1.1.3.gem
+- console-blackjack-1.1.4.gem
 - console-blackjack.gemspec
 - lib/blackjack.rb
 - lib/blackjack/card.rb
@@ -40,19 +39,19 @@ files:
 - lib/blackjack/shoe.rb
 - lib/blackjack/split_hand.rb
 - lib/blackjack/utils.rb
+- spec/blackjack/card_spec.rb
+- spec/blackjack/dealer_hand_spec.rb
+- spec/blackjack/format_spec.rb
+- spec/blackjack/hand_spec.rb
+- spec/blackjack/player_hand_spec.rb
+- spec/blackjack/shoe_spec.rb
+- spec/blackjack_spec.rb
 - spec/factories/blackjack_factory.rb
 - spec/factories/card_factory.rb
 - spec/factories/dealer_hand_factory.rb
 - spec/factories/hand_factory.rb
 - spec/factories/player_hand_factory.rb
 - spec/factories/shoe_factory.rb
-- spec/lib/blackjack/card_spec.rb
-- spec/lib/blackjack/dealer_hand_spec.rb
-- spec/lib/blackjack/format_spec.rb
-- spec/lib/blackjack/hand_spec.rb
-- spec/lib/blackjack/player_hand_spec.rb
-- spec/lib/blackjack/shoe_spec.rb
-- spec/lib/blackjack_spec.rb
 - spec/spec_helper.rb
 - ss1.png
 - ss2.png
@@ -73,14 +72,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.2'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: Console Blackjack