@capawesome/cli 4.6.0-dev.bda9e9d.1774345600 → 4.7.0

package/dist/utils/git.test.js

@@ -0,0 +1,130 @@
+import { describe, expect, it } from 'vitest';
+import { parseGitRemoteUrl } from './git.js';
+describe('parseGitRemoteUrl', () => {
+    it('should parse GitHub HTTPS URL', () => {
+        const result = parseGitRemoteUrl('https://github.com/capawesome-team/cli.git');
+        expect(result).toEqual({
+            ownerSlug: 'capawesome-team',
+            provider: 'github',
+            repositorySlug: 'cli',
+        });
+    });
+    it('should parse GitHub HTTPS URL without .git suffix', () => {
+        const result = parseGitRemoteUrl('https://github.com/capawesome-team/cli');
+        expect(result).toEqual({
+            ownerSlug: 'capawesome-team',
+            provider: 'github',
+            repositorySlug: 'cli',
+        });
+    });
+    it('should parse GitHub SSH URL', () => {
+        const result = parseGitRemoteUrl('git@github.com:capawesome-team/cli.git');
+        expect(result).toEqual({
+            ownerSlug: 'capawesome-team',
+            provider: 'github',
+            repositorySlug: 'cli',
+        });
+    });
+    it('should parse GitHub SSH URL without .git suffix', () => {
+        const result = parseGitRemoteUrl('git@github.com:capawesome-team/cli');
+        expect(result).toEqual({
+            ownerSlug: 'capawesome-team',
+            provider: 'github',
+            repositorySlug: 'cli',
+        });
+    });
+    it('should parse GitLab HTTPS URL', () => {
+        const result = parseGitRemoteUrl('https://gitlab.com/my-group/my-repo.git');
+        expect(result).toEqual({
+            ownerSlug: 'my-group',
+            provider: 'gitlab',
+            repositorySlug: 'my-repo',
+        });
+    });
+    it('should parse GitLab SSH URL', () => {
+        const result = parseGitRemoteUrl('git@gitlab.com:my-group/my-repo.git');
+        expect(result).toEqual({
+            ownerSlug: 'my-group',
+            provider: 'gitlab',
+            repositorySlug: 'my-repo',
+        });
+    });
+    it('should parse GitLab HTTPS URL with subgroup', () => {
+        const result = parseGitRemoteUrl('https://gitlab.com/my-group/my-subgroup/my-repo.git');
+        expect(result).toEqual({
+            ownerSlug: 'my-group',
+            provider: 'gitlab',
+            repositorySlug: 'my-repo',
+            projectSlug: 'my-subgroup',
+        });
+    });
+    it('should parse GitLab SSH URL with subgroup', () => {
+        const result = parseGitRemoteUrl('git@gitlab.com:my-group/my-subgroup/my-repo.git');
+        expect(result).toEqual({
+            ownerSlug: 'my-group',
+            provider: 'gitlab',
+            repositorySlug: 'my-repo',
+            projectSlug: 'my-subgroup',
+        });
+    });
+    it('should parse Bitbucket HTTPS URL', () => {
+        const result = parseGitRemoteUrl('https://bitbucket.org/my-team/my-repo.git');
+        expect(result).toEqual({
+            ownerSlug: 'my-team',
+            provider: 'bitbucket',
+            repositorySlug: 'my-repo',
+        });
+    });
+    it('should parse Bitbucket SSH URL', () => {
+        const result = parseGitRemoteUrl('git@bitbucket.org:my-team/my-repo.git');
+        expect(result).toEqual({
+            ownerSlug: 'my-team',
+            provider: 'bitbucket',
+            repositorySlug: 'my-repo',
+        });
+    });
+    it('should parse Azure DevOps HTTPS URL', () => {
+        const result = parseGitRemoteUrl('https://dev.azure.com/my-org/my-project/_git/my-repo');
+        expect(result).toEqual({
+            ownerSlug: 'my-org',
+            provider: 'azure',
+            repositorySlug: 'my-repo',
+            projectSlug: 'my-project',
+        });
+    });
+    it('should parse Azure DevOps SSH URL', () => {
+        const result = parseGitRemoteUrl('git@ssh.dev.azure.com:v3/my-org/my-project/my-repo');
+        expect(result).toEqual({
+            ownerSlug: 'my-org',
+            provider: 'azure',
+            repositorySlug: 'my-repo',
+            projectSlug: 'my-project',
+        });
+    });
+    it('should parse Visual Studio HTTPS URL', () => {
+        const result = parseGitRemoteUrl('https://my-org.visualstudio.com/my-project/_git/my-repo');
+        expect(result).toEqual({
+            ownerSlug: 'my-org',
+            provider: 'azure',
+            repositorySlug: 'my-repo',
+            projectSlug: 'my-project',
+        });
+    });
+    it('should parse GitHub HTTPS URL with credentials', () => {
+        const result = parseGitRemoteUrl('https://x-access-token:ghp_secret123@github.com/capawesome-team/cli.git');
+        expect(result).toEqual({
+            ownerSlug: 'capawesome-team',
+            provider: 'github',
+            repositorySlug: 'cli',
+        });
+    });
+    it('should throw for unsupported hostname', () => {
+        expect(() => parseGitRemoteUrl('https://example.com/owner/repo.git')).toThrow('Unsupported git provider for hostname "example.com".');
+    });
+    it('should not leak credentials in error messages', () => {
+        expect(() => parseGitRemoteUrl('https://token@example.com/owner/repo.git')).toThrow('Unsupported git provider for hostname "example.com".');
+    });
+    it('should throw for unparseable URL', () => {
+        expect(() => parseGitRemoteUrl('not-a-url')).toThrow('Could not parse git remote URL.');
+    });
+});

package/dist/utils/{build.js → job.js}

@@ -1,36 +1,39 @@
-import appBuildsService from '../services/app-builds.js';
+import jobsService from '../services/jobs.js';
 import { unescapeAnsi } from '../utils/ansi.js';
 import { wait } from '../utils/wait.js';
 import consola from 'consola';
-export const waitForBuildCompletion = async (options) => {
-    const { appId, appBuildId, relations = 'job,job.jobLogs' } = options;
+const getLabel = (job) => {
+    if (job.appBuildId) {
+        return 'build';
+    }
+    if (job.appDeploymentId) {
+        return 'deployment';
+    }
+    return 'job';
+};
+const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
+export const waitForJobCompletion = async (options) => {
+    const { jobId } = options;
     let lastPrintedLogNumber = 0;
     let isWaitingForStart = true;
     while (true) {
         try {
-            const build = await appBuildsService.findOne({
-                appId,
-                appBuildId,
-                relations,
-            });
-            if (!build.job) {
-                await wait(3000);
-                continue;
-            }
-            const jobStatus = build.job.status;
+            const job = await jobsService.findOne({ jobId, relations: 'jobLogs' });
+            const label = getLabel(job);
+            const jobStatus = job.status;
             if (jobStatus === 'queued' || jobStatus === 'pending') {
                 if (isWaitingForStart) {
-                    consola.start(`Waiting for build to start (status: ${jobStatus})...`);
+                    consola.start(`Waiting for ${label} to start (status: ${jobStatus})...`);
                 }
                 await wait(3000);
                 continue;
             }
             if (isWaitingForStart && jobStatus === 'in_progress') {
                 isWaitingForStart = false;
-                consola.success('Build started...');
+                consola.success(`${capitalize(label)} started...`);
             }
-            if (build.job.jobLogs && build.job.jobLogs.length > 0) {
-                const newLogs = build.job.jobLogs
+            if (job.jobLogs && job.jobLogs.length > 0) {
+                const newLogs = job.jobLogs
                     .filter((log) => log.number > lastPrintedLogNumber)
                     .sort((a, b) => a.number - b.number);
                 for (const log of newLogs) {
@@ -45,29 +48,29 @@ export const waitForBuildCompletion = async (options) => {
                 jobStatus === 'timed_out') {
                 console.log();
                 if (jobStatus === 'succeeded') {
-                    return build;
+                    return job;
                 }
                 else if (jobStatus === 'failed') {
-                    consola.error('Build failed.');
+                    consola.error(`${capitalize(label)} failed.`);
                     process.exit(1);
                 }
                 else if (jobStatus === 'canceled') {
-                    consola.warn('Build was canceled.');
+                    consola.error(`${capitalize(label)} was canceled.`);
                     process.exit(1);
                 }
                 else if (jobStatus === 'rejected') {
-                    consola.error('Build was rejected.');
+                    consola.error(`${capitalize(label)} was rejected.`);
                     process.exit(1);
                 }
                 else if (jobStatus === 'timed_out') {
-                    consola.error('Build timed out.');
+                    consola.error(`${capitalize(label)} timed out.`);
                     process.exit(1);
                 }
             }
             await wait(3000);
         }
         catch (error) {
-            consola.error('Error polling build status:', error);
+            consola.error('Error polling job status:', error);
             process.exit(1);
         }
     }

package/dist/utils/prompt.js

@@ -31,7 +31,7 @@ export const promptOrganizationSelection = async (options) => {
         }
     }
     // @ts-ignore wait till https://github.com/unjs/consola/pull/280 is merged
-    const organizationId = await prompt('Which organization do you want to use?', {
+    const organizationId = await prompt(options?.message ?? 'Which organization do you want to use?', {
         type: 'select',
         options: organizations.map((organization) => ({ label: organization.name, value: organization.id })),
     });

package/dist/utils/zip.js

@@ -1,12 +1,29 @@
 import AdmZip from 'adm-zip';
+import { globby } from 'globby';
+import path from 'path';
 class ZipImpl {
     async zipFolder(sourceFolder) {
         const zip = new AdmZip();
         zip.addLocalFolder(sourceFolder);
         return zip.toBuffer();
     }
-    isZipped(path) {
-        return path.endsWith('.zip');
+    async zipFolderWithGitignore(sourceFolder) {
+        const files = await globby(['**/*'], {
+            cwd: sourceFolder,
+            gitignore: true,
+            ignore: ['.git/**'],
+            dot: true,
+        });
+        const zip = new AdmZip();
+        for (const file of files) {
+            const filePath = path.join(sourceFolder, file);
+            const dirName = path.dirname(file);
+            zip.addLocalFile(filePath, dirName === '.' ? '' : dirName);
+        }
+        return zip.toBuffer();
+    }
+    isZipped(filePath) {
+        return filePath.endsWith('.zip');
     }
 }
 const zip = new ZipImpl();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/cli",
-  "version": "4.6.0-dev.bda9e9d.1774345600",
+  "version": "4.7.0",
   "description": "The Capawesome Cloud Command Line Interface (CLI) to manage Live Updates and more.",
   "type": "module",
   "scripts": {
@@ -61,6 +61,7 @@
     "c12": "3.3.3",
     "consola": "3.3.0",
     "form-data": "4.0.4",
+    "globby": "16.1.1",
     "http-proxy-agent": "7.0.2",
     "https-proxy-agent": "7.0.6",
     "mime": "4.0.7",