console-blackjack 1.0.9 → 1.1.1

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
@@ -23,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
@@ -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,14 +56,14 @@ 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?
       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
@@ -92,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|
@@ -128,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
@@ -160,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
 
@@ -170,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
@@ -201,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/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,10 @@ FactoryBot.define do
       value { 9 }
     end
 
-    initialize_with { new(value, suit) }
+    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/factories/shoe_factory.rb

@@ -2,6 +2,7 @@
 
 FactoryBot.define do
   factory :shoe do
+    blackjack { nil }
     num_decks { 1 }
     cards { [] }
 
@@ -9,6 +10,6 @@ FactoryBot.define do
       after(:build, &:new_regular)
     end
 
-    initialize_with { new(num_decks) }
+    initialize_with { new(blackjack, num_decks) }
   end
 end

data/spec/lib/blackjack/card_spec.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe Card do
-  let(:card) { build(:card) }
+  let(:blackjack) { build(:blackjack) }
+  let(:card) { build(:card, blackjack:) }
 
   describe '.new' do
     it 'creates a card' do
@@ -18,8 +19,20 @@ RSpec.describe Card do
   end
 
   describe '#to_s' do
-    it 'returns a string value' do
-      expect(card.to_s).to eq('🂡')
+    context 'with regular faces' do
+      it 'returns a string value' do
+        expect(card.to_s).to eq('🂡')
+      end
+    end
+
+    context 'with alternate faces' do
+      before do
+        blackjack.face_type = 2
+      end
+
+      it 'returns a string value' do
+        expect(card.to_s).to eq('A♠')
+      end
     end
   end
 
@@ -50,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) }
-  let(:ten) { build(:card, :ten) }
+  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
+    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) }
-  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:) }
 
   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