ruby-blackjack 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d16528be38ca78eb6050a44af7e159e5a574c4
-  data.tar.gz: f254e901dea54dfddc1beafbb05ea1ca523929d0
+  metadata.gz: 9279031775dc13d7be33caeeb7a70f33160fb8f7
+  data.tar.gz: 9685e0dd224ef292144310559abd7b424e67cb19
 SHA512:
-  metadata.gz: e7d51acc43014b5dcd0f978626d069f7dd04fcb93178cd4a9ff2bbaf1606027b0ac5d124c28fe722eeeb114d10a6dae12b06ca787bedae2ec156555eb65974fd
-  data.tar.gz: 54dd61e40f0c3d2d49d1743ee46ef78c67af38f6e849cbf1f0bc7b189549c96418f7db5b67c04b5b5d40a403a88b1444145119c674ac86735a66aab0d1e0539d
+  metadata.gz: 80712c4b61ab0c7bed72c36bfe6ff3b37f49489b9c40e772e7d405c99eea80899d5fdc27c89a988e6a0a5ac695ce1c93c6f02dfc9d112f25ce302790d7627d06
+  data.tar.gz: a3013fdf6da05ba6394d76d708bfce721d790aebfbea70959ba5e84cf841190c6d2dfe2d46589a9f20e694b915002a4b82847d15215ff1a92ed2267cb506b929

data/README.md

@@ -2,7 +2,7 @@
 
 |master|develop|
 |:----:|:-----:|
-|[![build status](https://gitlab.namibsun.net/namboy94/blackjack/badges/master/build.svg)](https://gitlab.namibsun.net/namboy94/blackjack/commits/master)|[![build status](https://gitlab.namibsun.net/namboy94/blackjack/badges/develop/build.svg)](https://gitlab.namibsun.net/namboy94/blackjack/commits/develop)|
+|[![build status](https://gitlab.namibsun.net/namibsun/ruby/blackjack/badges/master/build.svg)](https://gitlab.namibsun.net/namibsun/ruby/blackjack/commits/master)|[![build status](https://gitlab.namibsun.net/namibsun/ruby/blackjack/badges/develop/build.svg)](https://gitlab.namibsun.net/namibsun/ruby/blackjack/commits/develop)|
 
 ![Logo](resources/logo/logo-readme.png)
 
@@ -16,10 +16,9 @@ Then start the program using the command `blackjack`
 
 ## Further Information
 
-* [Changelog](https://gitlab.namibsun.net/namboy94/etosha-safari/raw/master/CHANGELOG)
-* [License (GPLv3)](https://gitlab.namibsun.net/namboy94/etosha-safari/raw/master/LICENSE)
-* [Gitlab](https://gitlab.namibsun.net/namboy94/etosha-safari)
-* [Github](https://github.com/namboy94/etosha-safari)
-* [Git Statistics (gitstats)](https://gitstats.namibsun.net/gitstats/etosha-safari/index.html)
-* [Git Statistics (git_stats)](https://gitstats.namibsun.net/git_stats/etosha-safari/index.html)
-* [Rubygems site](https://rubygems.org/gems/ruby-blackjack)
+* [Changelog](CHANGELOG)
+* [License (GPLv3)](LICENSE)
+* [Gitlab](https://gitlab.namibsun.net/namibsun/ruby/blackjack)
+* [Github](https://github.com/namboy94/blackjack)
+* [Progstats](https://progstats.namibsun.net/projects/blackjack)
+* [Rubygems](https://rubygems.org/gems/ruby-blackjack)

data/bin/blackjack

@@ -1,22 +1,22 @@
 #!/usr/bin/env ruby
-# Copyright 2016-2017 Hermann Krumrey <hermann@krumreyh.com>
+# Copyright 2016 Hermann Krumrey <hermann@krumreyh.com>
 #
-# This file is part of blackjack.
+# This file is part of ruby-blackjack.
 #
-# blackjack is free software: you can redistribute it and/or modify
+# ruby-blackjack is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# blackjack is distributed in the hope that it will be useful,
+# ruby-blackjack is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with blackjack.  If not, see <http://www.gnu.org/licenses/>.
+# along with ruby-blackjack. If not, see <http://www.gnu.org/licenses/>.
 
 require_relative('../src/blackjack_cli')
 
 cli = BlackjackCli.new
-cli.game_loop
+cli.game_loop

data/src/blackjack_cli.rb

@@ -1,128 +1,130 @@
-# Copyright 2016-2017 Hermann Krumrey <hermann@krumreyh.com>
+# Copyright 2016 Hermann Krumrey <hermann@krumreyh.com>
 #
-# This file is part of blackjack.
+# This file is part of ruby-blackjack.
 #
-# blackjack is free software: you can redistribute it and/or modify
+# ruby-blackjack is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# blackjack is distributed in the hope that it will be useful,
+# ruby-blackjack is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with blackjack.  If not, see <http://www.gnu.org/licenses/>.
+# along with ruby-blackjack. If not, see <http://www.gnu.org/licenses/>.
 
 require_relative('game.rb')
 require_relative('strings/string.rb')
 
 # Class that offers an interactive interface for the user to play blackjack
 class BlackjackCli
-
-    # Constructor for the BlackJackCli class
-    # @return [nil]
-    def initialize
-        @default_text_color = [LIGHT_GRAY_BG, BLACK_FG]
-        puts " Blackjack CLI started \n\n".set_attributes(@default_text_color)
-        @blackjack = Game.new
+  # Constructor for the BlackJackCli class
+  # @return [nil]
+  def initialize
+    @default_text_color = [LIGHT_GRAY_BG, BLACK_FG]
+    puts " Blackjack CLI started \n\n".set_attributes(@default_text_color)
+    @blackjack = Game.new
+  end
+
+  # the main game loop.
+  # It continually asks the user for a new choice of either hit or stand
+  # @return [nil]
+  def game_loop
+    new_game = true
+
+    while true
+      if new_game
+      print_result(@blackjack.start)
+      new_game = false
     end
 
-    # the main game loop. It continually asks the user for a new choice of either hit or stand
-    # @return [nil]
-    def game_loop
-        new_game = true
-
-        while true
-            if new_game
-            print_result(@blackjack.start)
-            new_game = false
-        end
-
-        result = nil
-        case get_play_command
-            when "stand\n"
-                result = @blackjack.stand
-            when "hit\n"
-                result = @blackjack.hit
-            else
-                puts 'Something went wrong'
-        end
-
-        print_result(result)
-
-        if result[2] == 'win'
-            puts ' You won :D '.set_attributes([GREEN_BG, BLACK_FG])
-        elsif result[2] == 'loss'
-            puts ' You lost :( '.set_attributes([RED_BG, BLACK_FG])
-        elsif result[2] == 'draw'
-            puts " It's a draw ".set_attributes([YELLOW_BG, BLACK_FG])
-        end
-
-        if result[2] != 'undecided'
-            new_game = true
-            pause_when_game_ends
-        end
-
-        end
+    result = nil
+    case get_play_command
+      when "stand\n"
+        result = @blackjack.stand
+      when "hit\n"
+        result = @blackjack.hit
+      else
+        puts 'Something went wrong'
     end
 
-    # This pauses the game until the user presses enter/return before starting a new game
-    # @return [nil]
-    def pause_when_game_ends
-        puts ' Press enter to start a new game '.set_attributes(@default_text_color)
-        gets
-    end
+    print_result(result)
 
-    # Prints the current game state based on the results of a hit or stand action
-    # @param [Card Array, Card Array] result the result to be displayed
-    # @return [nil]
-    def print_result(result)
-        puts " Player Cards: (#{Game.calculate_optimal_card_score(result[0])}) \n"
-                 .set_attributes(@default_text_color)
-        puts format_cards(result[0])
-        puts "\n Dealer Cards: (#{Game.calculate_optimal_card_score(result[1])}) \n"
-                 .set_attributes(@default_text_color)
-        puts format_cards(result[1])
-        puts "\n"
+    if result[2] == 'win'
+      puts ' You won :D '.set_attributes([GREEN_BG, BLACK_FG])
+    elsif result[2] == 'loss'
+      puts ' You lost :( '.set_attributes([RED_BG, BLACK_FG])
+    elsif result[2] == 'draw'
+      puts " It's a draw ".set_attributes([YELLOW_BG, BLACK_FG])
     end
 
-    # Formats cards to be displayed side-by-side
-    # @param [Card Array] cards the cards to be displayed
-    # @return [string] a formatted string of all cards side by side
-    def format_cards(cards)
-        cards_string = ''
-
-        card_parts = []
-        cards.each { |card|
-            card_parts.push(card.get_ascii_card.split("\n"))
-        }
-
-        if card_parts.length == 0
-            return ''
-        end
-
-        (0...card_parts[0].length).each { |i|
-            card_parts.each { |card_part|
-                cards_string += card_part[i] + '   '
-            }
-            cards_string += "\n"
-        }
-        cards_string
+    if result[2] != 'undecided'
+      new_game = true
+      pause_when_game_ends
     end
 
-    # Gets the user's input on what to do next
-    # @return [string] the (validated) user input
-    def get_play_command
-    puts ' What would you like to do? (hit|stand) '.set_attributes(@default_text_color)
-    input = gets
-    while not input == "hit\n" and not input == "stand\n"
-        puts " Please enter 'hit' or 'stand' ".set_attributes(@default_text_color)
-        input = gets
     end
+  end
+
+  # This pauses the game until the user presses enter/return
+  # before starting a new game
+  # @return [nil]
+  def pause_when_game_ends
+    puts ' Press enter to start a new game '
+             .set_attributes(@default_text_color)
+    gets
+  end
+
+  # Prints the current game state based on the results of a hit or stand action
+  # @param [Card Array, Card Array] result the result to be displayed
+  # @return [nil]
+  def print_result(result)
+    puts " Player Cards: (#{Game.calculate_optimal_card_score(result[0])}) \n"
+             .set_attributes(@default_text_color)
+    puts format_cards(result[0])
+    puts "\n Dealer Cards: (#{Game.calculate_optimal_card_score(result[1])}) \n"
+             .set_attributes(@default_text_color)
+    puts format_cards(result[1])
     puts "\n"
-    input
+  end
+
+  # Formats cards to be displayed side-by-side
+  # @param [Card Array] cards the cards to be displayed
+  # @return [string] a formatted string of all cards side by side
+  def format_cards(cards)
+    cards_string = ''
+
+    card_parts = []
+    cards.each { |card|
+      card_parts.push(card.get_ascii_card.split("\n"))
+    }
+
+    if card_parts.length == 0
+      return ''
     end
 
+    (0...card_parts[0].length).each { |i|
+      card_parts.each { |card_part|
+        cards_string += card_part[i] + '   '
+      }
+      cards_string += "\n"
+    }
+    cards_string
+  end
+
+  # Gets the user's input on what to do next
+  # @return [string] the (validated) user input
+  def get_play_command
+  puts ' What would you like to do? (hit|stand) '.set_attributes(@default_text_color)
+  input = gets
+  while not input == "hit\n" and not input == "stand\n"
+    puts " Please enter 'hit' or 'stand' ".set_attributes(@default_text_color)
+    input = gets
+  end
+  puts "\n"
+  input
+  end
+
 end

data/src/game.rb

@@ -1,194 +1,194 @@
-# Copyright 2016-2017 Hermann Krumrey <hermann@krumreyh.com>
+# Copyright 2016 Hermann Krumrey <hermann@krumreyh.com>
 #
-# This file is part of blackjack.
-# 
-# blackjack is free software: you can redistribute it and/or modify
+# This file is part of ruby-blackjack.
+#
+# ruby-blackjack is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
-# 
-# blackjack is distributed in the hope that it will be useful,
+#
+# ruby-blackjack is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with blackjack.  If not, see <http://www.gnu.org/licenses/>.
+# along with ruby-blackjack. If not, see <http://www.gnu.org/licenses/>.
 
 require_relative('objects/card.rb')
 
 # Class that simulates a Blackjack game
 class Game
 
-    # Initializes the instance variables used to keep track of the game state
-    # @return [nil]
-    def initialize
-        @deck = generate_deck
-        @used_cards = []
-        @player_cards = []
-        @dealer_cards = []
-        @player_score = 0
-        @dealer_score = 0
+  # Initializes the instance variables used to keep track of the game state
+  # @return [nil]
+  def initialize
+    @deck = generate_deck
+    @used_cards = []
+    @player_cards = []
+    @dealer_cards = []
+    @player_score = 0
+    @dealer_score = 0
+  end
+
+
+  # Generates a new deck of cards
+  # The deck is shuffled directly after creation
+  # @return [Card Array] the generated deck
+  def generate_deck
+    deck = []
+    suits = %w(spades hearts diamonds clubs)
+    (2...15).each { |i|
+      suits.each { |suit|
+        deck.push(Card.new(suit, i))
+      }
+    }
+    deck.shuffle
+  end
+
+
+  # Draws a new card
+  # It automatically stocks up the deck with previously used cards if the deck runs out of cards
+  # @return [Card] the newly drawn card
+  def draw_card
+    if @deck.length == 0
+      @deck = @used_cards.shuffle
+      @used_cards = []
     end
-
-
-    # Generates a new deck of cards
-    # The deck is shuffled directly after creation
-    # @return [Card Array] the generated deck
-    def generate_deck
-        deck = []
-        suits = %w(spades hearts diamonds clubs)
-        (2...15).each { |i|
-            suits.each { |suit|
-                deck.push(Card.new(suit, i))
-            }
-        }
-        deck.shuffle
+    @deck.pop
+  end
+
+
+  # Starts a game of roulette. Each player will draw two cards, the dealer's second card will stay
+  # top down until the player stands
+  # @return [Card Array, Card Array, string] the result of the first few drawings. Refer to evaluate() for details
+  def start
+    # Let the player draw his cards
+    hit
+    hit
+
+    # Let the dealer draw his cards
+    hit(true)
+    result = hit(true)
+    @dealer_cards[1].flip_over  # Flip over the card
+
+    result
+  end
+
+
+  # Draws a new card for a player and immediately evaluates the current state of the game
+  # @param [Object] dealer flag can be set to make the dealer instead of the player draw a card
+  # @return [Card Array, Card Array, string] the result of the drawing. Refer to evaluate() for details
+  def hit(dealer = false)
+    if dealer
+      @dealer_cards.push(draw_card)
+      @dealer_score = self.class.calculate_optimal_card_score(@dealer_cards)
+    else
+      @player_cards.push(draw_card)
+      @player_score = self.class.calculate_optimal_card_score(@player_cards)
     end
-
-
-    # Draws a new card
-    # It automatically stocks up the deck with previously used cards if the deck runs out of cards
-    # @return [Card] the newly drawn card
-    def draw_card
-        if @deck.length == 0
-            @deck = @used_cards.shuffle
-            @used_cards = []
-        end
-        @deck.pop
+    evaluate
+  end
+
+
+  # Stops the user interaction. The cards of the user will no longer change, and now the dealer
+  # draws cards until he is above 16 points. Afterwards, the game state is evaluated
+  # @return [Card Array, Card Array, string] the result of the drawing. Refer to evaluate() for details
+  def stand
+    @dealer_cards[1].flip_over
+    result = [@player_cards.clone, @dealer_cards.clone, 'undecided']
+    while @dealer_score < 17 and result[2] == 'undecided'
+      result = hit(true)
     end
-
-
-    # Starts a game of roulette. Each player will draw two cards, the dealer's second card will stay
-    # top down until the player stands
-    # @return [Card Array, Card Array, string] the result of the first few drawings. Refer to evaluate() for details
-    def start
-        # Let the player draw his cards
-        hit
-        hit
-
-        # Let the dealer draw his cards
-        hit(true)
-        result = hit(true)
-        @dealer_cards[1].flip_over  # Flip over the card
-
-        result
+    if result[2] == 'undecided'
+      evaluate(true)
+    else
+      result
     end
-
-
-    # Draws a new card for a player and immediately evaluates the current state of the game
-    # @param [Object] dealer flag can be set to make the dealer instead of the player draw a card
-    # @return [Card Array, Card Array, string] the result of the drawing. Refer to evaluate() for details
-    def hit(dealer = false)
-        if dealer
-            @dealer_cards.push(draw_card)
-            @dealer_score = self.class.calculate_optimal_card_score(@dealer_cards)
-        else
-            @player_cards.push(draw_card)
-            @player_score = self.class.calculate_optimal_card_score(@player_cards)
-        end
-        evaluate
+  end
+
+
+  # Evaluates the current state of the game according to the standard blackjack rules
+  # @param [boolean] player_standing flag that is set to evaluate a game once the player has decided to stand
+  # @return [Card Array, Card Array, string] the player's cards,
+  #                                          the dealer's cards,
+  #                                          a string stating the current status of the match.
+  #                                          Possible Options:    'loss', if the user lost
+  #                                                               'win', if the user won
+  #                                                               'draw', if the game ended in a draw
+  #                                                               'undecided', if the game is not finished
+  def evaluate(player_standing = false)
+    player_cards = @player_cards
+    dealer_cards = @dealer_cards
+    state = 'undecided'
+    if @player_score > 21
+      state = 'loss'
+    elsif @dealer_score > 21
+      state = 'win'
+    elsif player_standing and @player_score > @dealer_score
+      state = 'win'
+    elsif player_standing and @player_score < @dealer_score
+      state = 'loss'
+    elsif player_standing and @player_score == @dealer_score
+      state = 'draw'
     end
 
-
-    # Stops the user interaction. The cards of the user will no longer change, and now the dealer
-    # draws cards until he is above 16 points. Afterwards, the game state is evaluated
-    # @return [Card Array, Card Array, string] the result of the drawing. Refer to evaluate() for details
-    def stand
-        @dealer_cards[1].flip_over
-        result = [@player_cards.clone, @dealer_cards.clone, 'undecided']
-        while @dealer_score < 17 and result[2] == 'undecided'
-            result = hit(true)
-        end
-        if result[2] == 'undecided'
-            evaluate(true)
-        else
-            result
-        end
+    if state != 'undecided'
+      player_cards, dealer_cards = cleanup
     end
 
-
-    # Evaluates the current state of the game according to the standard blackjack rules
-    # @param [boolean] player_standing flag that is set to evaluate a game once the player has decided to stand
-    # @return [Card Array, Card Array, string] the player's cards,
-    #                                          the dealer's cards,
-    #                                          a string stating the current status of the match.
-    #                                          Possible Options:    'loss', if the user lost
-    #                                                               'win', if the user won
-    #                                                               'draw', if the game ended in a draw
-    #                                                               'undecided', if the game is not finished
-    def evaluate(player_standing = false)
-        player_cards = @player_cards
-        dealer_cards = @dealer_cards
-        state = 'undecided'
-        if @player_score > 21
-            state = 'loss'
-        elsif @dealer_score > 21
-            state = 'win'
-        elsif player_standing and @player_score > @dealer_score
-            state = 'win'
-        elsif player_standing and @player_score < @dealer_score
-            state = 'loss'
-        elsif player_standing and @player_score == @dealer_score
-            state = 'draw'
-        end
-
-        if state != 'undecided'
-            player_cards, dealer_cards = cleanup
-        end
-
-        return player_cards, dealer_cards, state
-    end
+    return player_cards, dealer_cards, state
+  end
 
 
-    # Resets the game to enable starting a new game.
-    # @return [Card Array, Card Array] the user's cards and the dealer's cards
-    def cleanup
-        if @dealer_cards[1].is_flipped
-            @dealer_cards[1].flip_over
-        end
-        @used_cards += @player_cards + @dealer_cards
-        @player_score = 0
-        @dealer_score = 0
-        old_player_cards = @player_cards.clone
-        old_dealer_cards = @dealer_cards.clone
-        @player_cards = []
-        @dealer_cards = []
-        return old_player_cards, old_dealer_cards
+  # Resets the game to enable starting a new game.
+  # @return [Card Array, Card Array] the user's cards and the dealer's cards
+  def cleanup
+    if @dealer_cards[1].is_flipped
+      @dealer_cards[1].flip_over
     end
-
-
-    # Calculates the optimal amount of points for blackjack for an array of cards
-    # @param [Card Array] cards the cards to be checked
-    # @return [int] the optimal blackjack value of the cards
-    def self.calculate_optimal_card_score(cards)
-        score = 0
-        aces = 0
-        cards.each { |card|
-            unless card.is_flipped  # == if card is not flipped
-                score += card.get_value
-                if card.is_ace
-                    aces += 1
-                end
-            end
-        }
-        while score > 21 and aces > 0
-            aces -= 1
-            score -= 10
+    @used_cards += @player_cards + @dealer_cards
+    @player_score = 0
+    @dealer_score = 0
+    old_player_cards = @player_cards.clone
+    old_dealer_cards = @dealer_cards.clone
+    @player_cards = []
+    @dealer_cards = []
+    return old_player_cards, old_dealer_cards
+  end
+
+
+  # Calculates the optimal amount of points for blackjack for an array of cards
+  # @param [Card Array] cards the cards to be checked
+  # @return [int] the optimal blackjack value of the cards
+  def self.calculate_optimal_card_score(cards)
+    score = 0
+    aces = 0
+    cards.each { |card|
+      unless card.is_flipped  # == if card is not flipped
+        score += card.get_value
+        if card.is_ace
+          aces += 1
         end
-        score
+      end
+    }
+    while score > 21 and aces > 0
+      aces -= 1
+      score -= 10
     end
+    score
+  end
 
 
-    # @return [int] the player's current score
-    def get_player_score
-        @player_score
-    end
+  # @return [int] the player's current score
+  def get_player_score
+    @player_score
+  end
 
 
-    # @return [int] the dealer's current score
-    def get_dealer_score
-        @dealer_score
-    end
+  # @return [int] the dealer's current score
+  def get_dealer_score
+    @dealer_score
+  end
 
 end

data/src/objects/card.rb

@@ -1,19 +1,19 @@
-# Copyright 2016-2017 Hermann Krumrey <hermann@krumreyh.com>
+# Copyright 2016 Hermann Krumrey <hermann@krumreyh.com>
 #
-# This file is part of blackjack.
+# This file is part of ruby-blackjack.
 #
-# blackjack is free software: you can redistribute it and/or modify
+# ruby-blackjack is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# blackjack is distributed in the hope that it will be useful,
+# ruby-blackjack is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with blackjack.  If not, see <http://www.gnu.org/licenses/>.
+# along with ruby-blackjack. If not, see <http://www.gnu.org/licenses/>.
 
 require_relative('../strings/string.rb')
 
@@ -22,111 +22,111 @@ require_relative('../strings/string.rb')
 class Card
 
 
-    # Creates a new card
-    # The constructor generates ASCII art of the card and calculates its blackjack value
-    # The card is also assigned a cardback.
-    # @param [string] type the type of the suit the card belongs to, i.e 'spades', 'hearts' etc.
-    # @param [int] number the number of the card. Numbers 2 through 10 are simply the normal numbers,
-    #                                             11 is the ace, 12 jack, 13 queen, 14 king
-    # @return [nil]
-    def initialize(type, number)
-
-        suit, @value, display_number, @ace = determine_card_data(type, number)
-        @backside = generate_cardback
-        @flipped = false
-        @ascii_card = format_card(suit, display_number)
-    end
+  # Creates a new card
+  # The constructor generates ASCII art of the card and calculates its blackjack value
+  # The card is also assigned a cardback.
+  # @param [string] type the type of the suit the card belongs to, i.e 'spades', 'hearts' etc.
+  # @param [int] number the number of the card. Numbers 2 through 10 are simply the normal numbers,
+  #                                             11 is the ace, 12 jack, 13 queen, 14 king
+  # @return [nil]
+  def initialize(type, number)
 
+    suit, @value, display_number, @ace = determine_card_data(type, number)
+    @backside = generate_cardback
+    @flipped = false
+    @ascii_card = format_card(suit, display_number)
+  end
 
-    # Generates an ASCII playing card from the provided information
-    # @param [string] suit the suit of the card
-    # @param [string] number the number of the card (like 'A' for ace or '10' for 10)
-    # @return [string] the ASCII card
-    def format_card(suit, number)
 
-        top =       '┌───────────┐'
-        empty_row = "|           |\n"
-        bottom =    '└───────────┘'
+  # Generates an ASCII playing card from the provided information
+  # @param [string] suit the suit of the card
+  # @param [string] number the number of the card (like 'A' for ace or '10' for 10)
+  # @return [string] the ASCII card
+  def format_card(suit, number)
 
-        offset = 10 - number.length
+    top =       '┌───────────┐'
+    empty_row = "|           |\n"
+    bottom =    '└───────────┘'
 
-        ascii_card = "#{top}\n| #{number}" + ' ' * offset + "|\n"
-        ascii_card += empty_row * 2 + "|     #{suit}     |\n" + empty_row * 2
-        ascii_card += '|' + ' ' * offset + "#{number} |\n#{bottom}"
-        ascii_card.set_attributes([WHITE_BG, BLACK_FG])
-    end
+    offset = 10 - number.length
 
+    ascii_card = "#{top}\n| #{number}" + ' ' * offset + "|\n"
+    ascii_card += empty_row * 2 + "|     #{suit}     |\n" + empty_row * 2
+    ascii_card += '|' + ' ' * offset + "#{number} |\n#{bottom}"
+    ascii_card.set_attributes([WHITE_BG, BLACK_FG])
+  end
 
-    # Determines the suit of the card, its blackjack value, its number to be shown visually as well as
-    # if the card is an ace.
-    # @param [string] type the suit identifier string ('spades', 'hearts', 'clubs' or 'diamonds')
-    # @param [int] number the number of the card. Should be a number from 1 to 14
-    # @return [string, int, string, boolean] the suit of the card, the blackjack value of the card,
-    #                                        the string representation of the card number and if the card is an ace
-    def determine_card_data(type, number)
-
-        suits = {'spades' => '♠', 'diamonds' => '♦', 'hearts' => '♥', 'clubs' => '♣'}
-        special_cards = {10 => '10', 12 => 'B', 13 => 'Q', 14 => 'K'}
-
-        ace = false
-
-        suit = suits[type]
-        if type == 'spades' or type == 'clubs'
-            suit = suit.set_attributes([BLACK_FG], [WHITE_BG, BLACK_FG])
-        else
-            suit = suit.set_attributes([RED_FG], [WHITE_BG, BLACK_FG])
-        end
-
-        if number < 10 and number != 1
-            value = number
-            display_number = number.to_s
-        elsif number >= 10 and number != 11
-            value = 10
-            display_number = special_cards[number]
-        else
-            ace = true
-            value = 11  # Set value of ace to 11, since we can then just downgrade the value to 1 if the need arises
-            display_number = 'A'
-        end
-
-        return suit, value, display_number, ace
-    end
 
-    # Generates a cardback ASCII art
-    # @return [string] the cardback ASCII art
-    def generate_cardback
-        ("┌───────────┐\n" +
-        ("│░░░░░░░░░░░│\n" * 7) +
-         '└───────────┘').set_attributes([WHITE_BG, BLACK_FG])
-    end
+  # Determines the suit of the card, its blackjack value, its number to be shown visually as well as
+  # if the card is an ace.
+  # @param [string] type the suit identifier string ('spades', 'hearts', 'clubs' or 'diamonds')
+  # @param [int] number the number of the card. Should be a number from 1 to 14
+  # @return [string, int, string, boolean] the suit of the card, the blackjack value of the card,
+  #                                        the string representation of the card number and if the card is an ace
+  def determine_card_data(type, number)
 
-    # Flips over the card so that the cardback is shown instead of the generated ASCII card
-    # @return [nil]
-    def flip_over
-        cached = @ascii_card
-        @ascii_card = @backside
-        @backside = cached
-        @flipped = !@flipped
-    end
+    suits = {'spades' => '♠', 'diamonds' => '♦', 'hearts' => '♥', 'clubs' => '♣'}
+    special_cards = {10 => '10', 12 => 'B', 13 => 'Q', 14 => 'K'}
 
-    # @return [string] the generated ASCII card, or the cardback if the card is currently flipped
-    def get_ascii_card
-        @ascii_card
-    end
+    ace = false
 
-    # @return [int] the blackjack value of the card
-    def get_value
-        @value
+    suit = suits[type]
+    if type == 'spades' or type == 'clubs'
+      suit = suit.set_attributes([BLACK_FG], [WHITE_BG, BLACK_FG])
+    else
+      suit = suit.set_attributes([RED_FG], [WHITE_BG, BLACK_FG])
     end
 
-    # @return [boolean] if the card is an ace or not
-    def is_ace
-        @ace
+    if number < 10 and number != 1
+      value = number
+      display_number = number.to_s
+    elsif number >= 10 and number != 11
+      value = 10
+      display_number = special_cards[number]
+    else
+      ace = true
+      value = 11  # Set value of ace to 11, since we can then just downgrade the value to 1 if the need arises
+      display_number = 'A'
     end
 
-    # @return [boolean] if the card is flipped or not
-    def is_flipped
-        @flipped
-    end
+    return suit, value, display_number, ace
+  end
+
+  # Generates a cardback ASCII art
+  # @return [string] the cardback ASCII art
+  def generate_cardback
+    ("┌───────────┐\n" +
+    ("│░░░░░░░░░░░│\n" * 7) +
+     '└───────────┘').set_attributes([WHITE_BG, BLACK_FG])
+  end
+
+  # Flips over the card so that the cardback is shown instead of the generated ASCII card
+  # @return [nil]
+  def flip_over
+    cached = @ascii_card
+    @ascii_card = @backside
+    @backside = cached
+    @flipped = !@flipped
+  end
+
+  # @return [string] the generated ASCII card, or the cardback if the card is currently flipped
+  def get_ascii_card
+    @ascii_card
+  end
+
+  # @return [int] the blackjack value of the card
+  def get_value
+    @value
+  end
+
+  # @return [boolean] if the card is an ace or not
+  def is_ace
+    @ace
+  end
+
+  # @return [boolean] if the card is flipped or not
+  def is_flipped
+    @flipped
+  end
 
 end

data/src/strings/string.rb

@@ -1,19 +1,19 @@
-# Copyright 2016-2017 Hermann Krumrey <hermann@krumreyh.com>
+# Copyright 2016 Hermann Krumrey <hermann@krumreyh.com>
 #
-# This file is part of blackjack.
+# This file is part of ruby-blackjack.
 #
-# blackjack is free software: you can redistribute it and/or modify
+# ruby-blackjack is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# blackjack is distributed in the hope that it will be useful,
+# ruby-blackjack is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with blackjack.  If not, see <http://www.gnu.org/licenses/>.
+# along with ruby-blackjack. If not, see <http://www.gnu.org/licenses/>.
 
 # Class that modifies the String class and equips it with a method to set terminal properties of a string
 class String
@@ -25,19 +25,19 @@ class String
   # @return [string] the string with the attributes set
   def set_attributes(attributes, previous_attributes = [])
 
-      mode_start_string = ''
-      modes_end_string = "\e[0m"
-      attributes.each { |attribute|
-          mode_start_string += "\e[#{attribute}m"
-      }
-      attributed_string = mode_start_string
-      attributed_string += self.gsub("\n", "#{modes_end_string}\n#{mode_start_string}")
-      attributed_string += modes_end_string
+    mode_start_string = ''
+    modes_end_string = "\e[0m"
+    attributes.each { |attribute|
+      mode_start_string += "\e[#{attribute}m"
+    }
+    attributed_string = mode_start_string
+    attributed_string += self.gsub("\n", "#{modes_end_string}\n#{mode_start_string}")
+    attributed_string += modes_end_string
 
-      previous_attributes.each { |attribute|
-          attributed_string += "\e[#{attribute}m"
-      }
-      attributed_string
+    previous_attributes.each { |attribute|
+      attributed_string += "\e[#{attribute}m"
+    }
+    attributed_string
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-blackjack
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Hermann Krumrey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-15 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies: []
 description: A Blackjack CLI game
 email: hermann@krumreyh.com
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
 summary: Blackjack