console-blackjack 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d6b53cff41f5f86ff9b279267559148007288ad2d6a64002308bd2c60b15519
-  data.tar.gz: 35c2c4bc1d8fe0f20fdab6a22da8f8395724b8a7c0eb8c72a0a384f8072dd0b2
+  metadata.gz: 0e53727e957fb5e163cc56ac04e0c1e79e027d58834691e6290059ac8d653ddf
+  data.tar.gz: 3cc3c0b725b9592d85d92735a3bc4ce1208170f7369ace802ea15b9b1e3ef86e
 SHA512:
-  metadata.gz: ded02e0f2f976b44fe6c24300d58c1107d6555a7fd35bcdb4908cf5dbabfa7ea9c0c5fe6d3d47da7ee34be4728df00baf744b4a13f3de4c7af70687e18b07b8e
-  data.tar.gz: 24294265189ea7d8cc29973c2a3a285b38d5ac41fae3d6b8fb88f331599381828d640c6cb92b1be629bd31281f8ba0d8d8298c12c85193e0f82028ffaf177e99
+  metadata.gz: 109ceb08d745fc3c6848c8872e7e7e6d4f354dfbb21361d1daedd5211c308cbe3673acdbc54e212540d57560ee986ddc92c07a001d8712b81e771bebcc391957
+  data.tar.gz: 89d6b9c4d3fbb0dcc557868125f5591cc7cd551fb33ce9de568255223273e4f33784b12f33ba99c792398ab150504167a1352df854f77606dca00e27db145159

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.1)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     ast (2.4.0)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
@@ -20,75 +20,78 @@ GEM
     docile (1.3.2)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    factory_bot (5.1.1)
+    factory_bot (5.2.0)
       activesupport (>= 4.2.0)
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.7.0)
+    i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    json (2.2.0)
-    method_source (0.9.2)
-    mime-types (3.3)
+    method_source (1.0.0)
+    mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    minitest (5.13.0)
+    mime-types-data (3.2020.0512)
+    minitest (5.14.1)
     multi_json (1.14.1)
     netrc (0.11.0)
-    parallel (1.18.0)
-    parser (2.6.5.0)
+    parallel (1.19.1)
+    parser (2.7.1.3)
       ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
-    rake (13.0.0)
+    rake (13.0.1)
     rest-client (2.1.0)
       http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.76.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.84.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
+      rubocop-ast (>= 0.0.3)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.36.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.0.3)
+      parser (>= 2.7.0.1)
+    rubocop-rspec (1.39.0)
       rubocop (>= 0.68.1)
     ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
+    simplecov (0.18.5)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tins (1.22.0)
-    tzinfo (1.2.5)
+    tins (1.25.0)
+      sync
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
-    zeitwerk (2.2.1)
+    unf_ext (0.0.7.7)
+    unicode-display_width (1.7.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -105,4 +108,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -1,28 +1,23 @@
-# 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)
+[![Downloads](https://ruby-gem-downloads-badge.herokuapp.com/console-blackjack?color=blue&type=total&total_label=)](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|10000|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.5'
+  spec.date = '2020-05-26'
   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