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

blackjack_cli-1.2.0/.gitignore

@@ -0,0 +1,160 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# poetry
+#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
+#   This is especially recommended for binary packages to ensure reproducibility, and is more
+#   commonly ignored for libraries.
+#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
+#poetry.lock
+
+# pdm
+#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
+#pdm.lock
+#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
+#   in version control.
+#   https://pdm.fming.dev/#use-with-ide
+.pdm.toml
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/
+
+# PyCharm
+#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
+#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
+#  and can be added to the global gitignore or merged into this file.  For a more nuclear
+#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
+#.idea/

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

@@ -1,20 +1,19 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: blackjack-cli
-Version: 1.0.3
+Version: 1.2.0
 Summary: This is a cli-based blackjack game! Woo!
-Home-page: https://github.com/vlek/blackjack-cli
-License: GPLv3
-Author: Vlek
-Author-email: derek@mccammond.org
-Requires-Python: >=3.10,<4.0
-Classifier: License :: Other/Proprietary License
+Project-URL: Repository, https://github.com/vlek/blackjack-cli
+Author-email: Vlek <derek@mccammond.org>
+License-Expression: GPL-3.0
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
-Requires-Dist: pyyaml (>=6.0.1,<7.0.0)
-Requires-Dist: rich-click (>=1.6.1,<2.0.0)
-Project-URL: Repository, https://github.com/vlek/blackjack-cli
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Requires-Python: <4,>=3.10
+Requires-Dist: pyyaml<7,>=6.0.1
+Requires-Dist: rich-click<2,>=1.6.1
 Description-Content-Type: text/markdown
 
 # Blackjack-cli
@@ -23,4 +22,3 @@ A Python-based Blackjack CLI game
 Play Blackjack in the terminal!
 
 [![asciicast](https://asciinema.org/a/667218.svg)](https://asciinema.org/a/667218)
-

blackjack_cli-1.2.0/pyproject.toml

@@ -0,0 +1,79 @@
+[project]
+name = "blackjack-cli"
+version = "1.2.0"
+description = "This is a cli-based blackjack game! Woo!"
+authors = [{ name = "Vlek", email = "derek@mccammond.org" }]
+requires-python = ">=3.10,<4"
+readme = "README.md"
+license = "GPL-3.0"
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
+    "Programming Language :: Python :: 3.14",
+]
+dependencies = [
+    "rich-click>=1.6.1,<2",
+    "pyyaml>=6.0.1,<7",
+]
+
+[project.urls]
+Repository = "https://github.com/vlek/blackjack-cli"
+
+[project.scripts]
+blackjack = "blackjack_cli.console:bj"
+bj = "blackjack_cli.console:bj"
+hit = "blackjack_cli.console:hit"
+stand = "blackjack_cli.console:stand"
+stay = "blackjack_cli.console:stand"
+
+[dependency-groups]
+dev = [
+    "black>=26.5.1,<27",
+    "pytest>=8.2.2,<9",
+    "coverage>=7.3.1,<8",
+    "pre-commit-hooks>=4.4,<6.0",
+    "pyupgrade>=3.21.2",
+]
+
+[tool.uv]
+default-groups = "all"
+
+[tool.hatch.build.targets.sdist]
+include = [
+    "src/blackjack_cli",
+    "src/deck",
+]
+
+[tool.hatch.build.targets.wheel]
+include = [
+    "src/blackjack_cli",
+    "src/deck",
+]
+
+[tool.hatch.build.targets.wheel.sources]
+"src/blackjack_cli" = "blackjack_cli"
+"src/deck" = "deck"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.coverage.paths]
+source = ["src", "*/site-packages"]
+tests = ["tests", "*/tests"]
+
+[tool.coverage.run]
+parallel = true
+branch = true
+source = ["blackjack-cli"]
+omit = ["tests"]
+
+[tool.coverage.report]
+show_missing = false
+fail_under = 90
+
+[flake8]
+max-line-length = 88

blackjack_cli-1.2.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.2.0}/src/blackjack_cli/blackjack.py

@@ -8,9 +8,9 @@ This is going to house things like:
 """
 
 from enum import Enum
-from typing_extensions import Self
+from typing import Self
 
-from deck import Deck, Card, CardHand
+from deck import Card, CardHand, Deck
 
 
 def blackjackScoringStrategy(cards: list[Card]) -> int:
@@ -100,28 +100,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.2.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.2.0}/src/blackjack_cli/models/stats_model.py

@@ -1,6 +1,6 @@
-from typing import Any
+from typing import Any, Self
+
 from blackjack_cli.blackjack import GameState
-from typing_extensions import Self
 
 
 class BlackjackStats:

{blackjack_cli-1.0.3 → blackjack_cli-1.2.0}/src/deck/cardhand.py

@@ -3,15 +3,18 @@ This deals with holding and evaluating cards that
 a player has in their hand.
 """
 
-from deck import Card
-from typing_extensions import Self
+from typing import Callable, 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 +38,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 → blackjack_cli-1.2.0}/src/deck/deck.py

@@ -18,9 +18,10 @@ We have 52 cards:
         1 Ace
 """
 
-from deck import Card
-from typing_extensions import Self
 from random import randint
+from typing import Self
+
+from deck import Card
 
 
 class Deck:

blackjack_cli-1.0.3/pyproject.toml

@@ -1,48 +0,0 @@
-[tool.poetry]
-name = "blackjack-cli"
-version = "1.0.3"
-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"
-rich-click = "^1.6.1"
-pyyaml = "^6.0.1"
-
-[tool.poetry.group.dev.dependencies]
-black = "^24.4.2"
-pytest = "^8.2.2"
-coverage = "^7.3.1"
-pre-commit-hooks = "^4.4.0"
-
-[tool.poetry.scripts]
-blackjack = "blackjack_cli.console:bj"
-bj = "blackjack_cli.console:bj"
-hit = "blackjack_cli.console:hit"
-stand = "blackjack_cli.console:stand"
-stay = "blackjack_cli.console:stand"
-
-[tool.coverage.paths]
-source = ["src", "*/site-packages"]
-tests = ["tests", "*/tests"]
-
-[tool.coverage.run]
-parallel = true
-branch = true
-source = ["blackjack-cli"]
-omit = ["tests"]
-
-[tool.coverage.report]
-show_missing = false
-fail_under = 90
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"

blackjack_cli-1.0.3/src/blackjack_cli/__init__.py

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