console-blackjack 1.0.9 → 1.1.1

data/spec/lib/blackjack/shoe_spec.rb

@@ -1,7 +1,14 @@
 # frozen_string_literal: true
 
 RSpec.describe Shoe do
-  let(:shoe) { build(:shoe) }
+  let(:blackjack) { build(:blackjack) }
+  let(:shoe) { build(:shoe, blackjack:) }
+
+  describe 'CARDS_PER_DECK' do
+    it 'returns 52' do
+      expect(described_class::CARDS_PER_DECK).to eq(52)
+    end
+  end
 
   describe '.new' do
     it 'creates a shoe' do
@@ -21,7 +28,7 @@ RSpec.describe Shoe do
     end
 
     context 'with a new regular shoe' do
-      let(:shoe) { build(:shoe, :new_regular) }
+      let(:shoe) { build(:shoe, :new_regular, blackjack:) }
 
       it 'returns false' do
         expect(shoe).to_not be_needs_to_shuffle
@@ -29,7 +36,7 @@ RSpec.describe Shoe do
     end
 
     context 'with 42 cards being dealt' do
-      let(:shoe) { build(:shoe, :new_regular) }
+      let(:shoe) { build(:shoe, :new_regular, blackjack:) }
 
       before do
         42.times { shoe.next_card }
@@ -42,7 +49,7 @@ RSpec.describe Shoe do
   end
 
   describe '#shuffle' do
-    let(:shoe) { build(:shoe) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'calls shuffle' do
       cards = instance_double(Array)
@@ -54,11 +61,11 @@ RSpec.describe Shoe do
   end
 
   describe '#new_regular' do
-    let(:shoe) { build(:shoe) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_regular
-      expect(shoe.cards.size).to eq(52)
+      expect(shoe.cards.size).to eq(Shoe::CARDS_PER_DECK)
     end
 
     it 'calls shuffle' do
@@ -69,11 +76,11 @@ RSpec.describe Shoe do
   end
 
   describe '#new_aces' do
-    let(:shoe) { build(:shoe) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_aces
-      expect(shoe.cards.size).to eq(40)
+      expect(shoe.cards.size).to eq(Shoe::CARDS_PER_DECK)
     end
 
     it 'calls shuffle' do
@@ -84,11 +91,11 @@ RSpec.describe Shoe do
   end
 
   describe '#new_jacks' do
-    let(:shoe) { build(:shoe) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_jacks
-      expect(shoe.cards.size).to eq(40)
+      expect(shoe.cards.size).to eq(Shoe::CARDS_PER_DECK)
     end
 
     it 'calls shuffle' do
@@ -99,11 +106,11 @@ RSpec.describe Shoe do
   end
 
   describe '#new_aces_jacks' do
-    let(:shoe) { build(:shoe) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_aces_jacks
-      expect(shoe.cards.size).to eq(80)
+      expect(shoe.cards.size).to eq(Shoe::CARDS_PER_DECK)
     end
 
     it 'calls shuffle' do
@@ -114,11 +121,11 @@ RSpec.describe Shoe do
   end
 
   describe '#new_sevens' do
-    let(:shoe) { build(:shoe) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_sevens
-      expect(shoe.cards.size).to eq(40)
+      expect(shoe.cards.size).to eq(Shoe::CARDS_PER_DECK)
     end
 
     it 'calls shuffle' do
@@ -129,11 +136,11 @@ RSpec.describe Shoe do
   end
 
   describe '#new_eights' do
-    let(:shoe) { build(:shoe) }
+    let(:shoe) { build(:shoe, blackjack:) }
 
     it 'creates a shoe' do
       shoe.new_eights
-      expect(shoe.cards.size).to eq(40)
+      expect(shoe.cards.size).to eq(Shoe::CARDS_PER_DECK)
     end
 
     it 'calls shuffle' do
@@ -144,11 +151,10 @@ RSpec.describe Shoe do
   end
 
   describe '#next_card' do
-    let(:shoe) { build(:shoe, :new_regular) }
+    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) }
-  let(:ten) { build(:card, :ten) }
+  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,12 +101,19 @@ RSpec.describe Blackjack do
   end
 
   describe '#save_game' do
-    it 'opens and put save file data' do
-      file = instance_double('File')
+    let(:file) { instance_double(File) }
+
+    before do
       allow(File).to receive(:open).with(SAVE_FILE, 'w').and_yield(file)
       allow(file).to receive(:puts)
+    end
+
+    it 'opens and put save file data' do
       blackjack.save_game
-      expect(file).to have_received(:puts).with("#{blackjack.num_decks}|#{blackjack.money}|#{blackjack.current_bet}")
+      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
 
@@ -123,7 +131,7 @@ RSpec.describe Blackjack do
     context 'with a readabale save file' do
       before do
         allow(File).to receive(:readable?).with(SAVE_FILE).and_return(true)
-        allow(File).to receive(:read).with(SAVE_FILE).and_return('8|2000|1000')
+        allow(File).to receive(:read).with(SAVE_FILE).and_return('8|1|1|2000|1000')
       end
 
       it 'loads num_decks from save file data' do
@@ -131,6 +139,11 @@ RSpec.describe Blackjack do
         expect(blackjack.num_decks).to eq(8)
       end
 
+      it 'loads face_type from save file data' do
+        blackjack.load_game
+        expect(blackjack.face_type).to eq(1)
+      end
+
       it 'loads money from save file data' do
         blackjack.load_game
         expect(blackjack.money).to eq(2000)
@@ -313,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
@@ -380,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
@@ -388,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)
@@ -399,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
@@ -446,7 +459,7 @@ RSpec.describe Blackjack do
 
       it 'draws the blackjack options' do
         blackjack.draw_game_options
-        expected = ' (N) Number of Decks  (T) Deck Type  (B) Back'
+        expected = ' (N) Number of Decks  (T) Deck Type  (F) Face Type  (B) Back'
         expect(blackjack).to have_received(:puts).with(expected)
       end
 
@@ -497,6 +510,37 @@ RSpec.describe Blackjack do
       end
     end
 
+    context 'when updating the face type' do
+      before do
+        allow(described_class).to receive(:getc).and_return('f')
+        allow(blackjack).to receive(:clear)
+        allow(blackjack).to receive(:draw_hands)
+        allow(blackjack).to receive(:new_face_type)
+        allow(blackjack).to receive(:draw_bet_options)
+        allow(blackjack).to receive(:puts)
+      end
+
+      it 'clears the screen' do
+        blackjack.draw_game_options
+        expect(blackjack).to have_received(:clear).twice
+      end
+
+      it 'draws the hands' do
+        blackjack.draw_game_options
+        expect(blackjack).to have_received(:draw_hands).twice
+      end
+
+      it 'updates face type' do
+        blackjack.draw_game_options
+        expect(blackjack).to have_received(:new_face_type)
+      end
+
+      it 'draws the bet options' do
+        blackjack.draw_game_options
+        expect(blackjack).to have_received(:draw_bet_options)
+      end
+    end
+
     context 'when going back to previous menu' do
       before do
         allow(described_class).to receive(:getc).and_return('b')
@@ -542,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)
@@ -553,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
@@ -597,6 +641,7 @@ RSpec.describe Blackjack do
     before do
       blackjack.dealer_hand = dealer_hand
       allow(blackjack).to receive(:puts)
+      allow(blackjack).to receive(:save_game)
     end
 
     context 'when choosing a new deck type' do
@@ -612,6 +657,7 @@ RSpec.describe Blackjack do
         allow(blackjack.shoe).to receive(:new_regular)
         blackjack.new_deck_type
         expect(blackjack.shoe).to have_received(:new_regular)
+        expect(blackjack).to have_received(:save_game)
       end
 
       it 'builds a new aces' do
@@ -619,6 +665,7 @@ RSpec.describe Blackjack do
         allow(blackjack.shoe).to receive(:new_aces)
         blackjack.new_deck_type
         expect(blackjack.shoe).to have_received(:new_aces)
+        expect(blackjack).to have_received(:save_game)
       end
 
       it 'builds a new jacks' do
@@ -626,6 +673,7 @@ RSpec.describe Blackjack do
         allow(blackjack.shoe).to receive(:new_jacks)
         blackjack.new_deck_type
         expect(blackjack.shoe).to have_received(:new_jacks)
+        expect(blackjack).to have_received(:save_game)
       end
 
       it 'builds a new aces_jacks' do
@@ -633,6 +681,7 @@ RSpec.describe Blackjack do
         allow(blackjack.shoe).to receive(:new_aces_jacks)
         blackjack.new_deck_type
         expect(blackjack.shoe).to have_received(:new_aces_jacks)
+        expect(blackjack).to have_received(:save_game)
       end
 
       it 'builds a new sevens' do
@@ -640,6 +689,7 @@ RSpec.describe Blackjack do
         allow(blackjack.shoe).to receive(:new_sevens)
         blackjack.new_deck_type
         expect(blackjack.shoe).to have_received(:new_sevens)
+        expect(blackjack).to have_received(:save_game)
       end
 
       it 'builds a new eights' do
@@ -647,6 +697,7 @@ RSpec.describe Blackjack do
         allow(blackjack.shoe).to receive(:new_eights)
         blackjack.new_deck_type
         expect(blackjack.shoe).to have_received(:new_eights)
+        expect(blackjack).to have_received(:save_game)
       end
     end
 
@@ -656,13 +707,56 @@ RSpec.describe Blackjack do
         allow(blackjack).to receive(:draw_hands)
         blackjack.new_deck_type
         expect(blackjack).to have_received(:draw_hands)
+        expect(blackjack).to have_received(:save_game).twice
+      end
+    end
+  end
+
+  describe '#new_face_type' do
+    before do
+      blackjack.dealer_hand = dealer_hand
+      allow(blackjack).to receive(:puts)
+    end
+
+    context 'when choosing a new face type' do
+      it 'draws options' do
+        allow(described_class).to receive(:getc).and_return('1')
+        blackjack.new_face_type
+        expected = ' (1) 🂡  (2) A♠'
+        expect(blackjack).to have_received(:puts).with(expected)
+      end
+
+      it 'sets regular faces' do
+        allow(described_class).to receive(:getc).and_return('1')
+        allow(blackjack).to receive(:save_game)
+        allow(blackjack).to receive(:face_type=).with(1)
+        blackjack.new_face_type
+        expect(blackjack).to have_received(:face_type=).with(1)
+        expect(blackjack).to have_received(:save_game)
+      end
+
+      it 'sets alternate faces' do
+        allow(described_class).to receive(:getc).and_return('2')
+        allow(blackjack).to receive(:save_game)
+        allow(blackjack).to receive(:face_type=).with(2)
+        blackjack.new_face_type
+        expect(blackjack).to have_received(:face_type=).with(2)
+        expect(blackjack).to have_received(:save_game)
+      end
+    end
+
+    context 'when invalid input' do
+      it 'gets the action again' do
+        allow(described_class).to receive(:getc).and_return('x', '1')
+        allow(blackjack).to receive(:draw_hands)
+        blackjack.new_face_type
+        expect(blackjack).to have_received(:draw_hands)
       end
     end
   end
 
   describe '#ask_insurance' do
     before do
-      # blackjack.dealer_hand = dealer_hand
       allow(blackjack).to receive(:puts)
       allow(blackjack).to receive(:insure_hand)
       allow(blackjack).to receive(:no_insurance)
@@ -722,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
@@ -760,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

data/spec/spec_helper.rb

@@ -7,12 +7,9 @@ SimpleCov.start do
   primary_coverage :branch
 end
 
-require 'coveralls'
-Coveralls.wear!
-
 Dir.glob(File.join(File.dirname(__FILE__),
                    "..#{File::SEPARATOR}lib", '**',
-                   '*.rb')).sort.each(&method(:require))
+                   '*.rb')).each(&method(:require))
 
 require 'factory_bot'
 require 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-blackjack
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.1
 platform: ruby
 authors:
 - Greg Donald
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-15 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
@@ -23,10 +23,8 @@ files:
 - README.md
 - Rakefile
 - bin/console-blackjack
-- bj.png
 - bj.txt
-- console-blackjack-1.0.7.gem
-- console-blackjack-1.0.8.gem
+- console-blackjack-1.1.0.gem
 - console-blackjack.gemspec
 - lib/blackjack.rb
 - lib/blackjack/card.rb
@@ -54,11 +52,14 @@ files:
 - spec/lib/blackjack/shoe_spec.rb
 - spec/lib/blackjack_spec.rb
 - spec/spec_helper.rb
+- ss1.png
+- ss2.png
 homepage: https://github.com/gdonald/console-blackjack-ruby
 licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/gdonald/console-blackjack-ruby
+  rubygems_mfa_required: 'true'
 post_install_message: |2+
 
   Type `console-blackjack` to run!
@@ -70,15 +71,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.5
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Console Blackjack
 test_files: []
+...