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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: blackjack-cli
-Version: 1.0.3
+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.3 → blackjack_cli-1.1.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "blackjack-cli"
-version = "1.0.3"
+version = "1.1.0"
 description = "This is a cli-based blackjack game! Woo!"
 authors = ["Vlek <derek@mccammond.org>"]
 license = "GPLv3"
@@ -46,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.3 → 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.3 → 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.0.3 → blackjack_cli-1.1.0}/src/deck/cardhand.py

@@ -3,15 +3,20 @@ This deals with holding and evaluating cards that
 a player has in their hand.
 """
 
-from deck import Card
+from typing import Callable
+
 from typing_extensions import Self
 
-from typing import Callable
+from deck import Card
 
 
 class CardHand:
 
-    def __init__(self, cards: list[Card | None], scoringStrategy: Callable[[list[Card]], int] = lambda x: -1) -> None:
+    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]
@@ -35,3 +40,7 @@ class CardHand:
     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.0.3/src/blackjack_cli/__init__.py

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