blackjack-cli 1.0.2__tar.gz → 1.1.0__tar.gz

{blackjack_cli-1.0.2 → blackjack_cli-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blackjack-cli
-Version: 1.0.2
+Version: 1.1.0
 Summary: This is a cli-based blackjack game! Woo!
 Home-page: https://github.com/vlek/blackjack-cli
 License: GPLv3

{blackjack_cli-1.0.2 → blackjack_cli-1.1.0}/pyproject.toml

@@ -1,11 +1,15 @@
 [tool.poetry]
 name = "blackjack-cli"
-version = "1.0.2"
+version = "1.1.0"
 description = "This is a cli-based blackjack game! Woo!"
 authors = ["Vlek <derek@mccammond.org>"]
 license = "GPLv3"
 readme = "README.md"
 repository = "https://github.com/vlek/blackjack-cli"
+packages = [
+  { include = "blackjack_cli", from = "src" },
+  { include = "deck", from = "src" },
+]
 
 [tool.poetry.dependencies]
 python = "^3.10"
@@ -42,3 +46,6 @@ fail_under = 90
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
+
+[flake8]
+max-line-length = 88

blackjack_cli-1.1.0/src/blackjack_cli/__init__.py

@@ -0,0 +1,5 @@
+from blackjack_cli.blackjack import Blackjack
+from deck.card import Card
+from deck.deck import Deck
+
+__all__ = ["Card", "Deck", "Blackjack"]

{blackjack_cli-1.0.2 → blackjack_cli-1.1.0/src}/blackjack_cli/blackjack.py

@@ -8,9 +8,10 @@ This is going to house things like:
 """
 
 from enum import Enum
+
 from typing_extensions import Self
 
-from deck import Deck, Card, CardHand
+from deck import Card, CardHand, Deck
 
 
 def blackjackScoringStrategy(cards: list[Card]) -> int:
@@ -100,28 +101,26 @@ class Blackjack:
 
     def performDealersTurn(self) -> Self:
         """Performs the dealer's moves and finishes the game."""
-        playersScore: int = self.playersCards.getScore()
-        dealersScore: int = self.dealersCards.getScore()
+        while self.dealersCards.getScore() <= 16:
+            self._drawCard(self.dealersCards)
 
-        # If the player bust or the dealer got blackjack
-        if playersScore > 21 or dealersScore == 21:
-            self.gameState = GameState.Lose
-            return self
+        self._calcGameState()
 
-        while (dealersScore := self.dealersCards.getScore()) <= 16:
-            self._drawCard(self.dealersCards)
+        return self
 
-        dealersScore = self.dealersCards.getScore()
+    def _calcGameState(self) -> None:
+        """Based on current cards, calculates the gamestate."""
+        playersScore: int = self.playersCards.getScore()
+        dealersScore: int = self.dealersCards.getScore()
 
-        if playersScore > dealersScore or dealersScore > 21:
+        if playersScore > 21:
+            self.gameState = GameState.Lose
+        elif playersScore == dealersScore:
+            self.gameState = GameState.Push
+        elif playersScore > dealersScore or dealersScore > 21:
             self.gameState = GameState.Win
         else:
-            if playersScore == dealersScore:
-                self.gameState = GameState.Push
-            else:
-                self.gameState = GameState.Lose
-
-        return self
+            self.gameState = GameState.Lose
 
     def _drawCard(self, hand: CardHand) -> Card | None:
         """Draws a card and places it into the given hand."""

{blackjack_cli-1.0.2 → blackjack_cli-1.1.0/src}/blackjack_cli/config.py

@@ -31,7 +31,7 @@ class Config:
         self.config_folder_path: Path = self.config_file_path.parent
 
         if not self.config_folder_path.exists():
-            self.config_folder_path.mkdir()
+            self.config_folder_path.mkdir(parents=True)
 
         if self.config_file_path.exists():
             with self.config_file_path.open() as config_file:

blackjack_cli-1.1.0/src/deck/__init__.py

@@ -0,0 +1,5 @@
+from deck.card import Card
+from deck.deck import Deck
+from deck.cardhand import CardHand
+
+__all__ = ["Card", "Deck", "CardHand"]

blackjack_cli-1.1.0/src/deck/card.py

@@ -0,0 +1,49 @@
+"""
+Handles the logic for a single Card within a Deck.
+"""
+
+from enum import Enum
+
+
+class Card:
+    class Suit(Enum):
+        SPADES = "♠"
+        CLUBS = "♣"
+        DIAMONDS = "♦"
+        HEARTS = "♥"
+
+    class Value(Enum):
+        TWO = 2
+        THREE = 3
+        FOUR = 4
+        FIVE = 5
+        SIX = 6
+        SEVEN = 7
+        EIGHT = 8
+        NINE = 9
+        TEN = 10
+        JACK = "J"
+        QUEEN = "Q"
+        KING = "K"
+        ACE = "A"
+
+    def __init__(self, suit: Suit, value: Value) -> None:
+        self.suit = suit
+        self.value = value
+
+    def __str__(self) -> str:
+        """Returns the string representation of a Card."""
+        return f"{self.suit.value}{self.value.value}"
+
+    def __eq__(self, otherCard) -> bool:
+        """Determine whether one card is the same as the other."""
+        return self.suit == otherCard.suit and self.value == otherCard.value
+
+
+if __name__ == "__main__":
+    card = Card(Card.Suit.SPADES, Card.Value.ACE)
+    otherCard = Card(Card.Suit.SPADES, Card.Value.ACE)
+
+    print(card)
+
+    print(card == otherCard)

blackjack_cli-1.1.0/src/deck/cardhand.py

@@ -0,0 +1,46 @@
+"""
+This deals with holding and evaluating cards that
+a player has in their hand.
+"""
+
+from typing import Callable
+
+from typing_extensions import Self
+
+from deck import Card
+
+
+class CardHand:
+
+    def __init__(
+        self,
+        cards: list[Card | None],
+        scoringStrategy: Callable[[list[Card]], int] = lambda x: -1,
+    ) -> None:
+        """Initializes a cardhand."""
+
+        self.cards: list[Card] = [c for c in cards if c is not None]
+        self.scoringStrategy = scoringStrategy
+
+    def setScoringStrategy(self, scoringStrategy: Callable[[list[Card]], int]) -> Self:
+        """Sets the strategy for how to score the given hand."""
+        self.scoringStrategy = scoringStrategy
+        return self
+
+    def getScore(self) -> int:
+        """Returns the score of the current hand with the given strategy."""
+        return self.scoringStrategy(self.cards)
+
+    def add(self, card: Card | None) -> Self:
+        """Add a card to the player's hand."""
+        if card is not None:
+            self.cards.append(card)
+        return self
+
+    def __str__(self) -> str:
+        """Returns string representation of the cardhand."""
+        return " ".join(str(c) for c in self.cards)
+
+    def __len__(self) -> int:
+        """Returns the length of a given hand."""
+        return len(self.cards)

blackjack_cli-1.1.0/src/deck/deck.py

@@ -0,0 +1,73 @@
+"""
+Logic for having a deck of cards.
+
+NOTE: THIS DOES NOT NECESSARILY HAVE ANYTHING TO DO WITH BLACKJACK!
+
+We have 52 cards:
+    4 Suits:
+        Clubs, Spades, Hearts, Diamonds
+
+        9 Number cards:
+            2 - 10
+
+        3 Face cards:
+            Jack
+            Queen
+            King
+
+        1 Ace
+"""
+
+from deck import Card
+from typing_extensions import Self
+from random import randint
+
+
+class Deck:
+    def __init__(self) -> None:
+        self.cards: list[Card] = []
+        self.isShuffled = False
+        self.__add_cards()
+
+    def shuffle(self) -> Self:
+        """Returns the deck of cards shuffled."""
+        self.isShuffled = True
+        return self
+
+    def draw(self) -> Card | None:
+        """Returns a card from the deck."""
+        result: Card | None
+
+        if len(self.cards) == 0:
+            result = None
+        elif self.isShuffled:
+            cardChoice: int = randint(0, len(self.cards) - 1)
+            result = self.cards.pop(cardChoice)
+        else:
+            result = self.cards.pop()
+
+        return result
+
+    def __add__(self, otherDeck: Self) -> Self:
+        """Puts to decks of cards together."""
+        self.cards += otherDeck.cards
+
+        return self
+
+    def __len__(self) -> int:
+        """Returns the number of cards in the deck."""
+        return len(self.cards)
+
+    def __mul__(self, num: int) -> Self:
+        """Duplicates the cards in the deck num times."""
+        self.cards *= num
+
+        return self
+
+    def __add_cards(self) -> Self:
+        """Adds initial cards to the deck."""
+        for suit in Card.Suit:
+            for value in Card.Value:
+                self.cards.append(Card(suit, value))
+
+        return self

blackjack_cli-1.0.2/blackjack_cli/__init__.py

@@ -1,2 +0,0 @@
-from deck.card import Card
-from deck.deck import Deck