@aaronshaf/ger 0.3.1 → 0.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aaronshaf/ger",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Gerrit CLI and SDK - A modern CLI tool and TypeScript SDK for Gerrit Code Review, built with Effect-TS",
   "keywords": [
     "gerrit",

package/src/cli/commands/build-status.ts

@@ -37,7 +37,8 @@ const VERIFIED_PLUS_PATTERN = /Verified\s*[+]\s*1/
 const VERIFIED_MINUS_PATTERN = /Verified\s*[-]\s*1/
 
 /**
- * Parse messages to determine build status based on "Build Started" and verification messages
+ * Parse messages to determine build status based on "Build Started" and verification messages.
+ * Only considers verification messages for the same patchset as the latest build.
  */
 const parseBuildStatus = (messages: readonly MessageInfo[]): BuildStatus => {
   // Empty messages means change exists but has no activity yet - return pending
@@ -45,11 +46,13 @@ const parseBuildStatus = (messages: readonly MessageInfo[]): BuildStatus => {
     return { state: 'pending' }
   }
 
-  // Find the most recent "Build Started" message
+  // Find the most recent "Build Started" message and its revision number
   let lastBuildDate: string | null = null
+  let lastBuildRevision: number | undefined = undefined
   for (const msg of messages) {
     if (BUILD_STARTED_PATTERN.test(msg.message)) {
       lastBuildDate = msg.date
+      lastBuildRevision = msg._revision_number
     }
   }
 
@@ -58,12 +61,18 @@ const parseBuildStatus = (messages: readonly MessageInfo[]): BuildStatus => {
     return { state: 'pending' }
   }
 
-  // Check for verification messages after the build started
+  // Check for verification messages after the build started AND for the same revision
   for (const msg of messages) {
     const date = msg.date
     // Gerrit timestamps are ISO 8601 strings (lexicographically sortable)
     if (date <= lastBuildDate) continue
 
+    // Only consider verification messages for the same patchset
+    // If revision numbers are available, they must match
+    if (lastBuildRevision !== undefined && msg._revision_number !== undefined) {
+      if (msg._revision_number !== lastBuildRevision) continue
+    }
+
     if (VERIFIED_PLUS_PATTERN.test(msg.message)) {
       return { state: 'success' }
     } else if (VERIFIED_MINUS_PATTERN.test(msg.message)) {
@@ -99,13 +108,6 @@ const pollBuildStatus = (
     const startTime = Date.now()
     const timeoutMs = options.timeout * 1000
 
-    // Initial message to stderr
-    yield* Effect.sync(() => {
-      console.error(
-        `Watching build status (polling every ${options.interval}s, timeout: ${options.timeout}s)...`,
-      )
-    })
-
     while (true) {
       // Check timeout
       const elapsed = Date.now() - startTime
@@ -138,25 +140,18 @@ const pollBuildStatus = (
         process.stdout.write(JSON.stringify(status) + '\n')
       })
 
-      // Terminal states - return immediately
-      if (
-        status.state === 'success' ||
-        status.state === 'failure' ||
-        status.state === 'not_found'
-      ) {
-        yield* Effect.sync(() => {
-          console.error(`Build completed with status: ${status.state}`)
-        })
+      // Terminal states - wait for interval before returning to allow logs to be written
+      if (status.state === 'success' || status.state === 'not_found') {
         return status
       }
 
-      // Non-terminal states - log progress and wait
-      const elapsedSeconds = Math.floor(elapsed / 1000)
-      yield* Effect.sync(() => {
-        console.error(`[${elapsedSeconds}s elapsed] Build status: ${status.state}`)
-      })
+      if (status.state === 'failure') {
+        // Wait for interval seconds to allow build failure logs to be fully written
+        yield* Effect.sleep(options.interval * 1000)
+        return status
+      }
 
-      // Sleep for interval duration
+      // Non-terminal states - sleep for interval duration
       yield* Effect.sleep(options.interval * 1000)
     }
   })

package/tests/build-status-watch.test.ts

@@ -92,12 +92,8 @@ describe('build-status command - watch mode', () => {
     expect(JSON.parse(capturedStdout[1])).toEqual({ state: 'running' })
     expect(JSON.parse(capturedStdout[2])).toEqual({ state: 'success' })
 
-    // Should have logged progress to stderr
-    expect(capturedErrors.length).toBeGreaterThan(0)
-    expect(capturedErrors.some((e: string) => e.includes('Watching build status'))).toBe(true)
-    expect(
-      capturedErrors.some((e: string) => e.includes('Build completed with status: success')),
-    ).toBe(true)
+    // Minimalistic output: no stderr messages except on timeout/error
+    expect(capturedErrors.length).toBe(0)
   })
 
   test('polls until failure state is reached', async () => {
@@ -155,9 +151,9 @@ describe('build-status command - watch mode', () => {
 
     expect(capturedStdout.length).toBeGreaterThanOrEqual(2)
     expect(JSON.parse(capturedStdout[capturedStdout.length - 1])).toEqual({ state: 'failure' })
-    expect(
-      capturedErrors.some((e: string) => e.includes('Build completed with status: failure')),
-    ).toBe(true)
+
+    // Minimalistic output: no stderr messages except on timeout/error
+    expect(capturedErrors.length).toBe(0)
   })
 
   test('times out after specified duration', async () => {
@@ -303,9 +299,10 @@ describe('build-status command - watch mode', () => {
 
     expect(capturedStdout.length).toBe(1)
     expect(JSON.parse(capturedStdout[0])).toEqual({ state: 'not_found' })
+
     // 404 errors bypass pollBuildStatus and are handled in error handler
-    // So we get "Watching build status" but not "Build completed" message
-    expect(capturedErrors.some((e: string) => e.includes('Watching build status'))).toBe(true)
+    // Minimalistic output: no stderr messages for not_found state
+    expect(capturedErrors.length).toBe(0)
   })
 
   test('without watch flag, behaves as single check', async () => {

package/tests/build-status.test.ts

@@ -637,4 +637,153 @@ describe('build-status command', () => {
     // Regex should handle extra whitespace
     expect(output).toEqual({ state: 'running' })
   })
+
+  test('ignores verification from older patchset when newer patchset build is running', async () => {
+    // This test replicates the bug scenario:
+    // - PS 3 build started, then PS 4 build started
+    // - PS 3 verification (-1) comes AFTER PS 4 build started
+    // - Should return "running" because PS 4 has no verification yet
+    const messages: MessageInfo[] = [
+      {
+        id: 'msg1',
+        message: 'Build Started https://jenkins.example.com/job/123/',
+        date: '2024-01-15 11:12:00.000000000',
+        _revision_number: 2,
+        author: {
+          _account_id: 9999,
+          name: 'Service Cloud Jenkins',
+        },
+      },
+      {
+        id: 'msg2',
+        message: 'Patch Set 2: Verified -1\n\nBuild Failed',
+        date: '2024-01-15 11:23:00.000000000',
+        _revision_number: 2,
+        author: {
+          _account_id: 9999,
+          name: 'Service Cloud Jenkins',
+        },
+      },
+      {
+        id: 'msg3',
+        message: 'Build Started https://jenkins.example.com/job/456/',
+        date: '2024-01-15 13:57:00.000000000',
+        _revision_number: 3,
+        author: {
+          _account_id: 9999,
+          name: 'Service Cloud Jenkins',
+        },
+      },
+      {
+        id: 'msg4',
+        message: 'Build Started https://jenkins.example.com/job/789/',
+        date: '2024-01-15 14:02:00.000000000',
+        _revision_number: 4,
+        author: {
+          _account_id: 9999,
+          name: 'Service Cloud Jenkins',
+        },
+      },
+      {
+        id: 'msg5',
+        message: 'Patch Set 3: Verified -1\n\nBuild Failed : ABORTED',
+        date: '2024-01-15 14:03:00.000000000',
+        _revision_number: 3,
+        author: {
+          _account_id: 9999,
+          name: 'Service Cloud Jenkins',
+        },
+      },
+    ]
+
+    server.use(
+      http.get('*/a/changes/12345', ({ request }) => {
+        const url = new URL(request.url)
+        if (url.searchParams.get('o') === 'MESSAGES') {
+          return HttpResponse.json(
+            { messages },
+            {
+              headers: { 'Content-Type': 'application/json' },
+            },
+          )
+        }
+        return HttpResponse.text('Not Found', { status: 404 })
+      }),
+    )
+
+    const effect = buildStatusCommand('12345').pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(createMockConfigLayer()),
+    )
+
+    await Effect.runPromise(effect)
+
+    expect(capturedStdout.length).toBe(1)
+    const output = JSON.parse(capturedStdout[0])
+    // PS 4 build started at 14:02, PS 3 verification at 14:03 should be IGNORED
+    // because it's for a different revision. PS 4 build is still running.
+    expect(output).toEqual({ state: 'running' })
+  })
+
+  test('returns success when verification matches the latest patchset', async () => {
+    const messages: MessageInfo[] = [
+      {
+        id: 'msg1',
+        message: 'Build Started',
+        date: '2024-01-15 10:00:00.000000000',
+        _revision_number: 1,
+        author: {
+          _account_id: 9999,
+          name: 'CI Bot',
+        },
+      },
+      {
+        id: 'msg2',
+        message: 'Build Started',
+        date: '2024-01-15 11:00:00.000000000',
+        _revision_number: 2,
+        author: {
+          _account_id: 9999,
+          name: 'CI Bot',
+        },
+      },
+      {
+        id: 'msg3',
+        message: 'Patch Set 2: Verified+1',
+        date: '2024-01-15 11:15:00.000000000',
+        _revision_number: 2,
+        author: {
+          _account_id: 9999,
+          name: 'CI Bot',
+        },
+      },
+    ]
+
+    server.use(
+      http.get('*/a/changes/12345', ({ request }) => {
+        const url = new URL(request.url)
+        if (url.searchParams.get('o') === 'MESSAGES') {
+          return HttpResponse.json(
+            { messages },
+            {
+              headers: { 'Content-Type': 'application/json' },
+            },
+          )
+        }
+        return HttpResponse.text('Not Found', { status: 404 })
+      }),
+    )
+
+    const effect = buildStatusCommand('12345').pipe(
+      Effect.provide(GerritApiServiceLive),
+      Effect.provide(createMockConfigLayer()),
+    )
+
+    await Effect.runPromise(effect)
+
+    expect(capturedStdout.length).toBe(1)
+    const output = JSON.parse(capturedStdout[0])
+    // PS 2 build started at 11:00, PS 2 verification at 11:15 - same revision, success
+    expect(output).toEqual({ state: 'success' })
+  })
 })