itw-python-builder 0.2.9__tar.gz → 0.2.12__tar.gz

{itw_python_builder-0.2.9 → itw_python_builder-0.2.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.2.9
+Version: 0.2.12
 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.9 → itw_python_builder-0.2.12}/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.9 → itw_python_builder-0.2.12}/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,
@@ -46,6 +47,7 @@ from itw_python_builder.task_utils import (
 from itw_python_builder.version import Version
 
 PYLINTRC = Path(__file__).parent / ".pylintrc"
+TASK_TEMPLATE_PATH = Path(__file__).parent / "templates" / "task_template.md"
 
 
 def _prompt_and_store_token(ctx: Context, username: str = None) -> str:
@@ -122,6 +124,17 @@ def logout(ctx: Context):
     os.environ.pop('GITLAB_USERNAME', None)
 
 
+@task(name='task-init')
+def task_init(ctx: Context) -> None:
+    """Create a TASK.md template with every /directive and section supported by `itw task`."""
+    dest = os.path.join(os.getcwd(), 'TASK.md')
+    if os.path.exists(dest):
+        log_red('TASK.md already exists in this directory — refusing to overwrite.')
+        sys.exit(1)
+    shutil.copyfile(TASK_TEMPLATE_PATH, dest)
+    log_green(f'Created TASK.md in {os.getcwd()}')
+
+
 @task(name='task')
 def create_task(ctx: Context, file=None):
     """Create GitLab issues in the group's _pm repo from a markdown file (--file path.md)."""
@@ -131,20 +144,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 +230,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 +469,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
@@ -527,11 +565,52 @@ def release(ctx: Context, skip_pipeline=False, ssr=False) -> None:
     propagate_changelog(ctx)
 
 
+def _list_spec_files() -> list:
+    root = Path(os.getcwd())
+    return [
+        p.relative_to(root)
+        for p in root.glob('**/*.spec.ts')
+        if 'node_modules' not in p.parts
+    ]
+
+
+def _resolve_spec_include(target: str) -> str:
+    if '/' in target or '*' in target:
+        return target
+    if target.endswith('.spec.ts'):
+        return f'**/{target}'
+
+    name = target.removesuffix('.ts')
+    specs = _list_spec_files()
+    if any(name in spec.parts[:-1] for spec in specs):
+        return f'**/{name}/**/*.spec.ts'
+    if any(spec.name == f'{name}.spec.ts' for spec in specs):
+        return f'**/{name}.spec.ts'
+    if '.' in name:
+        head, rest = name.split('.', 1)
+        if any(head in spec.parts[:-1] and spec.name == f'{rest}.spec.ts' for spec in specs):
+            return f'**/{head}/**/{rest}.spec.ts'
+
+    raise RuntimeError(
+        f'No spec files match --target={target!r}. Expected a directory name '
+        f'(e.g. --target=core), a spec name (e.g. --target=core.service), or a path/glob.'
+    )
+
+
+def _resolve_django_label(target: str) -> str:
+    return target.strip().removesuffix('.py').replace('/', '.').strip('.')
+
+
 @task
-def test(ctx: Context, settings='backend.test_settings', warn=True):
-    """Run tests with coverage."""
+def test(ctx: Context, settings='backend.test_settings', target=None, warn=True):
+    """Run tests with coverage. --target=app or --target=app.test_file runs a subset."""
     if detect_project_type() == 'frontend':
-        ctx.run('npx ng test --no-watch --code-coverage --browsers=ChromeHeadlessNoSandbox', warn=warn)
+        cmd = 'npx ng test --no-watch --code-coverage --browsers=ChromeHeadlessNoSandbox'
+        if target:
+            include = _resolve_spec_include(target)
+            print(f'[itw] Limiting run to specs matching {include}')
+            cmd += f' --include="{include}"'
+        ctx.run(cmd, warn=warn)
         print("✓ Tests completed")
         return
     detect_and_activate_venv()
@@ -540,16 +619,23 @@ def test(ctx: Context, settings='backend.test_settings', warn=True):
     patch_dir = str(Path(__file__).parent / '_pyruntime')
     existing_pp = os.environ.get('PYTHONPATH', '')
     injected_pp = f'{patch_dir}:{existing_pp}' if existing_pp else patch_dir
+    label = ''
+    if target:
+        label = f' {_resolve_django_label(target)}'
+        print(f'[itw] Limiting run to{label}')
     try:
         ctx.run(
-            f'python -m coverage run manage.py test --settings={settings} --noinput -v 2',
+            f'python -m coverage run manage.py test{label} --settings={settings} --noinput -v 2',
             warn=warn,
             env={'PYTHONPATH': injected_pp},
         )
     finally:
         terminate_stale_test_db_sessions(ctx, settings)
-    ctx.run('python -m coverage report -m')
-    ctx.run('python -m coverage xml -o coverage.xml')
+    if target:
+        ctx.run('python -m coverage report -m --fail-under=0')
+    else:
+        ctx.run('python -m coverage report -m')
+        ctx.run('python -m coverage xml -o coverage.xml')
     print("✓ Tests completed")
 
 

itw_python_builder-0.2.12/itw_python_builder/templates/task_template.md

@@ -0,0 +1,27 @@
+<!-- OPTIONAL -->
+/glab_host <gitlab-host>
+/glab_username <gitlab-username>
+/glab_token <personal-access-token>
+
+<!-- REQUIRED -->
+/title <issue title>
+
+<!-- OPTIONAL -->
+/repo namespace/project
+/milestone %"Milestone name"
+/milestone-start YYYY-MM-DD
+/milestone-end YYYY-MM-DD
+/assignee @username
+/estimate 2h
+/due YYYY-MM-DD
+
+<!-- OPTIONAL -->
+## Acceptance Criteria
+- [ ] 
+- [ ] 
+## Acceptance Criteria
+
+<!-- OPTIONAL -->
+## Comment
+
+## Comment

{itw_python_builder-0.2.9 → itw_python_builder-0.2.12}/itw_python_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.2.9
+Version: 0.2.12
 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.9 → itw_python_builder-0.2.12}/itw_python_builder.egg-info/SOURCES.txt

@@ -19,4 +19,5 @@ itw_python_builder.egg-info/top_level.txt
 itw_python_builder/_pyruntime/sitecustomize.py
 itw_python_builder/templates/new_version_email.html
 itw_python_builder/templates/server.sitemap.snippet.ts
-itw_python_builder/templates/sitemap.routes.ts
+itw_python_builder/templates/sitemap.routes.ts
+itw_python_builder/templates/task_template.md

{itw_python_builder-0.2.9 → itw_python_builder-0.2.12}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "itw_python_builder"
-version = "0.2.9"
+version = "0.2.12"
 description = "Standardized Django deployment pipeline with Docker, testing, and SonarQube integration"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -41,7 +41,7 @@ Issues = "https://git.it-works.io/"
 include-package-data = true
 
 [tool.setuptools.package-data]
-itw_python_builder = [".pylintrc", "templates/*.ts", "templates/*.html", "_pyruntime/*.py"]
+itw_python_builder = [".pylintrc", "templates/*.ts", "templates/*.html", "templates/*.md", "_pyruntime/*.py"]
 
 [project.scripts]
 itw = "itw_python_builder.cli:main"