Fix #21, don't change output name (#22)

* Fix #21, don't change output name

* Add test for suffix behavior

* Fix reinstallation of packages for tests

* Test printing

* Clearer condition

* Bump version and add changelog

* Formatting

---------

Co-authored-by: Jay Qi <[email protected]>

Author: Freed-Wu

cli/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog — rpzip
 
+## v0.1.2 (2025-07-26)
+
+- Fixed inconsistency with `zip` with output file suffixes. `rpzip` now only adds a `.zip` suffix if the output file does not have a suffix already. Previously, an existing suffix would be replaced by `.zip`. ([Issue #21](https://github.com/drivendataorg/repro-zipfile/issues/21), [PR #22](https://github.com/drivendataorg/repro-zipfile/pull/22) contributed by [@Freed-Wu](https://github.com/Freed-Wu))
+
 ## v0.1.1 (2024-02-02)
 
 - Fixed misformatted `--version` output.

cli/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "rpzip"
-version = "0.1.2.dev"
+version = "0.1.2"
 description = "A lightweight command-line program for creating reproducible/deterministic ZIP archives."
 readme = "README.md"
 requires-python = ">=3.8"

cli/rpzip.py

@@ -93,10 +93,10 @@ def rpzip(
     logger.debug("recurse_paths: %s", recurse_paths)
 
     # Set output archive path
-    if not out_file.endswith(".zip"):
-        out_path = Path(out_file).with_suffix(".zip").resolve()
-    else:
-        out_path = Path(out_file).resolve()
+    out_path = Path(out_file)
+    if not out_path.suffix:
+        out_path = out_path.with_suffix(".zip")
+    out_path = out_path.resolve()
     logger.debug("writing to: %s", out_path)
 
     # Process inputs

justfile

@@ -29,6 +29,7 @@ typecheck:
 # Run tests
 test *args:
     uv run --python {{python}} --no-editable --all-extras --no-dev --group test --isolated \
+        --reinstall-package rpzip --reinstall-package repro-zipfile \
         python -I -m pytest {{args}}
 
 # Run all tests with Python version matrix

tests/test_cli.py

@@ -84,20 +84,48 @@ def test_zip_multiple_recursive(base_path):
     assert_archive_contents_equals(rpzip_out, zip_out)
 
 
-def test_zip_no_suffix(base_path):
+def test_zip_no_suffix_adds_suffix(base_path):
+    """Appropriately add .zip suffix if file does not have one."""
     data_file = file_factory(base_path)
 
-    rpzip_out = base_path / "rpzip.zip"
-    rpzip_args = [str(rpzip_out.with_suffix("")), str(data_file)]
+    # Should add .zip to argument without suffix
+    rpzip_out_expected = base_path / "rpzip.zip"
+    rpzip_out_arg = rpzip_out_expected.with_suffix("")
+    rpzip_args = [str(rpzip_out_arg), str(data_file)]
     rpzip_result = runner.invoke(app, rpzip_args)
     assert rpzip_result.exit_code == 0, rpzip_args
+    assert rpzip_out_expected.exists(), (rpzip_args, list(base_path.iterdir()))
 
-    zip_out = base_path / "zip.zip"
-    zip_cmd = ["zip", str(zip_out.with_suffix("")), str(data_file)]
+    # zip also adds .zip to argument another argument without suffix
+    zip_out_expected = base_path / "zip.zip"
+    zip_out_arg = zip_out_expected.with_suffix("")
+    zip_cmd = ["zip", str(zip_out_arg), str(data_file)]
     zip_result = subprocess.run(zip_cmd)
     assert zip_result.returncode == 0, zip_cmd
+    assert zip_out_expected.exists(), (zip_cmd, list(base_path.iterdir()))
 
-    assert_archive_contents_equals(rpzip_out, zip_out)
+    assert_archive_contents_equals(rpzip_out_expected, zip_out_expected)
+
+
+def test_zip_existing_suffix_does_not_add_suffix(base_path):
+    """Does not add .zip suffix if file already has one."""
+    data_file = file_factory(base_path)
+
+    # Should not add .zip to argument with existing suffix
+    rpzip_out_expected = base_path / "rpzip.some_suffix"
+    rpzip_args = [str(rpzip_out_expected), str(data_file)]
+    rpzip_result = runner.invoke(app, rpzip_args)
+    assert rpzip_result.exit_code == 0, rpzip_args
+    assert rpzip_out_expected.exists(), (rpzip_args, list(base_path.iterdir()))
+
+    # zip also does not add .zip to argument with existing suffix
+    zip_out_expected = base_path / "zip.some_suffix"
+    zip_cmd = ["zip", str(zip_out_expected), str(data_file)]
+    zip_result = subprocess.run(zip_cmd)
+    assert zip_result.returncode == 0, zip_cmd
+    assert zip_out_expected.exists(), (zip_cmd, list(base_path.iterdir()))
+
+    assert_archive_contents_equals(rpzip_out_expected, zip_out_expected)
 
 
 def test_verbosity(rel_path):