itw-python-builder 0.1.34__tar.gz → 0.1.37__tar.gz

{itw_python_builder-0.1.34 → itw_python_builder-0.1.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.34
+Version: 0.1.37
 Summary: Standardized Django deployment pipeline with Docker, testing, and SonarQube integration
 Author-email: IT-Works <contact@it-works.io>
 License: MIT

{itw_python_builder-0.1.34 → itw_python_builder-0.1.37}/itw_python_builder/tasks.py

@@ -61,9 +61,18 @@ def build_frontend(ctx: Context, branch: str, ssr: bool = False) -> None:
 
 def package_dist(ctx: Context) -> None:
     """Tar the dist/ output directory into dist.tar.gz."""
-    if not os.path.isdir(os.path.join(os.getcwd(), 'dist')):
+    dist_dir = os.path.join(os.getcwd(), 'dist')
+    if not os.path.isdir(dist_dir):
         raise RuntimeError('No dist/ directory found after build — did `ng build` succeed?')
-    ctx.run('tar -czf dist.tar.gz -C dist .')
+
+    target_dir = dist_dir
+    if not is_ssr_project():
+        for root, dirs, files in os.walk(dist_dir):
+            if 'index.html' in files:
+                target_dir = root
+                break
+
+    ctx.run(f'tar -czf dist.tar.gz -C "{target_dir}" .')
 
 
 _GITLAB_API_HOST_MAP = {
@@ -150,6 +159,15 @@ def taginit(ctx: Context) -> None:
     save_version(version)
 
 
+def _ensure_unique_tag(ctx: Context, version: Version) -> None:
+    """If the tag already exists, auto-increment RC if it's an RC, or abort if it's a release."""
+    while ctx.run(f'git rev-parse -q --verify "refs/tags/{version}"', warn=True, hide=True).ok:
+        if version.release_candidate == 0:
+            raise RuntimeError(f"Tag {version} already exists! Aborting before pipeline to prevent overwrite.")
+        print(f"[itw] Tag {version} already exists, auto-incrementing release candidate...")
+        version.increment_release_candidate()
+
+
 @task
 def incrementrc(ctx: Context, skip_pipeline=False, pylintrc=None, ssr=False) -> None:
     """Increment release candidate version and deploy. Use --ssr for Angular SSR builds."""
@@ -158,6 +176,7 @@ def incrementrc(ctx: Context, skip_pipeline=False, pylintrc=None, ssr=False) ->
     project_type = detect_project_type()
     version = read_version(ctx)
     version.increment_release_candidate()
+    _ensure_unique_tag(ctx, version)
     if project_type == 'backend':
         lint(ctx, pylintrc=pylintrc)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
@@ -172,6 +191,7 @@ def incrementpatch(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     production = check_branch(ctx)
     version = read_version(ctx)
     version.increment_patch(release=production)
+    _ensure_unique_tag(ctx, version)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
     save_version(version)
     commit_version(ctx, version)
@@ -184,6 +204,7 @@ def incrementminor(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     production = check_branch(ctx)
     version = read_version(ctx)
     version.increment_minor(release=production)
+    _ensure_unique_tag(ctx, version)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
     save_version(version)
     commit_version(ctx, version)
@@ -196,6 +217,7 @@ def incrementmajor(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     production = check_branch(ctx)
     version = read_version(ctx)
     version.increment_major(release=production)
+    _ensure_unique_tag(ctx, version)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
     save_version(version)
     commit_version(ctx, version)
@@ -209,6 +231,7 @@ def release(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     login(ctx)
     version = read_version(ctx)
     version.reset_release_candidate(release=True)
+    _ensure_unique_tag(ctx, version)
     tag_build_push(ctx, version, skip_pipeline, ssr=ssr)
     save_version(version)
     commit_version(ctx, version)

{itw_python_builder-0.1.34 → itw_python_builder-0.1.37}/itw_python_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.34
+Version: 0.1.37
 Summary: Standardized Django deployment pipeline with Docker, testing, and SonarQube integration
 Author-email: IT-Works <contact@it-works.io>
 License: MIT

{itw_python_builder-0.1.34 → itw_python_builder-0.1.37}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itw_python_builder"
-version = "0.1.34"
+version = "0.1.37"
 description = "Standardized Django deployment pipeline with Docker, testing, and SonarQube integration"
 readme = "README.md"
 requires-python = ">=3.10"