jira-sprinter 2.1.1 → 2.3.0

package/README.md

@@ -76,20 +76,24 @@ Options:
   -h, --help                 display help for command
 
 Commands:
-  auto [options]             Automatically manages split tasks (DEV and
-                             Preliminary Testing) based on ticket state and
-                             status
+  auto [options]             Automatically manages split tasks (Preliminary
+                             Testing and QE) based on ticket state and status
 ```
 
 ### `auto` command
 
-The `auto` command automates the creation of Preliminary Testing split tasks. It scans the board for issues where Preliminary Testing is marked as "Requested" and creates the corresponding split task if one does not already exist (or was previously closed).
+The `auto` command automates the management of split tasks based on ticket state and status. It performs the following actions:
+
+- **Preliminary Testing Requested**: Scans the board for issues where Preliminary Testing is marked as "Requested" and creates the corresponding split task if one does not already exist (or was previously closed).
+- **Preliminary Testing Failed**: When testing has failed, automatically closes the linked Preliminary Testing split task.
+- **Integration without QE Task**: Finds issues in "Integration" status that lack an open QE Task and creates one automatically.
+- **Release Pending with QE Task**: When an issue moves to "Release Pending" status, automatically closes the linked QE Task if it is still open.
 
 ```md
 $ jira-sprinter auto --help
 Usage: jira-sprinter auto [options]
 
-Automatically manages split tasks (DEV and Preliminary Testing) based on ticket
+Automatically manages split tasks (Preliminary Testing and QE) based on ticket
 state and status
 
 Options:

package/dist/main.js

@@ -47713,7 +47713,9 @@ var Jira = class {
   }
   async getlinkedTasks(issue2, expectedTasks) {
     if (this.dry) {
-      this.logger.log(`Would get linked tasks for issue: ${issue2}`);
+      this.logger.log(
+        `  ${source_default.dim(`Fetching linked tasks for ${issue2} (dry-run)`)}`
+      );
       return [
         {
           key: "RHEL-1234",
@@ -47752,11 +47754,13 @@ var Jira = class {
   async createTasks(issue2, tasks) {
     if (this.dry) {
       this.logger.log(
-        `Would create tasks: ${tasks.join(", ")} for issue: ${issue2}`
+        `  ${source_default.dim(`Creating tasks ${tasks.join(", ")} for ${issue2} (dry-run)`)}`
       );
       return;
     }
-    this.logger.log(`Creating tasks: ${tasks.join(", ")} for issue: ${issue2}`);
+    this.logger.log(
+      `  ${source_default.cyan(`Creating tasks ${tasks.join(", ")} for ${issue2}`)}`
+    );
     await this.api.issues.editIssue({
       issueIdOrKey: issue2,
       fields: {
@@ -47767,10 +47771,10 @@ var Jira = class {
   }
   async closeTask(issue2) {
     if (this.dry) {
-      this.logger.log(`Would close task: ${issue2}`);
+      this.logger.log(`  ${source_default.dim(`Closing task ${issue2} (dry-run)`)}`);
       return;
     }
-    this.logger.log(`Closing task: ${issue2}`);
+    this.logger.log(`  ${source_default.cyan(`Closing task ${issue2}`)}`);
     await this.api.issues.doTransition({
       issueIdOrKey: issue2,
       transition: {
@@ -47800,7 +47804,7 @@ var Jira = class {
       assignee
     );
     const version2 = await instance.getVersion();
-    console.debug(`JIRA Version: ${version2}`);
+    logger.log(source_default.dim(`JIRA v${version2}`));
     return instance;
   }
 };
@@ -47826,9 +47830,12 @@ var Logger = class _Logger {
 async function runAuto(options) {
   const logger = new Logger(!!options.nocolor);
   const jira = await Jira.getInstance(options.dry, logger, options.assignee);
+  logger.log(
+    `${source_default.cyan(`Verifying issues in board ${options.board} - team: ${options.team}`)}`
+  );
   const boardIssues = await jira.getBoardIssues(
     options.board,
-    `project = RHEL and issuetype in (Bug, Story, Vulnerability) and statusCategory != Done`
+    `project = RHEL and issuetype in (Bug, Story, Vulnerability) and status != Closed`
   );
   const preliminaryTestingRequested = boardIssues.filter(
     (issue2) => issue2.fields?.[jira.fields.preliminaryTesting]?.value === "Requested" && !issue2.fields?.issuelinks?.some(
@@ -47837,9 +47844,6 @@ async function runAuto(options) {
       ) && l.outwardIssue?.fields?.status.name !== "Closed"
     )
   );
-  logger.log(
-    `${source_default.green("Preliminary Testing Requested")} - ${preliminaryTestingRequested.length}`
-  );
   const preliminaryTestingFailed = boardIssues.filter(
     (issue2) => issue2.fields?.[jira.fields.preliminaryTesting]?.value === "Fail" && issue2.fields?.issuelinks?.some(
       (l) => l.type?.outward === "split to" && l.outwardIssue?.fields?.summary.startsWith(
@@ -47847,13 +47851,36 @@ async function runAuto(options) {
       ) && l.outwardIssue?.fields?.status.name !== "Closed"
     )
   );
-  logger.log(
-    `${source_default.red("Preliminary Testing Failed")} - ${preliminaryTestingFailed.length}`
+  const issuesInIntegration = boardIssues.filter(
+    (issue2) => issue2.fields?.status.name === "Integration" && !issue2.fields?.issuelinks?.some(
+      (l) => l.type?.outward === "split to" && l.outwardIssue?.fields?.summary.startsWith(jira.qeTask.summary) && l.outwardIssue?.fields?.status.name !== "Closed"
+    )
   );
-  if (preliminaryTestingRequested.length > 0) {
-    logger.log(
-      `${source_default.cyan("Creating split tasks for Preliminary Testing Requested...")}`
-    );
+  const issuesInReleasePending = boardIssues.filter(
+    (issue2) => issue2.fields?.status.name === "Release Pending" && issue2.fields?.issuelinks?.some(
+      (l) => l.type?.outward === "split to" && l.outwardIssue?.fields?.summary.startsWith(jira.qeTask.summary) && l.outwardIssue?.fields?.status.name !== "Closed"
+    )
+  );
+  const summary = [
+    {
+      label: "Preliminary Testing Requested",
+      count: preliminaryTestingRequested.length
+    },
+    {
+      label: "Preliminary Testing Failed",
+      count: preliminaryTestingFailed.length
+    },
+    { label: "Integration w/o QE Task", count: issuesInIntegration.length },
+    {
+      label: "Release Pending w/ QE Task",
+      count: issuesInReleasePending.length
+    }
+  ].filter((entry) => entry.count > 0);
+  for (const { label, count } of summary) {
+    logger.log(`  ${source_default.cyan(label)}: ${source_default.bold(count)}`);
+  }
+  if (summary.length === 0) {
+    logger.log(`  ${source_default.green("Nothing to do")}`);
   }
   for (const issue2 of preliminaryTestingRequested) {
     if (!issue2.key) {
@@ -47861,11 +47888,6 @@ async function runAuto(options) {
     }
     await jira.createTasks(issue2.key, [jira.preliminaryTestingTask.value]);
   }
-  if (preliminaryTestingFailed.length > 0) {
-    logger.log(
-      `${source_default.red("Closing Preliminary Testing Task - Testing Failed...")}`
-    );
-  }
   for (const issue2 of preliminaryTestingFailed) {
     if (!issue2.key) {
       continue;
@@ -47877,12 +47899,31 @@ async function runAuto(options) {
     );
     if (!preliminaryTestingTask || !preliminaryTestingTask.outwardIssue?.key) {
       logger.log(
-        `${source_default.red("Preliminary Testing Task not found")} - ${issue2.key}`
+        `  ${source_default.red("Preliminary Testing Task not found")} - ${issue2.key}`
       );
       continue;
     }
     await jira.closeTask(preliminaryTestingTask.outwardIssue?.key);
   }
+  for (const issue2 of issuesInIntegration) {
+    if (!issue2.key) {
+      continue;
+    }
+    await jira.createTasks(issue2.key, [jira.qeTask.value]);
+  }
+  for (const issue2 of issuesInReleasePending) {
+    if (!issue2.key) {
+      continue;
+    }
+    const qeTask = issue2.fields?.issuelinks?.find(
+      (l) => l.type?.outward === "split to" && l.outwardIssue?.fields?.summary.startsWith(jira.qeTask.summary) && l.outwardIssue?.fields?.status.name !== "Closed"
+    );
+    if (!qeTask || !qeTask.outwardIssue?.key) {
+      logger.log(`  ${source_default.red("QE Task not found")} - ${issue2.key}`);
+      continue;
+    }
+    await jira.closeTask(qeTask.outwardIssue?.key);
+  }
   process.exit(0);
 }
 
@@ -47989,10 +48030,10 @@ var issueStatusSchema = external_exports.union([
 // src/cli.ts
 function cli() {
   const program2 = new Command();
-  program2.name("jira-sprinter").description("\u{1F3C3} Small CLI tool to manage sprints in JIRA Board").version("2.1.1");
+  program2.name("jira-sprinter").description("\u{1F3C3} Small CLI tool to manage sprints in JIRA Board").version("2.3.0");
   program2.addCommand(
     new Command("auto").description(
-      "Automatically manages split tasks (DEV and Preliminary Testing) based on ticket state and status"
+      "Automatically manages split tasks (Preliminary Testing and QE) based on ticket state and status"
     ).option("-b, --board [board]", "Jira Board ID", getDefaultValue("BOARD")).requiredOption(
       "-t, --team [assigned team]",
       "Jira Assigned Team",
@@ -48049,7 +48090,7 @@ var runProgram = async () => {
     issues = await jira.getIssuesInSprint(sprintOrBacklog, options.assignee);
   }
   if (issues.length === 0) {
-    logger.log(`${source_default.green("No issues found")}.`);
+    logger.log(source_default.green("No issues found"));
     process.exit(0);
   }
   for (const issue2 of issues) {
@@ -48109,7 +48150,7 @@ ${issueTypeSchema.parse(issue2.fields?.issuetype.name)} ${issue2.key} - ${source
       );
       if (Array.isArray(tasks) && tasks.length >= answer.length) break;
       if (attempt < 10) {
-        logger.log(`Waiting for tasks to be created...`);
+        logger.log(source_default.dim("Waiting for tasks to be created..."));
         await new Promise((resolve) => setTimeout(resolve, 5e3));
       }
     }
@@ -48117,7 +48158,7 @@ ${issueTypeSchema.parse(issue2.fields?.issuetype.name)} ${issue2.key} - ${source
       if (task.fields.summary.includes("QE Task")) {
         continue;
       }
-      logger.log(`${source_default.italic(task.fields.summary)}`);
+      logger.log(source_default.italic(task.fields.summary));
       let storyPointsAnswer;
       let addToSprintAnswer;
       if (!options.yolo) {
@@ -48172,7 +48213,7 @@ ${issueTypeSchema.parse(issue2.fields?.issuetype.name)} ${issue2.key} - ${source
         storyPointsAnswer = issue2.fields?.[jira.fields.storyPoints];
         addToSprintAnswer = sprintOrBacklog != -1;
         logger.log(
-          `Setting story points to ${colorSizeSchema.parse(storyPointsAnswer)} and adding it to the sprint.`
+          `  ${source_default.cyan("Story points")}: ${colorSizeSchema.parse(storyPointsAnswer)}, ${source_default.cyan("Sprint")}: ${addToSprintAnswer ? source_default.green("yes") : source_default.red("no")}`
         );
       }
       await jira.setValues(task.key, {
@@ -48182,7 +48223,7 @@ ${issueTypeSchema.parse(issue2.fields?.issuetype.name)} ${issue2.key} - ${source
       });
     }
     logger.log(
-      `Dropping ${source_default.bold(issue2.key)} from sprint and setting story points to ${source_default.bold(0)}...`
+      `${source_default.dim(`Resetting ${issue2.key} \u2014 story points \u2192 0, removing from sprint`)}`
     );
     await jira.setValues(issue2.key, { size: 0, sprint: null });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jira-sprinter",
-  "version": "2.1.1",
+  "version": "2.3.0",
   "description": "Small CLI tool to manage sprints in JIRA Board",
   "main": "src/main.ts",
   "type": "commonjs",

package/src/auto.ts

@@ -9,9 +9,13 @@ export async function runAuto(options: OptionValues): Promise<void> {
 
   const jira = await Jira.getInstance(options.dry, logger, options.assignee);
 
+  logger.log(
+    `${chalk.cyan(`Verifying issues in board ${options.board} - team: ${options.team}`)}`
+  );
+
   const boardIssues = await jira.getBoardIssues(
     options.board,
-    `project = RHEL and issuetype in (Bug, Story, Vulnerability) and statusCategory != Done`
+    `project = RHEL and issuetype in (Bug, Story, Vulnerability) and status != Closed`
   );
 
   const preliminaryTestingRequested = boardIssues.filter(
@@ -26,9 +30,6 @@ export async function runAuto(options: OptionValues): Promise<void> {
           l.outwardIssue?.fields?.status.name !== 'Closed'
       )
   );
-  logger.log(
-    `${chalk.green('Preliminary Testing Requested')} - ${preliminaryTestingRequested.length}`
-  );
 
   const preliminaryTestingFailed = boardIssues.filter(
     issue =>
@@ -42,14 +43,51 @@ export async function runAuto(options: OptionValues): Promise<void> {
           l.outwardIssue?.fields?.status.name !== 'Closed'
       )
   );
-  logger.log(
-    `${chalk.red('Preliminary Testing Failed')} - ${preliminaryTestingFailed.length}`
+
+  const issuesInIntegration = boardIssues.filter(
+    issue =>
+      issue.fields?.status.name === 'Integration' &&
+      !issue.fields?.issuelinks?.some(
+        l =>
+          l.type?.outward === 'split to' &&
+          l.outwardIssue?.fields?.summary.startsWith(jira.qeTask.summary) &&
+          l.outwardIssue?.fields?.status.name !== 'Closed'
+      )
   );
 
-  if (preliminaryTestingRequested.length > 0) {
-    logger.log(
-      `${chalk.cyan('Creating split tasks for Preliminary Testing Requested...')}`
-    );
+  const issuesInReleasePending = boardIssues.filter(
+    issue =>
+      issue.fields?.status.name === 'Release Pending' &&
+      issue.fields?.issuelinks?.some(
+        l =>
+          l.type?.outward === 'split to' &&
+          l.outwardIssue?.fields?.summary.startsWith(jira.qeTask.summary) &&
+          l.outwardIssue?.fields?.status.name !== 'Closed'
+      )
+  );
+
+  const summary = [
+    {
+      label: 'Preliminary Testing Requested',
+      count: preliminaryTestingRequested.length,
+    },
+    {
+      label: 'Preliminary Testing Failed',
+      count: preliminaryTestingFailed.length,
+    },
+    { label: 'Integration w/o QE Task', count: issuesInIntegration.length },
+    {
+      label: 'Release Pending w/ QE Task',
+      count: issuesInReleasePending.length,
+    },
+  ].filter(entry => entry.count > 0);
+
+  for (const { label, count } of summary) {
+    logger.log(`  ${chalk.cyan(label)}: ${chalk.bold(count)}`);
+  }
+
+  if (summary.length === 0) {
+    logger.log(`  ${chalk.green('Nothing to do')}`);
   }
 
   for (const issue of preliminaryTestingRequested) {
@@ -60,12 +98,6 @@ export async function runAuto(options: OptionValues): Promise<void> {
     await jira.createTasks(issue.key, [jira.preliminaryTestingTask.value]);
   }
 
-  if (preliminaryTestingFailed.length > 0) {
-    logger.log(
-      `${chalk.red('Closing Preliminary Testing Task - Testing Failed...')}`
-    );
-  }
-
   for (const issue of preliminaryTestingFailed) {
     if (!issue.key) {
       continue;
@@ -82,7 +114,7 @@ export async function runAuto(options: OptionValues): Promise<void> {
 
     if (!preliminaryTestingTask || !preliminaryTestingTask.outwardIssue?.key) {
       logger.log(
-        `${chalk.red('Preliminary Testing Task not found')} - ${issue.key}`
+        `  ${chalk.red('Preliminary Testing Task not found')} - ${issue.key}`
       );
       continue;
     }
@@ -90,5 +122,33 @@ export async function runAuto(options: OptionValues): Promise<void> {
     await jira.closeTask(preliminaryTestingTask.outwardIssue?.key);
   }
 
+  for (const issue of issuesInIntegration) {
+    if (!issue.key) {
+      continue;
+    }
+
+    await jira.createTasks(issue.key, [jira.qeTask.value]);
+  }
+
+  for (const issue of issuesInReleasePending) {
+    if (!issue.key) {
+      continue;
+    }
+
+    const qeTask = issue.fields?.issuelinks?.find(
+      l =>
+        l.type?.outward === 'split to' &&
+        l.outwardIssue?.fields?.summary.startsWith(jira.qeTask.summary) &&
+        l.outwardIssue?.fields?.status.name !== 'Closed'
+    );
+
+    if (!qeTask || !qeTask.outwardIssue?.key) {
+      logger.log(`  ${chalk.red('QE Task not found')} - ${issue.key}`);
+      continue;
+    }
+
+    await jira.closeTask(qeTask.outwardIssue?.key);
+  }
+
   process.exit(0);
 }

package/src/cli.ts

@@ -24,12 +24,12 @@ export function cli(): Command {
   program
     .name('jira-sprinter')
     .description('🏃 Small CLI tool to manage sprints in JIRA Board')
-    .version('2.1.1');
+    .version('2.3.0');
 
   program.addCommand(
     new Command('auto')
       .description(
-        'Automatically manages split tasks (DEV and Preliminary Testing) based on ticket state and status'
+        'Automatically manages split tasks (Preliminary Testing and QE) based on ticket state and status'
       )
       .option('-b, --board [board]', 'Jira Board ID', getDefaultValue('BOARD'))
       .requiredOption(
@@ -106,7 +106,7 @@ const runProgram = async () => {
   }
 
   if (issues.length === 0) {
-    logger.log(`${chalk.green('No issues found')}.`);
+    logger.log(chalk.green('No issues found'));
     process.exit(0);
   }
 
@@ -179,7 +179,7 @@ const runProgram = async () => {
 
       if (Array.isArray(tasks) && tasks.length >= answer.length) break;
       if (attempt < 10) {
-        logger.log(`Waiting for tasks to be created...`);
+        logger.log(chalk.dim('Waiting for tasks to be created...'));
         await new Promise(resolve => setTimeout(resolve, 5000));
       }
     }
@@ -190,7 +190,7 @@ const runProgram = async () => {
         continue;
       }
 
-      logger.log(`${chalk.italic(task.fields.summary)}`);
+      logger.log(chalk.italic(task.fields.summary));
 
       let storyPointsAnswer: Size | undefined;
       let addToSprintAnswer: boolean | undefined;
@@ -248,7 +248,7 @@ const runProgram = async () => {
         storyPointsAnswer = issue.fields?.[jira.fields.storyPoints];
         addToSprintAnswer = sprintOrBacklog != -1;
         logger.log(
-          `Setting story points to ${colorSizeSchema.parse(storyPointsAnswer)} and adding it to the sprint.`
+          `  ${chalk.cyan('Story points')}: ${colorSizeSchema.parse(storyPointsAnswer)}, ${chalk.cyan('Sprint')}: ${addToSprintAnswer ? chalk.green('yes') : chalk.red('no')}`
         );
       }
 
@@ -263,7 +263,7 @@ const runProgram = async () => {
     }
 
     logger.log(
-      `Dropping ${chalk.bold(issue.key)} from sprint and setting story points to ${chalk.bold(0)}...`
+      `${chalk.dim(`Resetting ${issue.key} — story points → 0, removing from sprint`)}`
     );
     await jira.setValues(issue.key!, { size: 0, sprint: null });
   }

package/src/jira.ts

@@ -2,6 +2,8 @@ import { AgileClient, Version3Client } from 'jira.js';
 import { SearchResults, Sprint } from 'jira.js/dist/esm/types/agile/models';
 import { Issue } from 'jira.js/dist/esm/types/version3/models/issue';
 
+import chalk from 'chalk';
+
 import { raise, tokenUnavailable } from './util';
 import { Size } from './schema/jira';
 import { Logger } from './logger';
@@ -194,7 +196,9 @@ export class Jira {
 
   async getlinkedTasks(issue: string, expectedTasks: string[]) {
     if (this.dry) {
-      this.logger.log(`Would get linked tasks for issue: ${issue}`);
+      this.logger.log(
+        `  ${chalk.dim(`Fetching linked tasks for ${issue} (dry-run)`)}`
+      );
       return [
         {
           key: 'RHEL-1234',
@@ -237,12 +241,14 @@ export class Jira {
   async createTasks(issue: string, tasks: string[]) {
     if (this.dry) {
       this.logger.log(
-        `Would create tasks: ${tasks.join(', ')} for issue: ${issue}`
+        `  ${chalk.dim(`Creating tasks ${tasks.join(', ')} for ${issue} (dry-run)`)}`
       );
       return;
     }
 
-    this.logger.log(`Creating tasks: ${tasks.join(', ')} for issue: ${issue}`);
+    this.logger.log(
+      `  ${chalk.cyan(`Creating tasks ${tasks.join(', ')} for ${issue}`)}`
+    );
     await this.api.issues.editIssue({
       issueIdOrKey: issue,
       fields: {
@@ -254,11 +260,11 @@ export class Jira {
 
   async closeTask(issue: string) {
     if (this.dry) {
-      this.logger.log(`Would close task: ${issue}`);
+      this.logger.log(`  ${chalk.dim(`Closing task ${issue} (dry-run)`)}`);
       return;
     }
 
-    this.logger.log(`Closing task: ${issue}`);
+    this.logger.log(`  ${chalk.cyan(`Closing task ${issue}`)}`);
 
     await this.api.issues.doTransition({
       issueIdOrKey: issue,
@@ -310,7 +316,7 @@ export class Jira {
     );
 
     const version = await instance.getVersion();
-    console.debug(`JIRA Version: ${version}`);
+    logger.log(chalk.dim(`JIRA v${version}`));
 
     return instance;
   }