gitfluff 0.9.0__tar.gz → 0.9.1__tar.gz

{gitfluff-0.9.0 → gitfluff-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitfluff
-Version: 0.9.0
+Version: 0.9.1
 Summary: Commit message linter and formatter
 Author-email: Na'aman Hirschfeld <nhirschfeld@gmail.com>
 License: MIT
@@ -25,7 +25,7 @@ Requires-Dist: certifi>=2024.7.4
 
 # gitfluff
 
-Commit message linter with presets, custom formats, and cleanup automation. Fully compliant with [Conventional Commits 1.0.0](https://www.conventionalcommits.org/en/v1.0.0/). Skips linting while Git is creating a merge commit.
+Commit message linter with presets, custom formats, and cleanup automation. Fully compliant with [Conventional Commits 1.0.0](https://www.conventionalcommits.org/en/v1.0.0/). Skips linting the repository’s `COMMIT_EDITMSG` while Git is creating a merge commit.
 
 This Python package distributes prebuilt `gitfluff` binaries. On first use, the correct release binary for your platform is downloaded and cached under `~/.cache/gitfluff`. The binary's SHA-256 checksum is verified against the release's published checksums manifest before extraction.
 
@@ -96,7 +96,7 @@ default_install_hook_types:
 
 repos:
   - repo: https://github.com/Goldziher/gitfluff
-    rev: v0.9.0
+    rev: v0.9.1
     hooks:
       - id: gitfluff-lint
         stages: [commit-msg]
@@ -124,7 +124,7 @@ commit-msg:
 **Install hooks:**
 
 ```bash
-npx lefthook install
+pnpm dlx lefthook install
 ```
 
 ## Optional configuration

{gitfluff-0.9.0 → gitfluff-0.9.1}/README.md

@@ -1,6 +1,6 @@
 # gitfluff
 
-Commit message linter with presets, custom formats, and cleanup automation. Fully compliant with [Conventional Commits 1.0.0](https://www.conventionalcommits.org/en/v1.0.0/). Skips linting while Git is creating a merge commit.
+Commit message linter with presets, custom formats, and cleanup automation. Fully compliant with [Conventional Commits 1.0.0](https://www.conventionalcommits.org/en/v1.0.0/). Skips linting the repository’s `COMMIT_EDITMSG` while Git is creating a merge commit.
 
 This Python package distributes prebuilt `gitfluff` binaries. On first use, the correct release binary for your platform is downloaded and cached under `~/.cache/gitfluff`. The binary's SHA-256 checksum is verified against the release's published checksums manifest before extraction.
 
@@ -71,7 +71,7 @@ default_install_hook_types:
 
 repos:
   - repo: https://github.com/Goldziher/gitfluff
-    rev: v0.9.0
+    rev: v0.9.1
     hooks:
       - id: gitfluff-lint
         stages: [commit-msg]
@@ -99,7 +99,7 @@ commit-msg:
 **Install hooks:**
 
 ```bash
-npx lefthook install
+pnpm dlx lefthook install
 ```
 
 ## Optional configuration

{gitfluff-0.9.0 → gitfluff-0.9.1}/gitfluff/__init__.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.9.0"
+__version__ = "0.9.1"

{gitfluff-0.9.0 → gitfluff-0.9.1}/gitfluff/downloader.py

@@ -77,15 +77,15 @@ def _download(url: str, destination: Path) -> None:
 def _extract(archive: Path, ext: str, destination: Path) -> None:
     if ext == "zip":
         with zipfile.ZipFile(archive) as zf:
-            for name in zf.namelist():
-                if name.endswith("gitfluff") or name.endswith("gitfluff.exe"):
-                    with zf.open(name) as src, destination.open("wb") as dst:
+            for member in zf.infolist():
+                if not member.is_dir() and PurePosixPath(member.filename).name == destination.name:
+                    with zf.open(member) as src, destination.open("wb") as dst:
                         dst.write(src.read())
                     return
     else:
         with tarfile.open(archive, "r:gz") as tar:
             for member in tar.getmembers():
-                if member.name.endswith("gitfluff") or member.name.endswith("gitfluff.exe"):
+                if member.isfile() and PurePosixPath(member.name).name == destination.name:
                     with tar.extractfile(member) as src, destination.open("wb") as dst:
                         dst.write(src.read())
                     return
@@ -171,14 +171,16 @@ def ensure_binary() -> str:
     url, ext, archive_name = _asset(__version__)
     print(f"Downloading gitfluff binary v{__version__}...", file=sys.stderr)
 
-    with tempfile.TemporaryDirectory() as tmpdir:
+    with tempfile.TemporaryDirectory(dir=binary_path.parent) as tmpdir:
         archive_path = Path(tmpdir) / f"gitfluff.{ext}"
+        staged_binary = Path(tmpdir) / binary_path.name
         _download(url, archive_path)
         _verify_checksum(archive_path, archive_name, __version__)
-        _extract(archive_path, ext, binary_path)
+        _extract(archive_path, ext, staged_binary)
 
-    if platform.system().lower() != "windows":
-        binary_path.chmod(0o755)
+        if platform.system().lower() != "windows":
+            staged_binary.chmod(0o755)
+        staged_binary.replace(binary_path)
 
     print("Binary downloaded successfully!", file=sys.stderr)
     return str(binary_path)
@@ -186,4 +188,5 @@ def ensure_binary() -> str:
 
 def run_gitfluff(args: list[str]) -> int:
     binary = ensure_binary()
-    return subprocess.call([binary, *args])
+    status = subprocess.call([binary, *args])
+    return 128 - status if status < 0 else status

{gitfluff-0.9.0 → gitfluff-0.9.1}/gitfluff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gitfluff
-Version: 0.9.0
+Version: 0.9.1
 Summary: Commit message linter and formatter
 Author-email: Na'aman Hirschfeld <nhirschfeld@gmail.com>
 License: MIT
@@ -25,7 +25,7 @@ Requires-Dist: certifi>=2024.7.4
 
 # gitfluff
 
-Commit message linter with presets, custom formats, and cleanup automation. Fully compliant with [Conventional Commits 1.0.0](https://www.conventionalcommits.org/en/v1.0.0/). Skips linting while Git is creating a merge commit.
+Commit message linter with presets, custom formats, and cleanup automation. Fully compliant with [Conventional Commits 1.0.0](https://www.conventionalcommits.org/en/v1.0.0/). Skips linting the repository’s `COMMIT_EDITMSG` while Git is creating a merge commit.
 
 This Python package distributes prebuilt `gitfluff` binaries. On first use, the correct release binary for your platform is downloaded and cached under `~/.cache/gitfluff`. The binary's SHA-256 checksum is verified against the release's published checksums manifest before extraction.
 
@@ -96,7 +96,7 @@ default_install_hook_types:
 
 repos:
   - repo: https://github.com/Goldziher/gitfluff
-    rev: v0.9.0
+    rev: v0.9.1
     hooks:
       - id: gitfluff-lint
         stages: [commit-msg]
@@ -124,7 +124,7 @@ commit-msg:
 **Install hooks:**
 
 ```bash
-npx lefthook install
+pnpm dlx lefthook install
 ```
 
 ## Optional configuration

{gitfluff-0.9.0 → gitfluff-0.9.1}/gitfluff.egg-info/SOURCES.txt

@@ -9,4 +9,5 @@ gitfluff.egg-info/SOURCES.txt
 gitfluff.egg-info/dependency_links.txt
 gitfluff.egg-info/entry_points.txt
 gitfluff.egg-info/requires.txt
-gitfluff.egg-info/top_level.txt
+gitfluff.egg-info/top_level.txt
+tests/test_downloader.py

{gitfluff-0.9.0 → gitfluff-0.9.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gitfluff"
-version = "0.9.0"
+version = "0.9.1"
 description = "Commit message linter and formatter"
 readme = "README.md"
 license = { text = "MIT" }

gitfluff-0.9.1/tests/test_downloader.py

@@ -0,0 +1,78 @@
+import io
+import os
+import signal
+import sys
+import tarfile
+import tempfile
+import unittest
+import zipfile
+from contextlib import ExitStack
+from pathlib import Path
+from unittest.mock import patch
+
+sys.path.insert(0, str(Path(__file__).resolve().parents[1]))
+
+from gitfluff import downloader
+
+
+class DownloaderTests(unittest.TestCase):
+    def test_should_ignore_suffix_lookalikes_when_extracting_binary(self) -> None:
+        with tempfile.TemporaryDirectory() as directory:
+            archive = Path(directory) / "release.tar.gz"
+            destination = Path(directory) / "gitfluff"
+            with tarfile.open(archive, "w:gz") as release:
+                for name, content in [("notgitfluff", b"wrong"), ("bin/gitfluff", b"correct")]:
+                    member = tarfile.TarInfo(name)
+                    member.size = len(content)
+                    release.addfile(member, io.BytesIO(content))
+            downloader._extract(archive, "tar.gz", destination)
+            self.assertEqual(destination.read_bytes(), b"correct")
+
+    def test_should_extract_exact_binary_name_from_zip(self) -> None:
+        with tempfile.TemporaryDirectory() as directory:
+            archive = Path(directory) / "release.zip"
+            destination = Path(directory) / "gitfluff.exe"
+            with zipfile.ZipFile(archive, "w") as release:
+                release.writestr("notgitfluff.exe", b"wrong")
+                release.writestr("bin/gitfluff.exe", b"correct")
+            downloader._extract(archive, "zip", destination)
+            self.assertEqual(destination.read_bytes(), b"correct")
+
+    def test_should_reject_directory_when_extracting_binary(self) -> None:
+        with tempfile.TemporaryDirectory() as directory:
+            archive = Path(directory) / "release.tar.gz"
+            destination = Path(directory) / "gitfluff"
+            with tarfile.open(archive, "w:gz") as release:
+                member = tarfile.TarInfo("gitfluff")
+                member.type = tarfile.DIRTYPE
+                release.addfile(member)
+            with self.assertRaisesRegex(RuntimeError, "Binary not found"):
+                downloader._extract(archive, "tar.gz", destination)
+
+    def test_should_leave_no_cached_binary_when_extraction_fails(self) -> None:
+        with tempfile.TemporaryDirectory() as directory:
+            destination = Path(directory) / "gitfluff"
+
+            def fail_extraction(_archive: Path, _extension: str, output: Path) -> None:
+                output.write_bytes(b"partial")
+                raise OSError("interrupted extraction")
+
+            with ExitStack() as stack:
+                stack.enter_context(patch.dict(os.environ, {"GITFLUFF_BINARY": ""}))
+                stack.enter_context(patch.object(downloader, "_cache_path", return_value=destination))
+                stack.enter_context(patch.object(downloader, "_download"))
+                stack.enter_context(patch.object(downloader, "_verify_checksum"))
+                stack.enter_context(patch.object(downloader, "_extract", side_effect=fail_extraction))
+                stack.enter_context(self.assertRaisesRegex(OSError, "interrupted extraction"))
+                downloader.ensure_binary()
+            self.assertEqual(destination.exists(), False)
+
+    @unittest.skipIf(os.name == "nt", "POSIX signals required")
+    def test_should_return_failure_status_when_child_is_terminated(self) -> None:
+        with patch.dict(os.environ, {"GITFLUFF_BINARY": sys.executable}):
+            status = downloader.run_gitfluff(["-c", "import os, signal; os.kill(os.getpid(), signal.SIGTERM)"])
+        self.assertEqual(status, 128 + signal.SIGTERM)
+
+
+if __name__ == "__main__":
+    unittest.main()