console-blackjack 1.0.9 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a3369825b0d070363a8da6637b068793e21b2faef84732507dad91edcefeb4a
-  data.tar.gz: e8c8ab2105f823bb1971bce15d1a6d3cf4943441e45307152cc8444ca0b5dbc2
+  metadata.gz: 1200cfab5226e842230a10d390124668b36ca0b889099cad6cf293d01311dbd6
+  data.tar.gz: ae0e5612e1bfc3c29cb22b07aaad391d12a7b477e86b2cdc4996b58480a12e4d
 SHA512:
-  metadata.gz: 057dd5b492a59aeb487ba9e3d2969654f5ca99c5474f3ca204494b197ccc73a8394ca12b74fe94105995557407cf58f1416ac51074319feff3849a7d77e2a34a
-  data.tar.gz: 58bee05314cb656e6fb5135aaa7c460797d9a309ab01843570b4c424e7848a81cb28f7a57eaeb76b2a8f4475f45eb08dcac56da75202cebe136de0c6c9057efc
+  metadata.gz: 28668e7ba8c3c412a6ab2ae0e5bc426157cba6beb3a29d76062ac2f311c2f952d642b3f86d84274a2b42cc967315ce4f3352c6de56638294ba534ef4dc60997f
+  data.tar.gz: 44224e3eaed8a420d86912093f4f9d9398c853f24a5fe464f8101eeee5b208345c1bb6f0c76c9a1c76c465a119885608330f402b141083809ed835ea1bd224dd

data/Gemfile

@@ -1,14 +1,12 @@
 # frozen_string_literal: true
 
-ruby '2.7.5'
+ruby '3.1.2'
 
 source 'https://rubygems.org'
 
-gem 'coveralls', require: false
 gem 'factory_bot'
 gem 'pry'
 gem 'rake'
-gem 'rest-client', '>= 1.8.0'
 gem 'rspec'
 gem 'rubocop', require: false
 gem 'rubocop-rake'

data/Gemfile.lock

@@ -1,110 +1,83 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.1)
+    activesupport (7.0.4.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     ast (2.4.2)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    concurrent-ruby (1.2.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    domain_name (0.5.20190701)
-      unf (>= 0.0.5, < 1.0.0)
-    factory_bot (6.2.0)
+    factory_bot (6.2.1)
       activesupport (>= 5.0.0)
-    http-accept (1.7.0)
-    http-cookie (1.0.4)
-      domain_name (~> 0.5)
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
+    json (2.6.3)
     method_source (1.0.0)
-    mime-types (3.4.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2022.0105)
-    minitest (5.15.0)
-    multi_json (1.15.0)
-    netrc (0.11.0)
-    parallel (1.21.0)
-    parser (3.1.0.0)
+    minitest (5.17.0)
+    parallel (1.22.1)
+    parser (3.2.0.0)
       ast (~> 2.4.1)
-    pry (0.14.1)
+    pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.2.0)
-    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)
+    regexp_parser (2.6.2)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.2)
+    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-support (~> 3.12.0)
+    rspec-expectations (3.12.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.3)
-    rubocop (1.24.1)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.44.1)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.2.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.24.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.1)
-      parser (>= 3.0.1.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.24.1)
+      parser (>= 3.1.1.0)
+    rubocop-capybara (2.17.0)
+      rubocop (~> 1.41)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.7.0)
-      rubocop (~> 1.19)
+    rubocop-rspec (2.18.1)
+      rubocop (~> 1.33)
+      rubocop-capybara (~> 2.17)
     ruby-progressbar (1.11.0)
-    simplecov (0.21.2)
+    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.3)
-    sync (0.5.0)
-    term-ansicolor (1.7.1)
-      tins (~> 1.0)
-    thor (1.2.1)
-    tins (1.31.0)
-      sync
-    tzinfo (2.0.4)
+    simplecov_json_formatter (0.1.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.8)
-    unicode-display_width (2.1.0)
+    unicode-display_width (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  coveralls
   factory_bot
   pry
   rake
-  rest-client (>= 1.8.0)
   rspec
   rubocop
   rubocop-rake
@@ -112,7 +85,7 @@ DEPENDENCIES
   simplecov
 
 RUBY VERSION
-   ruby 2.7.5p203
+   ruby 3.1.2p20
 
 BUNDLED WITH
-   2.1.4
+   2.3.15

data/README.md

@@ -1,6 +1,8 @@
 # console-blackjack-ruby
 
-![Blackjack](https://raw.githubusercontent.com/gdonald/console-blackjack-ruby/master/bj.png)
+![Blackjack](https://raw.githubusercontent.com/gdonald/console-blackjack-ruby/master/ss2.png)
+
+![Blackjack](https://raw.githubusercontent.com/gdonald/console-blackjack-ruby/master/ss1.png)
 
 ## Getting Started
 
@@ -15,9 +17,24 @@ Run:
 ## Status
 
 [![Ruby](https://github.com/gdonald/console-blackjack-ruby/workflows/Ruby/badge.svg)](https://github.com/gdonald/console-blackjack-ruby/actions)
-[![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
 
 [![GitHub](https://img.shields.io/github/license/gdonald/console-blackjack-ruby?color=aa0000)](https://github.com/gdonald/console-blackjack-ruby/blob/master/LICENSE)
+
+## Alternative Implementations:
+
+I've written Blackjack in several other languages:
+
+- [Rust](https://github.com/gdonald/console-blackjack-rust)
+- [Typescript](https://github.com/gdonald/blackjack-js)
+- [Raku](https://github.com/gdonald/Console-Blackjack)
+- [Perl](https://github.com/gdonald/console-blackjack-perl)
+- [C](https://github.com/gdonald/blackjack-c)
+- [C++](https://github.com/gdonald/blackjack-cpp)
+- [Crystal](https://github.com/gdonald/blackjack-cr)
+- [Go](https://github.com/gdonald/blackjack-go)
+- [Elixir](https://github.com/gdonald/blackjack-ex)
+- [Python](https://github.com/gdonald/blackjack-py)
+- [C with SDL](https://github.com/gdonald/blackjack-c-sdl)

data/bj.txt

@@ -1 +1 @@
-1|11000|500
+1|1|1|11000|500

data/console-blackjack.gemspec

@@ -3,9 +3,9 @@
 require 'rake'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '>= 2.7.5'
+  spec.required_ruby_version = '>= 3.1'
   spec.name = 'console-blackjack'
-  spec.version = '1.0.9'
+  spec.version = '1.1.1'
   spec.summary = 'Console Blackjack'
   spec.description = 'Blackjack for your console, full version.'
   spec.author = 'Greg Donald'
@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
                         'spec/**/*.rb'].to_a
   spec.homepage = 'https://github.com/gdonald/console-blackjack-ruby'
   spec.metadata = {
-    'source_code_uri' => 'https://github.com/gdonald/console-blackjack-ruby'
+    'source_code_uri' => 'https://github.com/gdonald/console-blackjack-ruby',
+    'rubygems_mfa_required' => 'true'
   }
   spec.license = 'MIT'
   spec.post_install_message = "\nType `console-blackjack` to run!\n\n"

data/lib/blackjack/card.rb

@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
 class Card
-  attr_reader :value, :suit
+  attr_reader :blackjack, :value, :suit
 
-  def initialize(value, suit)
+  def initialize(blackjack, value, suit)
+    @blackjack = blackjack
     @value = value
     @suit = suit
   end
 
   def to_s
-    Card.faces[value][suit]
+    return Card.faces[value][suit] if blackjack.face_type == 1
+
+    Card.faces2[value][suit]
   end
 
   def ace?
@@ -21,9 +24,11 @@ class Card
   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
+    value = card.value.succ
+    value = 10 if value > 9
+    return 11 if value == 1 && count_method == :soft && total < 11
+
+    value
   end
 
   def self.faces
@@ -32,4 +37,14 @@ class Card
      %w[🂩 🂹 🃉 🃙], %w[🂪 🂺 🃊 🃚], %w[🂫 🂻 🃋 🃛], %w[🂭 🂽 🃍 🃝],
      %w[🂮 🂾 🃎 🃞], %w[🂠]]
   end
+
+  def self.faces2
+    [%w[A♠ A♥ A♣ A♦], %w[2♠ 2♥ 2♣ 2♦],
+     %w[3♠ 3♥ 3♣ 3♦], %w[4♠ 4♥ 4♣ 4♦],
+     %w[5♠ 5♥ 5♣ 5♦], %w[6♠ 6♥ 6♣ 6♦],
+     %w[7♠ 7♥ 7♣ 7♦], %w[8♠ 8♥ 8♣ 8♦],
+     %w[9♠ 9♥ 9♣ 9♦], %w[T♠ T♥ T♣ T♦],
+     %w[J♠ J♥ J♣ J♦], %w[Q♠ Q♥ Q♣ Q♦],
+     %w[K♠ K♥ K♣ K♦], %w[??]]
+  end
 end

data/lib/blackjack/dealer_hand.rb

@@ -3,33 +3,23 @@
 require_relative 'hand'
 
 class DealerHand < Hand
-  attr_accessor :blackjack, :hide_down_card
+  attr_accessor :blackjack, :hide_first_card
 
   def initialize(blackjack)
     super(blackjack)
-    @hide_down_card = true
+    @hide_first_card = true
   end
 
   def value(count_method)
-    total = total_card_value(count_method)
+    total = value_for_method(count_method)
 
-    if count_method == SOFT && total > 21
-      value(HARD)
+    if count_method == :soft && total > 21
+      value(:hard)
     else
       total
     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
@@ -37,10 +27,10 @@ class DealerHand < Hand
   def draw
     out = String.new(' ')
     cards.each_with_index do |card, index|
-      out << (index == 1 && hide_down_card ? Card.faces[13][0] : card).to_s
+      out << (index.zero? && hide_first_card ? Card.new(blackjack, 13, 0) : card).to_s
       out << ' '
     end
-    out << ' ⇒  ' << value(SOFT).to_s
+    out << ' ⇒  ' << value(:soft).to_s
   end
 
   def deal_required_cards
@@ -52,14 +42,26 @@ class DealerHand < Hand
   end
 
   def both_values
-    [value(SOFT), value(HARD)]
+    [value(:soft), value(:hard)]
   end
 
   def play
     playing = blackjack.need_to_play_dealer_hand?
-    self.hide_down_card = false if blackjack? || playing
+    self.hide_first_card = false if blackjack? || playing
     deal_required_cards if playing
     self.played = true
     blackjack.pay_hands
   end
+
+  private
+
+  def value_for_method(count_method)
+    total = 0
+    cards.each_with_index do |card, index|
+      next if index.zero? && hide_first_card
+
+      total += Card.value(card, count_method, total)
+    end
+    total
+  end
 end

data/lib/blackjack/hand.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-UNKNOWN = 0
-WON = 1
-LOST = 2
-PUSH = 3
-
-SOFT = 4
-HARD = 5
-
 class Hand
   attr_accessor :cards, :blackjack, :played
 
@@ -18,7 +10,7 @@ class Hand
   end
 
   def busted?
-    value(SOFT) > 21
+    value(:soft) > 21
   end
 
   def deal_card
@@ -28,6 +20,6 @@ class Hand
   def blackjack?
     return false if cards.size != 2
 
-    cards.first.ace? && cards.last.ten? || cards.first.ten? && cards.last.ace?
+    (cards.first.ace? && cards.last.ten?) || (cards.first.ten? && cards.last.ace?)
   end
 end

data/lib/blackjack/menus.rb

@@ -2,31 +2,36 @@
 
 module Menus
   def draw_game_options
-    puts ' (N) Number of Decks  (T) Deck Type  (B) Back'
+    puts ' (N) Number of Decks  (T) Deck Type  (F) Face Type  (B) Back'
     loop do
-      c = Blackjack.getc
+      c = Blackjack.getc($stdin)
       case c
       when 'n'
         clear_draw_hands_new_num_decks
       when 't'
         clear_draw_hands_new_deck_type
         clear_draw_hands_bet_options
+      when 'f'
+        clear_draw_hands_new_face_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)
+      break if %w[n t b f].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
+      c = Blackjack.getc($stdin).to_i
       case c
       when (1..6)
+        self.deck_type = c
         shoe.send("new_#{SHOES[c]}")
+        save_game
       else
         clear_draw_hands_new_deck_type
       end
@@ -34,10 +39,25 @@ module Menus
     end
   end
 
+  def new_face_type
+    puts ' (1) 🂡  (2) A♠'
+    loop do
+      c = Blackjack.getc($stdin).to_i
+      case c
+      when (1..2)
+        self.face_type = c
+        save_game
+      else
+        clear_draw_hands_new_face_type
+      end
+      break if (1..2).include?(c)
+    end
+  end
+
   def ask_insurance
     puts ' Insurance?  (Y) Yes  (N) No'
     loop do
-      c = Blackjack.getc
+      c = Blackjack.getc($stdin)
       case c
       when 'y'
         insure_hand
@@ -52,12 +72,12 @@ module Menus
 
   def draw_bet_options
     puts ' (D) Deal Hand  (B) Change Bet  (O) Options  (Q) Quit'
-    c = Blackjack.getc
+    c = Blackjack.getc($stdin)
     case c
     when 'd'
       deal_new_hand
     when 'b'
-      new_bet
+      new_bet($stdin)
     when 'o'
       clear_draw_hands_game_options
     when 'q'

data/lib/blackjack/player_hand.rb

@@ -15,7 +15,7 @@ class PlayerHand < Hand
   def initialize(blackjack, bet)
     super(blackjack)
     @bet = bet
-    @status = UNKNOWN
+    @status = :unknown
     @payed = false
     @stood = false
   end
@@ -24,14 +24,14 @@ class PlayerHand < Hand
     return if payed
 
     self.payed = true
-    player_hand_value = value(SOFT)
+    player_hand_value = value(:soft)
 
     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
+      self.status = :push
     end
   end
 
@@ -45,20 +45,20 @@ class PlayerHand < Hand
 
   def collect_lost_hand
     blackjack.money -= bet
-    self.status = LOST
+    self.status = :lost
   end
 
   def pay_won_hand
     self.bet *= 1.5 if blackjack?
     blackjack.money += bet
-    self.status = WON
+    self.status = :won
   end
 
   def value(count_method)
     total = cards.inject(0) { |sum, card| sum + Card.value(card, count_method, sum) }
 
-    if count_method == SOFT && total > 21
-      value(HARD)
+    if count_method == :soft && total > 21
+      value(:hard)
     else
       total
     end
@@ -74,12 +74,12 @@ class PlayerHand < Hand
 
   def collect_busted_hand
     self.payed = true
-    self.status = LOST
+    self.status = :lost
     blackjack.money -= bet
   end
 
   def no_more_actions?
-    played || stood || blackjack? || busted? || value(SOFT) == 21 || value(HARD) == 21
+    played || stood || blackjack? || busted? || value(:soft) == 21 || value(:hard) == 21
   end
 
   def process
@@ -92,7 +92,7 @@ class PlayerHand < Hand
 
   def action?
     draw_actions
-    c = Blackjack.getc
+    c = Blackjack.getc($stdin)
     case c
     when 'h'
       hit

data/lib/blackjack/player_hand_actions.rb

@@ -20,7 +20,7 @@ module PlayerHandActions
   end
 
   def can_hit?
-    !(played || stood || value(HARD) == 21 || blackjack? || busted?)
+    !(played || stood || value(:hard) == 21 || blackjack? || busted?)
   end
 
   def hit

data/lib/blackjack/player_hand_draw.rb

@@ -12,11 +12,11 @@ module PlayerHandDraw
 
   def draw_status
     case status
-    when LOST
+    when :lost
       draw_lost_str
-    when WON
+    when :won
       draw_won_str
-    when PUSH
+    when :push
       'Push'
     else
       ''
@@ -33,8 +33,8 @@ module PlayerHandDraw
 
   def draw_money(index)
     out = String.new('')
-    out << '-' if status == LOST
-    out << '+' if status == WON
+    out << '-' if status == :lost
+    out << '+' if status == :won
     out << '$' << Format.money(bet / 100.0)
     out << ' ⇐' if !played && index == blackjack.current_hand
     out << '  '
@@ -44,7 +44,7 @@ module PlayerHandDraw
   def draw_cards
     out = String.new('')
     out << cards.map { |card| "#{card} " }.join
-    out << ' ⇒  ' << value(SOFT).to_s << '  '
+    out << ' ⇒  ' << value(:soft).to_s << '  '
     out
   end
 end