itw-python-builder 0.1.24__tar.gz → 0.1.26__tar.gz

{itw_python_builder-0.1.24 → itw_python_builder-0.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: itw_python_builder
-Version: 0.1.24
+Version: 0.1.26
 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.24 → itw_python_builder-0.1.26}/itw_python_builder/tasks.py

@@ -3,6 +3,7 @@ from itw_python_builder.version import Version
 import getpass
 import io
 import os
+import re
 from datetime import datetime
 from pathlib import Path
 
@@ -78,8 +79,27 @@ def detect_and_activate_venv():
     print(f"[itw] Using venv: {venv_path}")
     _venv_activated = True
 
-def load_env():
-    """Load .env file from current directory into os.environ."""
+def _parse_angular_env_file(path: str) -> dict:
+    """Extract string-valued keys from an Angular environment.ts object literal."""
+    with open(path, 'r', encoding='utf-8') as fp:
+        content = fp.read()
+    pattern = re.compile(r"""^\s*([A-Za-z_][A-Za-z0-9_]*)\s*:\s*['"]([^'"]*)['"]""", re.MULTILINE)
+    return dict(pattern.findall(content))
+
+
+def load_env(ctx: Context = None):
+    if detect_project_type() == 'frontend':
+        env_dir = os.path.join(os.getcwd(), 'src', 'environments')
+        candidates = []
+        if ctx is not None:
+            branch = get_current_branch(ctx)
+            candidates.append(os.path.join(env_dir, f'environment.{branch}.ts'))
+        candidates.append(os.path.join(env_dir, 'environment.ts'))
+        for path in candidates:
+            if os.path.exists(path):
+                for key, value in _parse_angular_env_file(path).items():
+                    os.environ.setdefault(key, value)
+        return
     from decouple import Config, RepositoryEnv
     env_path = os.path.join(os.getcwd(), '.env')
     if not os.path.exists(env_path):
@@ -122,6 +142,33 @@ def get_latest_tag(ctx: Context) -> Version:
     return Version.parse(latest_tag)
 
 
+def _update_package_json_version(version: Version) -> None:
+    """Update the top-level `version` in package.json (preserves key order)."""
+    import json
+    pkg_path = os.path.join(os.getcwd(), 'package.json')
+    with open(pkg_path, 'r', encoding='utf-8') as fp:
+        data = json.load(fp)
+    data['version'] = version.bare_semver()
+    with open(pkg_path, 'w', encoding='utf-8') as fp:
+        json.dump(data, fp, indent=2)
+        fp.write('\n')
+
+
+def read_version(ctx: Context) -> Version:
+    """Read current version. Backend → VERSION file. Frontend → latest git tag."""
+    if detect_project_type() == 'frontend':
+        return get_latest_tag(ctx)
+    return Version.read_from_file()
+
+
+def save_version(version: Version) -> None:
+    """Persist version. Backend → VERSION file. Frontend → package.json (bare semver)."""
+    if detect_project_type() == 'frontend':
+        _update_package_json_version(version)
+        return
+    version.save_to_file()
+
+
 def generate_image_path(ctx: Context, branch: str) -> str:
     result = ctx.run('git remote get-url origin')
     result = result.stdout.splitlines()[0]
@@ -145,21 +192,83 @@ def get_gitlab_username(ctx: Context) -> str:
 
 @task
 def login(ctx: Context, username=None):
-    """Log in to the GitLab container registry."""
+    """Capture GitLab token. Backend also logs into the container registry."""
     if not username:
         username = get_gitlab_username(ctx)
-    print(f'Logging in to gitreg.it-works.io:443 as {username}')
-    token = getpass.getpass(f'Enter GitLab token (password) for {username}: ')
+    token = getpass.getpass(f'Enter GitLab token for {username}: ')
     if not token:
         raise RuntimeError('No token entered; aborting login.')
+    os.environ['GITLAB_TOKEN'] = token
+    os.environ['GITLAB_USERNAME'] = username
+    if detect_project_type() == 'backend':
+        print(f'Logging in to gitreg.it-works.io:443 as {username}')
+        ctx.run(
+            f'podman login -u {username} --password-stdin gitreg.it-works.io:443 --tls-verify=false',
+            in_stream=io.StringIO(token)
+        )
+    else:
+        print(f'[itw] GitLab token captured for {username} (will be used for package upload).')
+
+
+def _read_package_name() -> str:
+    """Read 'name' field from package.json in cwd."""
+    import json
+    pkg_path = os.path.join(os.getcwd(), 'package.json')
+    with open(pkg_path, 'r', encoding='utf-8') as fp:
+        return json.load(fp)['name']
+
+
+def _parse_gitlab_remote(ctx: Context) -> tuple:
+    """Return (host, project_path) parsed from `git remote get-url origin`."""
+    result = ctx.run('git remote get-url origin', hide=True)
+    url = result.stdout.strip()
+    if url.endswith('.git'):
+        url = url[:-4]
+    if url.startswith('git@'):
+        host, path = url.split('@', 1)[1].split(':', 1)
+    elif '://' in url:
+        host, path = url.split('://', 1)[1].split('/', 1)
+    else:
+        raise RuntimeError(f'Cannot parse GitLab remote URL: {url}')
+    return host, path
+
+
+def build_frontend(ctx: Context, branch: str) -> None:
+    """Build the Angular app. Master branch → production config; otherwise staging."""
+    config = 'production' if branch == 'master' else 'staging'
+    ctx.run(f'npx ng build --configuration={config}')
+
+
+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')):
+        raise RuntimeError('No dist/ directory found after build — did `ng build` succeed?')
+    ctx.run('tar -czf dist.tar.gz -C dist .')
+
+
+def upload_dist(ctx: Context, version) -> None:
+    """Upload dist.tar.gz to this project's GitLab Generic Package Registry under <version>/."""
+    from urllib.parse import quote
+    if not os.environ.get('GITLAB_TOKEN'):
+        raise RuntimeError('GITLAB_TOKEN not set; run `itw login` first.')
+    host, path = _parse_gitlab_remote(ctx)
+    encoded = quote(path, safe='')
+    url = f'https://{host}/api/v4/projects/{encoded}/packages/generic/frontend/{version}/dist.tar.gz'
+    print(f'[itw] Uploading dist.tar.gz → {url}')
     ctx.run(
-        f'podman login -u {username} --password-stdin gitreg.it-works.io:443 --tls-verify=false',
-        in_stream=io.StringIO(token)
+        'curl --fail --silent --show-error '
+        '--header "PRIVATE-TOKEN: $GITLAB_TOKEN" '
+        '--upload-file dist.tar.gz '
+        f'"{url}"'
     )
+    print('[itw] Upload complete.')
 
 
 def commit_version(ctx: Context, version: Version) -> None:
-    ctx.run(f'git add {Version.VERSION_FILE_NAME}')
+    if detect_project_type() == 'frontend':
+        ctx.run('git add package.json')
+    else:
+        ctx.run(f'git add {Version.VERSION_FILE_NAME}')
     ctx.run('git add CHANGELOG.md')
     ctx.run(f'git commit -m \'version update to {version}\'')
 
@@ -189,12 +298,19 @@ def pushimage(ctx: Context):
 
 
 def tag_build_push(ctx: Context, version: Version, skip_pipeline: bool = False) -> None:
+    project_type = detect_project_type()
     if not skip_pipeline:
         test(ctx)
         analyze(ctx)
     tag(ctx, version)
-    buildimage(ctx)
-    pushimage(ctx)
+    if project_type == 'backend':
+        buildimage(ctx)
+        pushimage(ctx)
+    else:
+        branch = get_current_branch(ctx)
+        build_frontend(ctx, branch)
+        package_dist(ctx)
+        upload_dist(ctx, version)
     changelog(ctx, version)
     push(ctx)
 
@@ -205,7 +321,7 @@ def taginit(ctx: Context) -> None:
     check_branch(ctx)
     version = Version(0, 1, 0, 1)
     tag(ctx, version)
-    version.save_to_file()
+    save_version(version)
 
 
 @task
@@ -213,11 +329,13 @@ def incrementrc(ctx: Context, skip_pipeline=False, pylintrc=None) -> None:
     """Increment release candidate version and deploy"""
     check_branch(ctx)
     login(ctx)
-    version = Version.read_from_file()
+    project_type = detect_project_type()
+    version = read_version(ctx)
     version.increment_release_candidate()
-    lint(ctx, pylintrc=pylintrc)
+    if project_type == 'backend':
+        lint(ctx, pylintrc=pylintrc)
     tag_build_push(ctx, version, skip_pipeline)
-    version.save_to_file()
+    save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
 
@@ -226,10 +344,10 @@ def incrementrc(ctx: Context, skip_pipeline=False, pylintrc=None) -> None:
 def incrementpatch(ctx: Context, skip_pipeline=False) -> None:
     """Increment patch version, build, and deploy"""
     production = check_branch(ctx)
-    version = Version.read_from_file()
+    version = read_version(ctx)
     version.increment_patch(release=production)
     tag_build_push(ctx, version, skip_pipeline)
-    version.save_to_file()
+    save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
 
@@ -238,10 +356,10 @@ def incrementpatch(ctx: Context, skip_pipeline=False) -> None:
 def incrementminor(ctx: Context, skip_pipeline=False) -> None:
     """Increment minor version, build, and deploy"""
     production = check_branch(ctx)
-    version = Version.read_from_file()
+    version = read_version(ctx)
     version.increment_minor(release=production)
     tag_build_push(ctx, version, skip_pipeline)
-    version.save_to_file()
+    save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
 
@@ -250,10 +368,10 @@ def incrementminor(ctx: Context, skip_pipeline=False) -> None:
 def incrementmajor(ctx: Context, skip_pipeline=False) -> None:
     """Increment major version, build, and deploy"""
     production = check_branch(ctx)
-    version = Version.read_from_file()
+    version = read_version(ctx)
     version.increment_major(release=production)
     tag_build_push(ctx, version, skip_pipeline)
-    version.save_to_file()
+    save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
 
@@ -263,17 +381,20 @@ def release(ctx: Context, skip_pipeline=False) -> None:
     """Promote release candidate to stable release and deploy"""
     _ = check_branch(ctx)
     login(ctx)
-    version = Version.read_from_file()
+    version = read_version(ctx)
     version.reset_release_candidate(release=True)
     tag_build_push(ctx, version, skip_pipeline)
-    version.save_to_file()
+    save_version(version)
     commit_version(ctx, version)
     push_version(ctx)
 
 
 @task
 def test(ctx: Context, settings='backend.test_settings'):
-    """Run Django tests with coverage"""
+    """Run tests with coverage (Django or Angular/karma)"""
+    if detect_project_type() == 'frontend':
+        ctx.run('npx ng test --no-watch --code-coverage --browsers=ChromeHeadlessNoSandbox')
+        return
     detect_and_activate_venv()
     ctx.run(f'python -m coverage run manage.py test --settings={settings} --noinput -v 2')
     ctx.run('python -m coverage report -m')
@@ -282,7 +403,10 @@ def test(ctx: Context, settings='backend.test_settings'):
 
 @task
 def lint(ctx: Context, pylintrc=None):
-    """Run pylint, generate reports for SonarQube"""
+    """Run pylint, generate reports for SonarQube (backend only)"""
+    if detect_project_type() == 'frontend':
+        print("[itw] Skipping lint for frontend (SonarQube handles code quality)")
+        return
     detect_and_activate_venv()
     rcfile = pylintrc if pylintrc else PYLINTRC
     print("\n" + "=" * 60)
@@ -301,7 +425,10 @@ def lint(ctx: Context, pylintrc=None):
 
 @task
 def lintlocal(ctx: Context, pylintrc=None):
-    """Run pylint locally with human-readable output (no report files)"""
+    """Run pylint locally with human-readable output (backend only)"""
+    if detect_project_type() == 'frontend':
+        print("[itw] Skipping lint for frontend (SonarQube handles code quality)")
+        return
     detect_and_activate_venv()
     rcfile = pylintrc if pylintrc else PYLINTRC
     print("\n" + "=" * 60)
@@ -313,10 +440,11 @@ def lintlocal(ctx: Context, pylintrc=None):
 @task
 def analyze(ctx: Context):
     """Run SonarQube analysis"""
-    detect_and_activate_venv()
-    load_env()
+    if detect_project_type() == 'backend':
+        detect_and_activate_venv()
+    load_env(ctx)
     try:
-        version = Version.read_from_file()
+        version = read_version(ctx)
         sonar_version = str(version).lstrip('v.')
     except:
         sonar_version = "0.0.0"
@@ -333,7 +461,12 @@ def analyze(ctx: Context):
 
 @task
 def buildlocal(ctx: Context):
-    """Build Docker image locally without pushing to registry"""
+    """Build locally (Docker image for backend, ng build for frontend)"""
+    if detect_project_type() == 'frontend':
+        branch = get_current_branch(ctx)
+        build_frontend(ctx, branch)
+        print('✓ Built frontend (dist/)')
+        return
     current_branch = get_current_branch(ctx)
     local_tag = f'myapp:{current_branch}-local'
     ctx.run(f'podman build . --tag={local_tag}')
@@ -342,7 +475,11 @@ def buildlocal(ctx: Context):
 
 @task
 def testlocal(ctx: Context, settings='backend.test_settings'):
-    """Run tests locally (not in Docker)"""
+    """Run tests locally (Django or Angular/karma)"""
+    if detect_project_type() == 'frontend':
+        ctx.run('npx ng test --no-watch --code-coverage --browsers=ChromeHeadlessNoSandbox')
+        print("✓ Tests completed")
+        return
     detect_and_activate_venv()
     ctx.run(f'python -m coverage run manage.py test --settings={settings} --noinput -v 2')
     ctx.run('python -m coverage report -m')
@@ -353,11 +490,12 @@ def testlocal(ctx: Context, settings='backend.test_settings'):
 @task
 def analyzelocal(ctx: Context):
     """Run SonarQube static analysis locally"""
-    detect_and_activate_venv()
-    load_env()
+    if detect_project_type() == 'backend':
+        detect_and_activate_venv()
+    load_env(ctx)
     print("Running SonarQube analysis...")
     try:
-        version = Version.read_from_file()
+        version = read_version(ctx)
         sonar_version = str(version).lstrip('v.')
     except:
         sonar_version = "0.0.0"
@@ -376,20 +514,22 @@ def analyzelocal(ctx: Context):
 
 @task
 def pipelinelocal(ctx: Context, settings='backend.test_settings', pylintrc=None):
-    """Local pipeline: lint → test → analyze → build"""
-    detect_and_activate_venv()
-    print("=" * 60)
-    print("Step 1: Running lint...")
-    print("=" * 60)
-    lint(ctx, pylintrc=pylintrc)
+    """Local pipeline: (lint →) test → analyze"""
+    project_type = detect_project_type()
+    if project_type == 'backend':
+        detect_and_activate_venv()
+        print("=" * 60)
+        print("Step 1: Running lint...")
+        print("=" * 60)
+        lint(ctx, pylintrc=pylintrc)
 
     print("\n" + "=" * 60)
-    print("Step 2: Running tests...")
+    print(f"Step {'2' if project_type == 'backend' else '1'}: Running tests...")
     print("=" * 60)
     testlocal(ctx, settings)
 
     print("\n" + "=" * 60)
-    print("Step 3: Running SonarQube analysis...")
+    print(f"Step {'3' if project_type == 'backend' else '2'}: Running SonarQube analysis...")
     print("=" * 60)
     analyzelocal(ctx)
 
@@ -467,7 +607,7 @@ def changelog(ctx: Context, version: Version = None):
         version_str = str(version)
     else:
         try:
-            version_str = str(Version.read_from_file())
+            version_str = str(read_version(ctx))
         except:
             version_str = "Unreleased"
 

{itw_python_builder-0.1.24 → itw_python_builder-0.1.26}/itw_python_builder/version.py

@@ -76,6 +76,10 @@ class Version:
         else:
             raise ValueError(f'Invalid version: {version}')
 
+    def bare_semver(self) -> str:
+        """Return just major.minor.patch (e.g. '2.0.4') for package.json."""
+        return f'{self.major}.{self.minor}.{self.patch}'
+
     def __str__(self):
         version = f'v.{self.major}.{self.minor}.{self.patch}'
         if self.release_candidate == 0:

{itw_python_builder-0.1.24 → itw_python_builder-0.1.26}/itw_python_builder.egg-info/PKG-INFO

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

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