itw-python-builder 0.2.8__tar.gz → 0.2.11__tar.gz

{itw_python_builder-0.2.8 → itw_python_builder-0.2.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.2.8
+Version: 0.2.11
 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.2.8 → itw_python_builder-0.2.11}/itw_python_builder/task_utils.py

@@ -141,10 +141,37 @@ def _strip_milestone_wrap(raw: str) -> str:
     return raw
 
 
+_CRED_KEYS = ('glab_host', 'glab_username', 'glab_token')
+
+
+def extract_glab_credentials(file_path: str) -> dict:
+    """Scan md file for /glab_host, /glab_username, /glab_token top-level directives."""
+    with open(file_path, 'r', encoding='utf-8') as fp:
+        content = fp.read().replace('\r\n', '\n')
+    creds = {k: None for k in _CRED_KEYS}
+    for line in content.splitlines():
+        stripped = line.strip()
+        for key in _CRED_KEYS:
+            m = re.match(rf'^/{key}\s+(\S+)\s*$', stripped, re.IGNORECASE)
+            if m:
+                creds[key] = m.group(1)
+                break
+    return creds
+
+
+def strip_glab_credentials_lines(content: str) -> str:
+    """Remove /glab_* lines so they don't leak into issue bodies."""
+    pattern = re.compile(
+        rf'(?im)^\s*/(?:{"|".join(_CRED_KEYS)})\s+\S+\s*$\n?'
+    )
+    return pattern.sub('', content)
+
+
 def parse_md_issues(file_path: str) -> list:
     """Parse a markdown file into structured issue dicts separated by '==='."""
     with open(file_path, 'r', encoding='utf-8') as fp:
         content = fp.read().replace('\r\n', '\n')
+    content = strip_glab_credentials_lines(content)
     blocks = re.split(r'(?m)^\s*===\s*$', content)
     issues = []
     for idx, block in enumerate(blocks, start=1):
@@ -171,18 +198,7 @@ def _parse_single_issue(block: str, idx: int, file_path: str) -> dict:
             'but no closing "## Comment" tag.'
         )
 
-    lines = block.splitlines()
-    title = None
-    body_start = 0
-    for i, line in enumerate(lines):
-        if line.strip():
-            title = line.lstrip('#').strip()
-            body_start = i + 1
-            break
-    if not title:
-        raise RuntimeError(f'Block {idx} in {file_path}: missing title (first non-empty line).')
-
-    remaining = '\n'.join(lines[body_start:])
+    remaining = block
 
     comment_text = None
     if len(cm_headers) >= 2:
@@ -198,6 +214,7 @@ def _parse_single_issue(block: str, idx: int, file_path: str) -> dict:
             acceptance_text = m.group(1).strip()
             remaining = _RE_AC_BLOCK.sub('', remaining, count=1)
 
+    title = None
     repo = None
     milestone = None
     milestone_start = None
@@ -210,6 +227,10 @@ def _parse_single_issue(block: str, idx: int, file_path: str) -> dict:
     for line in remaining.splitlines():
         stripped = line.strip()
 
+        m = re.match(r'^/title\s+(.+)$', stripped, re.IGNORECASE)
+        if m:
+            title = m.group(1).strip()
+            continue
         m = re.match(r'^/repo\s+(\S+)\s*$', stripped, re.IGNORECASE)
         if m:
             repo = m.group(1)
@@ -238,6 +259,11 @@ def _parse_single_issue(block: str, idx: int, file_path: str) -> dict:
 
         body_lines.append(line)
 
+    if not title:
+        raise RuntimeError(
+            f'Block {idx} in {file_path}: missing title. Add a "/title <text>" line to the block.'
+        )
+
     body = '\n'.join(body_lines).strip()
     return {
         'title': title,

{itw_python_builder-0.2.8 → itw_python_builder-0.2.11}/itw_python_builder/tasks.py

@@ -34,6 +34,7 @@ from itw_python_builder.task_utils import (
     resolve_pm_repo,
     create_gitlab_issue,
     parse_md_issues,
+    extract_glab_credentials,
     build_issue_description,
     get_project_by_path,
     find_project_milestone,
@@ -131,20 +132,38 @@ def create_task(ctx: Context, file=None):
         raise RuntimeError(f'File must be .md, got {file!r}.')
     if not os.path.isfile(file):
         raise RuntimeError(f'File not found: {file}')
-    if not os.path.isdir(os.path.join(os.getcwd(), '.git')):
-        raise RuntimeError('Not a git repository (no .git folder here).')
+
+    creds = extract_glab_credentials(file)
+    provided = [k for k, v in creds.items() if v]
+    if provided and len(provided) != 3:
+        missing = [k for k, v in creds.items() if not v]
+        log_red(
+            f'Partial GitLab credentials in {file}: missing {", ".join("/" + m for m in missing)}. '
+            'Provide all of /glab_host, /glab_username, /glab_token or none.'
+        )
+        sys.exit(1)
+
+    if provided:
+        host = creds['glab_host']
+        token = creds['glab_token']
+        api_host = _GITLAB_API_HOST_MAP.get(host, host)
+        project_path = None
+        log_info(f'Using {host} and given credentials to authenticate in GitLab')
+    else:
+        if not os.path.isdir(os.path.join(os.getcwd(), '.git')):
+            raise RuntimeError('Not a git repository (no .git folder here).')
+        log_green('Using .git in current directory to authenticate in GitLab')
+        token = ensure_gitlab_token(ctx)
+        host, project_path = _parse_gitlab_remote(ctx)
+        api_host = _GITLAB_API_HOST_MAP.get(host, host)
 
     try:
         issues = parse_md_issues(file)
     except RuntimeError as exc:
         log_red(str(exc))
-        raise
+        sys.exit(1)
     print(f'[itw] Parsed {len(issues)} issue(s) from {file}.')
 
-    token = ensure_gitlab_token(ctx)
-    host, project_path = _parse_gitlab_remote(ctx)
-    api_host = _GITLAB_API_HOST_MAP.get(host, host)
-
     for idx, issue in enumerate(issues, start=1):
         print(f'\n[itw] Issue {idx}/{len(issues)}: {issue["title"]}')
         try:
@@ -199,6 +218,11 @@ def _resolve_target_project(api_host: str, project_path: str, issue: dict, token
         log_info(f'Using {issue["repo"]} repo')
         return get_project_by_path(api_host, issue['repo'], token)
 
+    if not project_path:
+        raise RuntimeError(
+            'No /repo defined and no .git directory to auto-detect from. '
+            'Add a /repo directive to the block or run inside a git repo.'
+        )
     log_green(f'Using current git repo {project_path}')
     candidates = resolve_pm_repo(api_host, project_path, token)
     if not candidates:
@@ -433,12 +457,14 @@ def taginit(ctx: Context) -> None:
 
 
 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."""
+    """If the tag already exists, auto-increment RC (RC tags) or patch (release tags)."""
     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()
+            print(f"[itw] Tag {version} already exists, auto-incrementing patch...")
+            version.increment_patch(release=True)
+        else:
+            print(f"[itw] Tag {version} already exists, auto-incrementing release candidate...")
+            version.increment_release_candidate()
 
 
 @task

itw_python_builder-0.2.11/itw_python_builder/templates/new_version_email.html

@@ -0,0 +1,105 @@
+<!DOCTYPE html>
+<html lang="sq">
+<head>
+  <meta charset="UTF-8">
+  <title>itw-python-builder — Version i ri</title>
+  <style>
+    .email-body {
+      margin: 0;
+      padding: 0;
+      background: #f4f6f8;
+      font-family: Arial, Helvetica, sans-serif;
+      color: #1f2937;
+    }
+    .outer-table {
+      background: #f4f6f8;
+      padding: 24px 0;
+    }
+    .container-table {
+      background: #ffffff;
+      border-radius: 8px;
+      overflow: hidden;
+      box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
+    }
+    .header-cell {
+      background: #0f172a;
+      color: #ffffff;
+      padding: 20px 28px;
+    }
+    .header-title {
+      margin: 0;
+      font-size: 20px;
+    }
+    .content-cell {
+      padding: 28px;
+    }
+    .text-paragraph {
+      margin: 0 0 16px 0;
+      font-size: 15px;
+    }
+    .text-label {
+      margin: 0 0 8px 0;
+      font-size: 15px;
+    }
+    .commit-box {
+      background: #f3f4f6;
+      border-left: 4px solid #0f172a;
+      padding: 12px 16px;
+      font-size: 14px;
+      line-height: 1.5;
+      color: #374151;
+      margin: 0 0 20px 0;
+    }
+    .command-box {
+      background: #0f172a;
+      color: #f9fafb;
+      padding: 14px 16px;
+      border-radius: 6px;
+      font-size: 13px;
+      overflow-x: auto;
+      margin: 0 0 20px 0;
+      -webkit-user-select: all;
+      -moz-user-select: all;
+      -ms-user-select: all;
+      user-select: all;
+      cursor: pointer;
+    }
+    .footer-text {
+      margin: 0;
+      font-size: 13px;
+      color: #6b7280;
+    }
+  </style>
+</head>
+<body class="email-body">
+  <table role="presentation" width="100%" cellpadding="0" cellspacing="0" class="outer-table">
+    <tr>
+      <td align="center">
+        <table role="presentation" width="600" cellpadding="0" cellspacing="0" class="container-table">
+          <tr>
+            <td class="header-cell">
+              <h1 class="header-title">itw-python-builder — Version i ri</h1>
+            </td>
+          </tr>
+          <tr>
+            <td class="content-cell">
+              <p class="text-paragraph">Përshëndetje kolegë,</p>
+              <p class="text-paragraph">
+                Një version i ri i paketës <strong>itw-python-builder</strong> është publikuar:
+                <strong>{VERSION}</strong>.
+              </p>
+              <p class="text-label"><strong>Mesazhi i commit-it:</strong></p>
+              <div class="commit-box">
+                {COMMIT_MESSAGE}
+              </div>
+              <p class="text-label"><strong>Komanda për të bërë upgrade:</strong></p>
+              <pre class="command-box" title="Kliko për të përzgjedhur të gjithë komandën">pip install itw-python-builder=={VERSION} --no-cache-dir</pre>
+              <p class="footer-text">Faleminderit</p>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+  </table>
+</body>
+</html>

{itw_python_builder-0.2.8 → itw_python_builder-0.2.11}/itw_python_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.2.8
+Version: 0.2.11
 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.2.8 → itw_python_builder-0.2.11}/pyproject.toml

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

itw_python_builder-0.2.8/itw_python_builder/templates/new_version_email.html

@@ -1,38 +0,0 @@
-<!DOCTYPE html>
-<html lang="sq">
-<head>
-  <meta charset="UTF-8">
-  <title>itw-python-builder — Version i ri</title>
-</head>
-<body style="margin:0;padding:0;background:#f4f6f8;font-family:Arial,Helvetica,sans-serif;color:#1f2937;">
-  <table role="presentation" width="100%" cellpadding="0" cellspacing="0" style="background:#f4f6f8;padding:24px 0;">
-    <tr>
-      <td align="center">
-        <table role="presentation" width="600" cellpadding="0" cellspacing="0" style="background:#ffffff;border-radius:8px;overflow:hidden;box-shadow:0 1px 3px rgba(0,0,0,0.08);">
-          <tr>
-            <td style="background:#0f172a;color:#ffffff;padding:20px 28px;">
-              <h1 style="margin:0;font-size:20px;">itw-python-builder — Version i ri</h1>
-            </td>
-          </tr>
-          <tr>
-            <td style="padding:28px;">
-              <p style="margin:0 0 16px 0;font-size:15px;">Përshëndetje kolegë,</p>
-              <p style="margin:0 0 16px 0;font-size:15px;">
-                Një version i ri i paketës <strong>itw-python-builder</strong> është publikuar:
-                <strong>{VERSION}</strong>.
-              </p>
-              <p style="margin:0 0 8px 0;font-size:15px;"><strong>Mesazhi i commit-it:</strong></p>
-              <div style="background:#f3f4f6;border-left:4px solid #0f172a;padding:12px 16px;font-size:14px;line-height:1.5;color:#374151;margin:0 0 20px 0;">
-                {COMMIT_MESSAGE}
-              </div>
-              <p style="margin:0 0 8px 0;font-size:15px;"><strong>Komanda për të bërë upgrade:</strong></p>
-              <pre style="background:#0f172a;color:#f9fafb;padding:14px 16px;border-radius:6px;font-size:13px;overflow-x:auto;margin:0 0 20px 0;">pip install itw-python-builder=={VERSION} --no-cache-dir</pre>
-              <p style="margin:0;font-size:13px;color:#6b7280;">Faleminderit</p>
-            </td>
-          </tr>
-        </table>
-      </td>
-    </tr>
-  </table>
-</body>
-</html>