console-blackjack 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6b53cff41f5f86ff9b279267559148007288ad2d6a64002308bd2c60b15519
-  data.tar.gz: 35c2c4bc1d8fe0f20fdab6a22da8f8395724b8a7c0eb8c72a0a384f8072dd0b2
+  metadata.gz: 6d8e2845da3cf406f528ed2658a6ca3746a734ba539c83cdc705b971d3100836
+  data.tar.gz: a3850be940cb68425bab3c72b449316675bfeadaf48393115662c326f906353b
 SHA512:
-  metadata.gz: ded02e0f2f976b44fe6c24300d58c1107d6555a7fd35bcdb4908cf5dbabfa7ea9c0c5fe6d3d47da7ee34be4728df00baf744b4a13f3de4c7af70687e18b07b8e
-  data.tar.gz: 24294265189ea7d8cc29973c2a3a285b38d5ac41fae3d6b8fb88f331599381828d640c6cb92b1be629bd31281f8ba0d8d8298c12c85193e0f82028ffaf177e99
+  metadata.gz: 40a8d8db918d89a6e357c0966cce82e0bf9b9aa8c74c74ad6c90424a5b669717935340bc4274f64d3937f40468c419725895161fd2df7c7ca065bfc2400e768b
+  data.tar.gz: 1936e836e9f98afd78f76da330f1c14f45eb8350db5b178ce99804b20f941ebc1f79a082a9b68110ee91693bdfb63fb3b01cbcec0d500da50e2b0223b17b4966

data/README.md

@@ -1,28 +1,24 @@
-# blackjack-ruby
+# console-blackjack-ruby
 
-## Console
-
-![Blackjack](https://raw.githubusercontent.com/gdonald/blackjack-ruby/master/bj.png)
+![Blackjack](https://raw.githubusercontent.com/gdonald/console-blackjack-ruby/master/bj.png)
 
 ## Getting Started
 
-Install gems:
-
-    bundle install
-
-Run tests:
+Install:
 
-    rake
+    gem install console-blackjack
 
 Run:
 
-    ruby blackjack.rb
+    console-blackjack
 
 ## Status
 
-[![Build Status](https://travis-ci.org/gdonald/blackjack-ruby.svg?branch=master)](https://travis-ci.org/gdonald/blackjack-ruby)
-[![Coverage Status](https://coveralls.io/repos/github/gdonald/blackjack-ruby/badge.svg?branch=master)](https://coveralls.io/github/gdonald/blackjack-ruby?branch=master)
+[![Build Status](https://travis-ci.org/gdonald/console-blackjack-ruby.svg?branch=master)](https://travis-ci.org/gdonald/console-blackjack-ruby)
+[![Coverage Status](https://coveralls.io/repos/github/gdonald/console-blackjack-ruby/badge.svg?branch=master)](https://coveralls.io/github/gdonald/console-blackjack-ruby?branch=master)
+[![Maintainability](https://api.codeclimate.com/v1/badges/ce4171c76179d7882a0b/maintainability)](https://codeclimate.com/github/gdonald/console-blackjack-ruby/maintainability)
+[![Downloads](https://ruby-gem-downloads-badge.herokuapp.com/console-blackjack?color=blue)](https://rubygems.org/gems/console-blackjack)
 
 ## License
 
-blackjack-ruby is released under the [MIT License](http://www.opensource.org/licenses/MIT)
+[![GitHub](https://img.shields.io/github/license/gdonald/console-blackjack-ruby?color=aa0000)](https://github.com/gdonald/console-blackjack-ruby/blob/master/LICENSE)

data/bj.txt

@@ -1 +1 @@
-8|1153000|500
+1|10500|500

data/console-blackjack.gemspec

@@ -4,8 +4,8 @@ require 'rake'
 
 Gem::Specification.new do |spec|
   spec.name = 'console-blackjack'
-  spec.version = '1.0.0'
-  spec.date = '2019-11-09'
+  spec.version = '1.0.1'
+  spec.date = '2019-11-10'
   spec.summary = 'Console Blackjack'
   spec.description = 'Blackjack for your console, full version.'
   spec.author = 'Greg Donald'

data/lib/blackjack.rb

@@ -1,14 +1,22 @@
 # frozen_string_literal: true
 
-require_relative 'blackjack/shoe'
 require_relative 'blackjack/dealer_hand'
+require_relative 'blackjack/format'
+require_relative 'blackjack/menus'
 require_relative 'blackjack/player_hand'
+require_relative 'blackjack/shoe'
+require_relative 'blackjack/split_hand'
+require_relative 'blackjack/utils'
 
 SAVE_FILE = 'bj.txt'
 MIN_BET = 500
 MAX_BET = 10_000_000
 
 class Blackjack
+  include Menus
+  include SplitHand
+  include Utils
+
   attr_accessor :shoe, :money, :player_hands, :dealer_hand, :num_decks, :current_bet, :current_hand
 
   def initialize
@@ -72,8 +80,7 @@ class Blackjack
     if current_player_hand.done?
       current_player_hand.process
     else
-      draw_hands
-      current_player_hand.action?
+      draw_hands_current_hand_action
     end
   end
 
@@ -84,16 +91,6 @@ class Blackjack
     false
   end
 
-  def normalize_current_bet
-    if current_bet < MIN_BET
-      self.current_bet = MIN_BET
-    elsif current_bet > MAX_BET
-      self.current_bet = MAX_BET
-    end
-
-    self.current_bet = money if current_bet > money
-  end
-
   def pay_hands
     dealer_hand_value = dealer_hand.value(SOFT)
     dealer_busted = dealer_hand.busted?
@@ -116,76 +113,41 @@ class Blackjack
     clear
     out = String.new
     out << "\n Dealer:\n#{dealer_hand.draw}\n"
-
     out << "\n Player $"
-    out << Blackjack.format_money(money / 100.0)
+    out << Format.money(money / 100.0)
     out << ":\n"
+    out << draw_player_hands
+    puts out
+  end
 
+  def draw_player_hands
+    out = String.new('')
     player_hands.each_with_index do |player_hand, index|
       out << player_hand.draw(index)
     end
-
-    puts out
+    out
   end
 
   def new_bet
     clear
     draw_hands
 
-    puts " Current Bet: $#{Blackjack.format_money(current_bet / 100)}\n"
+    puts " Current Bet: $#{Format.money(current_bet / 100)}\n"
     print ' Enter New Bet: $'
 
-    tmp = STDIN.gets.to_i
-    self.current_bet = tmp * 100
+    self.current_bet = STDIN.gets.to_i * 100
 
     normalize_current_bet
     deal_new_hand
   end
 
-  def draw_game_options
-    puts ' (N) Number of Decks  (T) Deck Type  (B) Back'
-
-    loop do
-      br = false
-      case Blackjack.getc
-      when 'n'
-        br = true
-        clear
-        draw_hands
-        new_num_decks
-      when 't'
-        br = true
-        clear
-        draw_hands
-        new_deck_type
-        clear
-        draw_hands
-        draw_bet_options
-      when 'b'
-        br = true
-        clear
-        draw_hands
-        draw_bet_options
-      else
-        clear
-        draw_hands
-        draw_game_options
-      end
-
-      break if br
-    end
-  end
-
   def new_num_decks
     puts " Number Of Decks: #{num_decks}"
     print ' New Number Of Decks (1-8): '
     self.num_decks = STDIN.gets.to_i
 
     normalize_num_decks
-
-    clear
-    draw_hands
-    draw_game_options
+    clear_draw_hands_game_options
   end
 
   def normalize_num_decks
@@ -193,62 +155,6 @@ class Blackjack
     self.num_decks = 8 if num_decks > 8
   end
 
-  def new_deck_type
-    puts ' (1) Regular  (2) Aces  (3) Jacks  (4) Aces & Jacks  (5) Sevens  (6) Eights'
-
-    loop do
-      br = false
-      case Blackjack.getc
-      when '1'
-        br = true
-        shoe.new_regular
-      when '2'
-        br = true
-        shoe.new_aces
-      when '3'
-        br = true
-        shoe.new_jacks
-      when '4'
-        br = true
-        shoe.new_aces_jacks
-      when '5'
-        br = true
-        shoe.new_sevens
-      when '6'
-        br = true
-        shoe.new_eights
-      else
-        clear
-        draw_hands
-        new_deck_type
-      end
-
-      break if br
-    end
-  end
-
-  def ask_insurance
-    puts ' Insurance?  (Y) Yes  (N) No'
-
-    loop do
-      br = false
-      case Blackjack.getc
-      when 'y'
-        br = true
-        insure_hand
-      when 'n'
-        br = true
-        no_insurance
-      else
-        clear
-        draw_hands
-        ask_insurance
-      end
-
-      break if br
-    end
-  end
-
   def insure_hand
     player_hand = current_player_hand
     player_hand.bet /= 2
@@ -281,89 +187,18 @@ class Blackjack
     end
   end
 
-  def play_dealer_hand
-    dealer_hand.play
-    draw_hands
-    draw_bet_options
-  end
-
-  def split_current_hand
-    if current_player_hand.can_split?
-      player_hands << PlayerHand.new(self, current_bet)
-
-      x = player_hands.size - 1
-      while x > current_hand
-        player_hands[x] = player_hands[x - 1].clone
-        x -= 1
-      end
-
-      this_hand = player_hands[current_hand]
-      split_hand = player_hands[current_hand + 1]
-
-      split_hand.cards = []
-      split_hand.cards << this_hand.cards.last
-      this_hand.cards.pop
-
-      this_hand.cards << shoe.next_card
-      if this_hand.done?
-        this_hand.process
-      else
-        draw_hands
-        current_player_hand.action?
-      end
-    else
-      draw_hands
-      current_player_hand.action?
-    end
-  end
-
-  def draw_bet_options
-    puts ' (D) Deal Hand  (B) Change Bet  (O) Options  (Q) Quit'
-
-    loop do
-      br = false
-      case Blackjack.getc
-      when 'd'
-        br = true
-        deal_new_hand
-      when 'b'
-        br = true
-        new_bet
-      when 'o'
-        br = true
-        clear
-        draw_hands
-        draw_game_options
-      when 'q'
-        clear
-        exit
-      else
-        clear
-        draw_hands
-        draw_bet_options
-      end
-
-      break if br
-    end
-  end
-
   def all_bets
     player_hands.inject(0) { |sum, player_hand| sum + player_hand.bet }
   end
 
-  def save_game
-    File.open(SAVE_FILE, 'w') do |file|
-      file.puts "#{num_decks}|#{money}|#{current_bet}"
+  def normalize_current_bet
+    if current_bet < MIN_BET
+      self.current_bet = MIN_BET
+    elsif current_bet > MAX_BET
+      self.current_bet = MAX_BET
     end
-  end
-
-  def load_game
-    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.current_bet = money if current_bet > money
   end
 
   def self.getc
@@ -375,8 +210,4 @@ class Blackjack
     end
     c.chr
   end
-
-  def self.format_money(value)
-    format('%.2f', value)
-  end
 end

data/lib/blackjack/card.rb

@@ -20,6 +20,12 @@ class Card
     value > 8
   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
+  end
+
   def self.faces
     [%w[🂡 🂱 🃁 🃑], %w[🂢 🂲 🃂 🃒], %w[🂣 🂳 🃃 🃓], %w[🂤 🂴 🃄 🃔],
      %w[🂥 🂵 🃅 🃕], %w[🂦 🂶 🃆 🃖], %w[🂧 🂷 🃇 🃗], %w[🂨 🂸 🃈 🃘],

data/lib/blackjack/dealer_hand.rb

@@ -11,15 +11,7 @@ class DealerHand < Hand
   end
 
   def value(count_method)
-    total = 0
-    cards.each_with_index do |card, index|
-      next if index == 1 && hide_down_card
-
-      value = card.value + 1
-      v = value > 9 ? 10 : value
-      v = 11 if count_method == SOFT && v == 1 && total < 11
-      total += v
-    end
+    total = total_card_value(count_method)
 
     if count_method == SOFT && total > 21
       value(HARD)
@@ -28,6 +20,16 @@ class DealerHand < Hand
     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

data/lib/blackjack/format.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module Format
+  def self.money(value)
+    format_str = '%.2f'
+    format(format_str, value)
+  end
+end

data/lib/blackjack/menus.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+module Menus
+  def draw_game_options
+    puts ' (N) Number of Decks  (T) Deck Type  (B) Back'
+    loop do
+      c = Blackjack.getc
+      case c
+      when 'n'
+        clear_draw_hands_new_num_decks
+      when 't'
+        clear_draw_hands_new_deck_type
+        clear_draw_hands_bet_options
+      when 'b'
+        clear_draw_hands_bet_options
+      else
+        clear_draw_hands_game_options
+      end
+      break if %w[n t b].include?(c)
+    end
+  end
+
+  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
+      case c
+      when (1..6)
+        shoe.send("new_#{SHOES[c]}")
+      else
+        clear_draw_hands_new_deck_type
+      end
+      break if (1..6).include?(c)
+    end
+  end
+
+  def ask_insurance
+    puts ' Insurance?  (Y) Yes  (N) No'
+    loop do
+      c = Blackjack.getc
+      case c
+      when 'y'
+        insure_hand
+      when 'n'
+        no_insurance
+      else
+        clear_draw_hands_ask_insurance
+      end
+      break if %w[y n].include?(c)
+    end
+  end
+
+  def draw_bet_options
+    puts ' (D) Deal Hand  (B) Change Bet  (O) Options  (Q) Quit'
+    loop do
+      c = Blackjack.getc
+      case c
+      when 'd'
+        deal_new_hand
+      when 'b'
+        new_bet
+      when 'o'
+        clear_draw_hands_game_options
+      when 'q'
+        clear
+        exit
+      else
+        clear_draw_hands_bet_options
+      end
+      break if %w[d b o].include?(c)
+    end
+  end
+end

data/lib/blackjack/player_hand.rb

@@ -1,8 +1,13 @@
 # frozen_string_literal: true
 
 require_relative 'hand'
+require_relative 'player_hand_actions'
+require_relative 'player_hand_draw'
 
 class PlayerHand < Hand
+  include PlayerHandDraw
+  include PlayerHandActions
+
   MAX_PLAYER_HANDS = 7
 
   attr_accessor :blackjack, :bet, :status, :payed, :cards, :stood
@@ -21,94 +26,60 @@ class PlayerHand < Hand
     self.payed = true
     player_hand_value = value(SOFT)
 
-    if dealer_busted || player_hand_value > dealer_hand_value
-      self.bet *= 1.5 if blackjack?
-      blackjack.money += bet
-      self.status = WON
-    elsif player_hand_value < dealer_hand_value
-      blackjack.money -= bet
-      self.status = LOST
+    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
     end
   end
 
-  def value(count_method)
-    total = 0
-    cards.each do |card|
-      value = card.value + 1
-      v = value > 9 ? 10 : value
-      v = 11 if count_method == SOFT && v == 1 && total < 11
-      total += v
-    end
-
-    return value(HARD) if count_method == SOFT && total > 21
-
-    total
-  end
-
-  def done?
-    if played || stood || blackjack? || busted? ||
-       value(SOFT) == 21 ||
-       value(HARD) == 21
-      self.played = true
-
-      if !payed && busted?
-        self.payed = true
-        self.status = LOST
-        blackjack.money -= bet
-      end
-      return true
-    end
-
-    false
-  end
-
-  def can_split?
-    return false if stood || blackjack.player_hands.size >= MAX_PLAYER_HANDS
-
-    return false if blackjack.money < blackjack.all_bets + bet
-
-    cards.size == 2 && cards.first.value == cards.last.value
+  def player_hand_lost?(dealer_hand_value, player_hand_value)
+    player_hand_value < dealer_hand_value
   end
 
-  def can_dbl?
-    return false if blackjack.money < blackjack.all_bets + bet
-
-    !(stood || cards.size != 2 || blackjack?)
+  def player_hand_won?(dealer_busted, dealer_hand_value, player_hand_value)
+    dealer_busted || player_hand_value > dealer_hand_value
   end
 
-  def can_stand?
-    !(stood || busted? || blackjack?)
+  def collect_lost_hand
+    blackjack.money -= bet
+    self.status = LOST
   end
 
-  def can_hit?
-    !(played || stood || value(HARD) == 21 || blackjack? || busted?)
+  def pay_won_hand
+    self.bet *= 1.5 if blackjack?
+    blackjack.money += bet
+    self.status = WON
   end
 
-  def hit
-    deal_card
+  def value(count_method)
+    total = cards.inject(0) { |sum, card| sum + Card.value(card, count_method, sum) }
 
-    if done?
-      process
+    if count_method == SOFT && total > 21
+      value(HARD)
     else
-      blackjack.draw_hands
-      blackjack.current_player_hand.action?
+      total
     end
   end
 
-  def dbl
-    deal_card
+  def done?
+    return false unless no_more_actions?
 
     self.played = true
-    self.bet *= 2
-    process if done?
+    collect_busted_hand if !payed && busted?
+    true
   end
 
-  def stand
-    self.stood = true
-    self.played = true
-    process
+  def collect_busted_hand
+    self.payed = true
+    self.status = LOST
+    blackjack.money -= bet
+  end
+
+  def no_more_actions?
+    played || stood || blackjack? || busted? || value(SOFT) == 21 || value(HARD) == 21
   end
 
   def process
@@ -119,66 +90,38 @@ class PlayerHand < Hand
     end
   end
 
-  def draw(index)
-    out = String.new(' ')
-    cards.each do |card|
-      out << "#{card} "
-    end
-
-    out << ' ⇒  ' << value(SOFT).to_s << '  '
-
-    if status == LOST
-      out << '-'
-    elsif status == WON
-      out << '+'
-    end
-
-    out << '$' << Blackjack.format_money(bet / 100.0)
-    out << ' ⇐' if !played && index == blackjack.current_hand
-    out << '  '
-
-    if status == LOST
-      out << (busted? ? 'Busted!' : 'Lose!')
-    elsif status == WON
-      out << (blackjack? ? 'Blackjack!' : 'Won!')
-    elsif status == PUSH
-      out << 'Push'
-    end
-
-    out << "\n\n"
-    out
-  end
-
   def action?
-    out = String.new(' ')
-    out << '(H) Hit  ' if can_hit?
-    out << '(S) Stand  ' if can_stand?
-    out << '(P) Split  ' if can_split?
-    out << '(D) Double  ' if can_dbl?
-    puts out
-
+    draw_actions
     loop do
-      br = false
-      case Blackjack.getc
+      c = Blackjack.getc
+      case c
       when 'h'
-        br = true
         hit
       when 's'
-        br = true
         stand
       when 'p'
-        br = true
         blackjack.split_current_hand
       when 'd'
-        br = true
         dbl
       else
-        blackjack.clear
-        blackjack.draw_hands
-        action?
+        clear_draw_hands_action
       end
-
-      break if br
+      break if %w[h s p d].include?(c)
     end
   end
+
+  def clear_draw_hands_action
+    blackjack.clear
+    blackjack.draw_hands
+    action?
+  end
+
+  def draw_actions
+    out = String.new(' ')
+    out << '(H) Hit  ' if can_hit?
+    out << '(S) Stand  ' if can_stand?
+    out << '(P) Split  ' if can_split?
+    out << '(D) Double  ' if can_dbl?
+    puts out
+  end
 end

data/lib/blackjack/player_hand_actions.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module PlayerHandActions
+  def can_split?
+    return false if stood || blackjack.player_hands.size >= PlayerHand::MAX_PLAYER_HANDS
+
+    return false if blackjack.money < blackjack.all_bets + bet
+
+    cards.size == 2 && cards.first.value == cards.last.value
+  end
+
+  def can_dbl?
+    return false if blackjack.money < blackjack.all_bets + bet
+
+    !(stood || cards.size != 2 || blackjack?)
+  end
+
+  def can_stand?
+    !(stood || busted? || blackjack?)
+  end
+
+  def can_hit?
+    !(played || stood || value(HARD) == 21 || blackjack? || busted?)
+  end
+
+  def hit
+    deal_card
+
+    if done?
+      process
+    else
+      blackjack.draw_hands
+      blackjack.current_player_hand.action?
+    end
+  end
+
+  def dbl
+    deal_card
+
+    self.played = true
+    self.bet *= 2
+    process if done?
+  end
+
+  def stand
+    self.stood = true
+    self.played = true
+    process
+  end
+end

data/lib/blackjack/player_hand_draw.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module PlayerHandDraw
+  def draw(index)
+    out = String.new(' ')
+    out << draw_cards
+    out << draw_money(index)
+    out << draw_status
+    out << "\n\n"
+    out
+  end
+
+  def draw_status
+    case status
+    when LOST
+      draw_lost_str
+    when WON
+      draw_won_str
+    when PUSH
+      'Push'
+    else
+      ''
+    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
+    out << '+' if status == WON
+    out << '$' << Format.money(bet / 100.0)
+    out << ' ⇐' if !played && index == blackjack.current_hand
+    out << '  '
+    out
+  end
+
+  def draw_cards
+    out = String.new('')
+    out << cards.map { |card| "#{card} " }.join
+    out << ' ⇒  ' << value(SOFT).to_s << '  '
+    out
+  end
+end

data/lib/blackjack/shoe.rb

@@ -2,6 +2,15 @@
 
 require_relative 'card'
 
+SHOES = {
+  1 => :regular,
+  2 => :aces,
+  3 => :jacks,
+  4 => :aces_jacks,
+  5 => :sevens,
+  6 => :eights
+}.freeze
+
 class Shoe
   attr_accessor :num_decks, :cards
 

data/lib/blackjack/split_hand.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module SplitHand
+  def split_current_hand
+    if current_player_hand.can_split?
+      expand_split_hands
+      this_hand = split_hand
+
+      if this_hand.done?
+        this_hand.process
+      else
+        draw_hands_current_hand_action
+      end
+    else
+      draw_hands_current_hand_action
+    end
+  end
+
+  def split_hand
+    this_hand = player_hands[current_hand]
+    split_hand = player_hands[current_hand + 1]
+
+    split_hand.cards = []
+    split_hand.cards << this_hand.cards.last
+    this_hand.cards.pop
+
+    this_hand.cards << shoe.next_card
+    this_hand
+  end
+
+  def expand_split_hands
+    player_hands << PlayerHand.new(self, current_bet)
+
+    x = player_hands.size - 1
+    while x > current_hand
+      player_hands[x] = player_hands[x - 1].clone
+      x -= 1
+    end
+  end
+end

data/lib/blackjack/utils.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+module Utils
+  def save_game
+    File.open(SAVE_FILE, 'w') do |file|
+      file.puts "#{num_decks}|#{money}|#{current_bet}"
+    end
+  end
+
+  def load_game
+    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
+  end
+
+  def clear_draw_hands
+    clear
+    draw_hands
+  end
+
+  def clear_draw_hands_new_num_decks
+    clear_draw_hands
+    new_num_decks
+  end
+
+  def clear_draw_hands_new_deck_type
+    clear_draw_hands
+    new_deck_type
+  end
+
+  def clear_draw_hands_ask_insurance
+    clear_draw_hands
+    ask_insurance
+  end
+
+  def clear_draw_hands_bet_options
+    clear_draw_hands
+    draw_bet_options
+  end
+
+  def clear_draw_hands_game_options
+    clear_draw_hands
+    draw_game_options
+  end
+
+  def draw_hands_current_hand_action
+    draw_hands
+    current_player_hand.action?
+  end
+
+  def play_dealer_hand
+    dealer_hand.play
+    draw_hands
+    draw_bet_options
+  end
+end

data/spec/lib/blackjack/format_spec.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+RSpec.describe Format do
+  describe '#money' do
+    it 'returns a formatted money string' do
+      str = described_class.money(1)
+      expect(str).to eq('1.00')
+    end
+  end
+end

data/spec/lib/blackjack/hand_spec.rb

@@ -17,9 +17,9 @@ RSpec.describe Hand do
 
   describe '#deal_card' do
     it 'adds a card to the hand' do
-      expect {
+      expect do
         hand.deal_card
-      }.to change { hand.cards.size }.by(1)
+      end.to change { hand.cards.size }.by(1)
     end
   end
 

data/spec/lib/blackjack/player_hand_spec.rb

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 RSpec.describe PlayerHand do
@@ -35,6 +34,35 @@ RSpec.describe PlayerHand do
     end
   end
 
+  describe '#draw' do
+    it 'draws the hand' do
+      player_hand.cards << ace << ten
+      expected = " 🂡 🂪  ⇒  21  $5.00  \n\n"
+      expect(player_hand.draw(1)).to eq(expected)
+    end
+
+    it 'draws a lost hand' do
+      player_hand.cards << ace << ace
+      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
+      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
+      expected = " 🂡 🂡  ⇒  12  $5.00  Push\n\n"
+      expect(player_hand.draw(1)).to eq(expected)
+    end
+  end
+
   describe '#busted?' do
     it 'returns false' do
       expect(player_hand).to_not be_busted
@@ -273,35 +301,6 @@ RSpec.describe PlayerHand do
     end
   end
 
-  describe '#draw' do
-    it 'draws the hand' do
-      player_hand.cards << ace << ten
-      expected = " 🂡 🂪  ⇒  21  $5.00  \n\n"
-      expect(player_hand.draw(1)).to eq(expected)
-    end
-
-    it 'draws a lost hand' do
-      player_hand.cards << ace << ace
-      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
-      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
-      expected = " 🂡 🂡  ⇒  12  $5.00  Push\n\n"
-      expect(player_hand.draw(1)).to eq(expected)
-    end
-  end
-
   describe '#process' do
     context 'with more hands to play' do
       before do

data/spec/lib/blackjack_spec.rb

@@ -36,13 +36,6 @@ RSpec.describe Blackjack do
     end
   end
 
-  describe '#format_money' do
-    it 'returns a formatted string' do
-      str = described_class.format_money(1)
-      expect(str).to eq('1.00')
-    end
-  end
-
   describe '.all_bets?' do
     it 'returns 10' do
       blackjack.player_hands << player_hand << player_hand

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: console-blackjack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Greg Donald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2019-11-10 00:00:00.000000000 Z
 dependencies: []
 description: Blackjack for your console, full version.
 email: gdonald@gmail.com
@@ -25,13 +25,20 @@ files:
 - bin/console-blackjack
 - bj.png
 - bj.txt
+- console-blackjack-1.0.0.gem
 - console-blackjack.gemspec
 - lib/blackjack.rb
 - lib/blackjack/card.rb
 - lib/blackjack/dealer_hand.rb
+- lib/blackjack/format.rb
 - lib/blackjack/hand.rb
+- lib/blackjack/menus.rb
 - lib/blackjack/player_hand.rb
+- lib/blackjack/player_hand_actions.rb
+- lib/blackjack/player_hand_draw.rb
 - lib/blackjack/shoe.rb
+- lib/blackjack/split_hand.rb
+- lib/blackjack/utils.rb
 - spec/factories/blackjack_factory.rb
 - spec/factories/card_factory.rb
 - spec/factories/dealer_hand_factory.rb
@@ -40,6 +47,7 @@ files:
 - 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