Make debug print prettier and add useful options in publish script

Author: eggplants

poetry.lock

@@ -1,12 +1,15 @@
 from __future__ import annotations
 
 import json
+import os
 import shutil
 import subprocess
 from pathlib import Path
 from typing import TYPE_CHECKING
 from urllib.request import urlopen
 
+from natsort import natsorted
+
 if TYPE_CHECKING:
     from collections.abc import KeysView
 
@@ -18,22 +21,18 @@ def download_openapi_generator_jar(version: str) -> None:
         MVN_BASE_URL
         + "/remotecontent?filepath=org/openapitools/openapi-generator-cli/"
         + version
-        + "/openapi-generator-cli-"
-        + version
-        + ".jar"
+        + f"/openapi-generator-cli-{version}.jar"
     )
 
     Path("openapi-generator.jar").unlink(missing_ok=True)
 
-    print(download_url)
+    print(f"[{version}] URL: {download_url!r}")
     response = urlopen(download_url)  #  noqa: S310
 
     if response.status != 200:  # noqa: PLR2004
         msg = f"{response.status}: {download_url}"
         raise RuntimeError(msg)
 
-    print("Downloading complete")
-
     with Path("openapi_generator_cli/openapi-generator.jar").open("wb") as openapi_generator_jar:
         openapi_generator_jar.write(response.read())
         openapi_generator_jar.close()
@@ -78,18 +77,43 @@ def get_published_vesions() -> KeysView[str]:
     return published_releases.keys()
 
 
-def publish() -> None:
-    latest_version = get_available_versions()[0]
-    published_versions = get_published_vesions()
+def download_latest_jar_for_test() -> None:
+    latest_version = natsorted(get_available_versions())[-1]
+    print(f"[{latest_version}] Downloading...")
+    download_openapi_generator_jar(latest_version)
+    print(f"[{latest_version}] Downloaded!")
+
+
+def publish(*, dryrun: bool = False) -> None:
+    pytest_path = shutil.which("pytest")
+    poetry_path = shutil.which("poetry")
+
+    unpublished_versions = natsorted(set(get_available_versions()) - set(get_published_vesions()))
+
+    for publishing_version in unpublished_versions:
+        print(f"[{publishing_version}] Downloading...")
+        download_openapi_generator_jar(publishing_version)
+
+        print(f"[{publishing_version}] Testing...")
+        subprocess.check_call([pytest_path])
+
+        if dryrun:
+            continue
+
+        print(f"[{publishing_version}] Building...")
+        subprocess.check_call([poetry_path, "build", "-v"])  # noqa: S603
+
+        print(f"[{publishing_version}] Publishing to TestPyPI...")
+        subprocess.check_call([poetry_path, "publish", "-r", "testpypi", "-v"])  # noqa: S603
+
+        print(f"[{publishing_version}] Publishing to PyPI...")
+        subprocess.check_call([poetry_path, "publish", "-v"])  # noqa: S603
 
-    if latest_version not in published_versions:
-        print("Publishing version " + latest_version)
-        download_openapi_generator_jar(latest_version)
-        poetry_path = shutil.which("poetry")
-        subprocess.check_call([poetry_path, "build"])  # noqa: S603
-        subprocess.check_call([poetry_path, "publish", "-r", "testpypi"])  # noqa: S603
-        subprocess.check_call([poetry_path, "publish"])  # noqa: S603
+        print(f"[{publishing_version}] Published!")
 
 
 if __name__ == "__main__":
-    publish()
+    if os.getenv("DOWNLOAD_LATEST_ONLY") == "1":
+        download_latest_jar_for_test()
+    else:
+        publish(dryrun=os.getenv("DRYRUN") == "1")

publish.py

@@ -44,6 +44,7 @@ mypy = ">=0.991,<1.14"
 pre-commit = ">=2.20,<4.0"
 taskipy = "^1.10.3"
 pytest = ">=7.2.2,<9.0.0"
+natsort = "^8.4.0"
 
 [tool.poetry.scripts]
 openapi-generator-cli = "openapi_generator_cli:cli"
@@ -66,6 +67,9 @@ lint.ignore = [
 lint.per-file-ignores."publish.py" = [
   "T201", # `print` found
 ]
+lint.per-file-ignores."tests/test_*.py" = [
+  "S101", # Use of `assert` detected
+]
 
 [tool.mypy]
 pretty = true