dycw-pre-commit-hooks 0.12.1__py3-none-any.whl → 0.12.2__py3-none-any.whl

{dycw_pre_commit_hooks-0.12.1.dist-info → dycw_pre_commit_hooks-0.12.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-pre-commit-hooks
-Version: 0.12.1
+Version: 0.12.2
 Author-email: Derek Wan <d.wan@icloud.com>
 Requires-Python: >=3.12
 Requires-Dist: click<8.3,>=8.2.1

{dycw_pre_commit_hooks-0.12.1.dist-info → dycw_pre_commit_hooks-0.12.2.dist-info}/RECORD

@@ -1,15 +1,15 @@
-pre_commit_hooks/__init__.py,sha256=bMyIveYyxCjAv2_JH9Hd38cd4RL7NmCC4HiW8Td0nQU,59
-pre_commit_hooks/common.py,sha256=x-a-v0esyBPJqPZf6uypbrFaxUKEgfnuAxiUvYSaLbA,2350
+pre_commit_hooks/__init__.py,sha256=tiNQ40NwKZSP_S-wg-yypkGWxyH5-ueuWipPiizKx8U,59
+pre_commit_hooks/common.py,sha256=rIfVTUYfmeQq7Vk4m_Of-JGqABZlB7dfCyGo2WTibas,2078
 pre_commit_hooks/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pre_commit_hooks/format_requirements/__init__.py,sha256=bn1JsblINCf0ro2QrhsM8XtTOHnPFSZC2t-Hx5AJDfA,3392
 pre_commit_hooks/format_requirements/__main__.py,sha256=15JSp_rhjI_Ddoj4MRkHFShfnYxs6GggUhLRlGtrQ0E,156
 pre_commit_hooks/replace_sequence_str/__init__.py,sha256=a-pCAcBaa7FDsGDNLzMiD-xG20wKl-SRmhWSbm9hrvo,1618
 pre_commit_hooks/replace_sequence_str/__main__.py,sha256=B1dxOxngV4vUVnDVrXSywiySOs1P_zF30_4ZMRsOSaY,157
-pre_commit_hooks/run_bump_my_version/__init__.py,sha256=UGaOu7Ie5LRGsMe34eygSgMWteKfDRGNX49R3kafczk,1353
+pre_commit_hooks/run_bump_my_version/__init__.py,sha256=EOKRq04eIKojyfgfvlaPfWeKxOWkEBjmz2UOcuk6U_o,2068
 pre_commit_hooks/run_bump_my_version/__main__.py,sha256=w2V3y61jrSau-zxjl8ciHtWPlJQwXbYxNJ2tGYVyI4s,156
-pre_commit_hooks/tag_commits/__init__.py,sha256=BvpAqdRDw06Gab3jNXYO6BgosnMybowZUsXV8wQA2gU,3699
+pre_commit_hooks/tag_commits/__init__.py,sha256=AmHKjIAMfXZ6T0nw6CiOFTjFzmmVSOonmKyhASZ_sgE,3665
 pre_commit_hooks/tag_commits/__main__.py,sha256=qefgYw7LWbvmzZS45-ym6olS4cHqw1Emw2wlqZBXN_o,148
-dycw_pre_commit_hooks-0.12.1.dist-info/METADATA,sha256=CvLbPZLgmY-MZS2dZulcvQHAmS64lk64xP96uvC-dVY,1029
-dycw_pre_commit_hooks-0.12.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-dycw_pre_commit_hooks-0.12.1.dist-info/entry_points.txt,sha256=r1tnPzaGvOrSdX-ZRriidf8AhZgUtXfjdTpwpkTBA8U,260
-dycw_pre_commit_hooks-0.12.1.dist-info/RECORD,,
+dycw_pre_commit_hooks-0.12.2.dist-info/METADATA,sha256=DdndJ2NzELgAG-gBuL1cvnDLTEPCAe04GMhKLjju-zs,1029
+dycw_pre_commit_hooks-0.12.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+dycw_pre_commit_hooks-0.12.2.dist-info/entry_points.txt,sha256=r1tnPzaGvOrSdX-ZRriidf8AhZgUtXfjdTpwpkTBA8U,260
+dycw_pre_commit_hooks-0.12.2.dist-info/RECORD,,

pre_commit_hooks/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.12.1"
+__version__ = "0.12.2"

pre_commit_hooks/common.py

@@ -12,51 +12,41 @@ from utilities.version import Version, parse_version
 PYPROJECT_TOML = get_repo_root().joinpath("pyproject.toml")
 
 
-def get_version(
-    path_or_text: Path | str | bytes | TOMLDocument, /, *, desc: str = ""
-) -> Version:
-    """Parse the version from a block of text."""
-    match path_or_text:
+def get_version(source: Path | str | bytes | TOMLDocument, /) -> Version:
+    """Get the `[tool.bumpversion]` version from a TOML file."""
+    match source:
         case Path() as path:
-            return get_version(
-                path.read_text(), desc=f" from {str(path)!r}" if desc == "" else desc
-            )
+            return get_version(path.read_text())
         case str() | bytes() as text:
-            return get_version(parse(text), desc=desc)
+            return get_version(parse(text))
         case TOMLDocument() as doc:
             try:
                 tool = doc["tool"]
             except KeyError:
-                logger.exception(
-                    f"Failed to get version{desc}; key 'tool' does not exist"
-                )
+                logger.exception("Failed to get version; key 'tool' does not exist")
                 raise
             if not isinstance(tool, Table):
-                logger.exception(f"Failed to get version{desc}; `tool` is not a Table")
+                logger.exception("Failed to get version; `tool` is not a Table")
                 raise TypeError
             try:
                 bumpversion = tool["bumpversion"]
             except KeyError:
                 logger.exception(
-                    f"Failed to get version{desc}; key 'bumpversion' does not exist"
+                    "Failed to get version; key 'bumpversion' does not exist"
                 )
                 raise
             if not isinstance(bumpversion, Table):
-                logger.exception(
-                    f"Failed to get version{desc}; `bumpversion` is not a Table"
-                )
+                logger.exception("Failed to get version; `bumpversion` is not a Table")
                 raise TypeError
             try:
                 version = bumpversion["current_version"]
             except KeyError:
                 logger.exception(
-                    f"Failed to get version{desc}; key 'current_version' does not exist"
+                    "Failed to get version; key 'current_version' does not exist"
                 )
                 raise
             if not isinstance(version, str):
-                logger.exception(
-                    f"Failed to get version{desc}; `version` is not a string"
-                )
+                logger.exception("Failed to get version; `version` is not a string")
                 raise TypeError
             return parse_version(version)
         case never:  # pyright: ignore[reportUnnecessaryComparison]

pre_commit_hooks/run_bump_my_version/__init__.py

@@ -2,21 +2,32 @@ from __future__ import annotations
 
 from pathlib import Path
 from subprocess import PIPE, STDOUT, CalledProcessError, check_call, check_output
+from typing import Literal, assert_never
 
-from click import command
+from click import Choice, command, option
 from loguru import logger
+from utilities.pathlib import get_repo_root
 
 from pre_commit_hooks.common import PYPROJECT_TOML, get_version
 
+type _Mode = Literal["pyproject", "bumpversion"]
+_MODE: _Mode = "pyproject"
+
 
 @command()
-def main() -> bool:
+@option(
+    "--mode",
+    type=Choice(["pyproject", "bumpversion"], case_sensitive=False),
+    default=_MODE,
+    show_default=True,
+)
+def main(*, mode: _Mode = _MODE) -> bool:
     """CLI for the `run_bump_my_version` hook."""
-    return _process()
+    return _process(mode=mode)
 
 
-def _process() -> bool:
-    path = PYPROJECT_TOML.relative_to(Path.cwd())
+def _process(*, mode: _Mode = _MODE) -> bool:
+    path = _get_rel_path(mode=mode)
     current = get_version(path)
     commit = check_output(["git", "rev-parse", "origin/master"], text=True).rstrip("\n")
     contents = check_output(["git", "show", f"{commit}:{path}"], text=True)
@@ -44,4 +55,15 @@ def _process() -> bool:
     return False
 
 
+def _get_rel_path(*, mode: _Mode = _MODE) -> Path:
+    match mode:
+        case "pyproject":
+            path = PYPROJECT_TOML
+        case "bumpversion":
+            path = get_repo_root().joinpath(".bumpversion.toml")
+        case never:  # pyright: ignore[reportUnnecessaryComparison]
+            assert_never(never)
+    return path.relative_to(Path.cwd())
+
+
 __all__ = ["main"]

pre_commit_hooks/tag_commits/__init__.py

@@ -113,7 +113,7 @@ def _tag_commit(commit: Commit, repo: Repo, /) -> None:
         logger.exception(f"`pyproject.toml` not found; failed to tag {sha!r} ({date})")
         return
     text = joined.data_stream.read()
-    version = get_version(text, desc=f"'pyproject.toml' @ {sha}")
+    version = get_version(text)
     try:
         tag = repo.create_tag(str(version), ref=sha)
     except GitCommandError as error: