@regressionproof/snapshotter 0.5.1 → 0.5.3

package/build/esm/git.js

@@ -33,16 +33,43 @@ export function gitCommit(mirrorPath, log) {
 export function gitPush(mirrorPath, remote, log) {
     return __awaiter(this, void 0, void 0, function* () {
         const authedUrl = remote.url.replace('://', `://${remote.token}@`);
-        try {
-            yield execOrThrow(`git -C "${mirrorPath}" remote get-url origin`, log);
+        const originExists = yield remoteExists(mirrorPath, 'origin');
+        if (originExists) {
             yield execOrThrow(`git -C "${mirrorPath}" remote set-url origin "${authedUrl}"`);
         }
-        catch (_a) {
+        else {
             yield execOrThrow(`git -C "${mirrorPath}" remote add origin "${authedUrl}"`);
         }
+        yield execOrThrow(`git -C "${mirrorPath}" fetch origin`, log);
+        if (yield hasRemoteHead(mirrorPath)) {
+            yield execOrThrow(`git -C "${mirrorPath}" rebase origin/HEAD`, log);
+        }
         yield execOrThrow(`git -C "${mirrorPath}" push -u origin HEAD`, log);
     });
 }
+function remoteExists(mirrorPath, remoteName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const { stdout } = yield execAsync(`git -C "${mirrorPath}" remote`);
+            const remotes = stdout.trim().split('\n');
+            return remotes.includes(remoteName);
+        }
+        catch (_a) {
+            return false;
+        }
+    });
+}
+function hasRemoteHead(mirrorPath) {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            yield execAsync(`git -C "${mirrorPath}" symbolic-ref -q refs/remotes/origin/HEAD`);
+            return true;
+        }
+        catch (_a) {
+            return false;
+        }
+    });
+}
 function execOrThrow(command, log) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;

package/build/esm/snapshot.js

@@ -27,7 +27,7 @@ class Snapshotter {
                 this.log.info('Files synced', mirrorPath);
                 const snapshotterDir = path.join(mirrorPath, '.snapshotter');
                 mkdirSync(snapshotterDir, { recursive: true });
-                writeFileSync(path.join(snapshotterDir, 'testResults.json'), JSON.stringify(testResults, null, 2));
+                writeFileSync(path.join(snapshotterDir, 'testResults.json'), JSON.stringify(sortTestResults(testResults), null, 2));
                 this.log.info('Test results saved', snapshotterDir);
                 const committed = yield gitCommit(mirrorPath, this.log);
                 if (!committed) {
@@ -52,3 +52,8 @@ export function snapshot(options) {
         return new Snapshotter().snapshot(options);
     });
 }
+function sortTestResults(testResults) {
+    const suites = [...testResults.suites].map((suite) => (Object.assign(Object.assign({}, suite), { tests: [...suite.tests].sort((left, right) => left.name.localeCompare(right.name)) })));
+    suites.sort((left, right) => left.path.localeCompare(right.path));
+    return Object.assign(Object.assign({}, testResults), { suites });
+}

package/build/git.js

@@ -28,15 +28,38 @@ async function gitCommit(mirrorPath, log) {
 }
 async function gitPush(mirrorPath, remote, log) {
     const authedUrl = remote.url.replace('://', `://${remote.token}@`);
-    try {
-        await execOrThrow(`git -C "${mirrorPath}" remote get-url origin`, log);
+    const originExists = await remoteExists(mirrorPath, 'origin');
+    if (originExists) {
         await execOrThrow(`git -C "${mirrorPath}" remote set-url origin "${authedUrl}"`);
     }
-    catch {
+    else {
         await execOrThrow(`git -C "${mirrorPath}" remote add origin "${authedUrl}"`);
     }
+    await execOrThrow(`git -C "${mirrorPath}" fetch origin`, log);
+    if (await hasRemoteHead(mirrorPath)) {
+        await execOrThrow(`git -C "${mirrorPath}" rebase origin/HEAD`, log);
+    }
     await execOrThrow(`git -C "${mirrorPath}" push -u origin HEAD`, log);
 }
+async function remoteExists(mirrorPath, remoteName) {
+    try {
+        const { stdout } = await execAsync(`git -C "${mirrorPath}" remote`);
+        const remotes = stdout.trim().split('\n');
+        return remotes.includes(remoteName);
+    }
+    catch {
+        return false;
+    }
+}
+async function hasRemoteHead(mirrorPath) {
+    try {
+        await execAsync(`git -C "${mirrorPath}" symbolic-ref -q refs/remotes/origin/HEAD`);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
 async function execOrThrow(command, log) {
     try {
         return await execAsync(command);

package/build/snapshot.js

@@ -22,7 +22,7 @@ class Snapshotter {
             this.log.info('Files synced', mirrorPath);
             const snapshotterDir = path_1.default.join(mirrorPath, '.snapshotter');
             (0, fs_1.mkdirSync)(snapshotterDir, { recursive: true });
-            (0, fs_1.writeFileSync)(path_1.default.join(snapshotterDir, 'testResults.json'), JSON.stringify(testResults, null, 2));
+            (0, fs_1.writeFileSync)(path_1.default.join(snapshotterDir, 'testResults.json'), JSON.stringify(sortTestResults(testResults), null, 2));
             this.log.info('Test results saved', snapshotterDir);
             const committed = await (0, git_js_1.gitCommit)(mirrorPath, this.log);
             if (!committed) {
@@ -44,3 +44,14 @@ class Snapshotter {
 async function snapshot(options) {
     return new Snapshotter().snapshot(options);
 }
+function sortTestResults(testResults) {
+    const suites = [...testResults.suites].map((suite) => ({
+        ...suite,
+        tests: [...suite.tests].sort((left, right) => left.name.localeCompare(right.name)),
+    }));
+    suites.sort((left, right) => left.path.localeCompare(right.path));
+    return {
+        ...testResults,
+        suites,
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regressionproof/snapshotter",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "publishConfig": {
     "access": "public"
   },
@@ -94,5 +94,5 @@
     "@sprucelabs/spruce-core-schemas": "^42.1.3",
     "@sprucelabs/spruce-skill-utils": "^34.0.3"
   },
-  "gitHead": "5628058a784a7bbf4f9f2c80ecd69a49c8be1088"
+  "gitHead": "d54c041a4d6b4cd88d35025ef1ee6d9acb6ad664"
 }