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

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

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

@@ -88,7 +88,6 @@ def _parse_angular_env_file(path: str) -> dict:
 
 
 def load_env(ctx: Context = None):
-    """Load env vars. Backend → .env in cwd. Frontend → src/environments/environment[.<branch>].ts."""
     if detect_project_type() == 'frontend':
         env_dir = os.path.join(os.getcwd(), 'src', 'environments')
         candidates = []
@@ -96,11 +95,10 @@ def load_env(ctx: Context = 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'))
-        env_path = next((p for p in candidates if os.path.exists(p)), None)
-        if not env_path:
-            return
-        for key, value in _parse_angular_env_file(env_path).items():
-            os.environ.setdefault(key, value)
+        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')
@@ -145,21 +143,15 @@ def get_latest_tag(ctx: Context) -> Version:
 
 
 def _update_package_json_version(version: Version) -> None:
-    """Rewrite only the `"version": "..."` line in package.json, preserving formatting."""
+    """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:
-        content = fp.read()
-    new_content, n = re.subn(
-        r'(^\s*"version"\s*:\s*")[^"]*(")',
-        lambda m: f'{m.group(1)}{version.bare_semver()}{m.group(2)}',
-        content,
-        count=1,
-        flags=re.MULTILINE,
-    )
-    if n == 0:
-        raise RuntimeError(f'Could not find "version" field in {pkg_path}')
+        data = json.load(fp)
+    data['version'] = version.bare_semver()
     with open(pkg_path, 'w', encoding='utf-8') as fp:
-        fp.write(new_content)
+        json.dump(data, fp, indent=2)
+        fp.write('\n')
 
 
 def read_version(ctx: Context) -> Version:
@@ -200,17 +192,76 @@ 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:
@@ -255,6 +306,11 @@ def tag_build_push(ctx: Context, version: Version, skip_pipeline: bool = False)
     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)
 
@@ -272,9 +328,8 @@ def taginit(ctx: Context) -> None:
 def incrementrc(ctx: Context, skip_pipeline=False, pylintrc=None) -> None:
     """Increment release candidate version and deploy"""
     check_branch(ctx)
+    login(ctx)
     project_type = detect_project_type()
-    if project_type == 'backend':
-        login(ctx)
     version = read_version(ctx)
     version.increment_release_candidate()
     if project_type == 'backend':
@@ -325,8 +380,7 @@ def incrementmajor(ctx: Context, skip_pipeline=False) -> None:
 def release(ctx: Context, skip_pipeline=False) -> None:
     """Promote release candidate to stable release and deploy"""
     _ = check_branch(ctx)
-    if detect_project_type() == 'backend':
-        login(ctx)
+    login(ctx)
     version = read_version(ctx)
     version.reset_release_candidate(release=True)
     tag_build_push(ctx, version, skip_pipeline)
@@ -407,9 +461,10 @@ def analyze(ctx: Context):
 
 @task
 def buildlocal(ctx: Context):
-    """Build locally (Docker image for backend, npm build for frontend)"""
+    """Build locally (Docker image for backend, ng build for frontend)"""
     if detect_project_type() == 'frontend':
-        ctx.run('npm run build')
+        branch = get_current_branch(ctx)
+        build_frontend(ctx, branch)
         print('✓ Built frontend (dist/)')
         return
     current_branch = get_current_branch(ctx)

{itw_python_builder-0.1.25 → 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.25
+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.25 → 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.25"
+version = "0.1.26"
 description = "Standardized Django deployment pipeline with Docker, testing, and SonarQube integration"
 readme = "README.md"
 requires-python = ">=3.10"