jira-sprinter 2.0.1 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jira-sprinter",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Small CLI tool to manage sprints in JIRA Board",
   "main": "src/main.ts",
   "type": "commonjs",
@@ -16,7 +16,7 @@
     "update-snapshots": "vitest run --update",
     "all": "yarn && yarn run build && yarn run format && yarn test"
   },
-  "packageManager": "yarn@4.12.0",
+  "packageManager": "yarn@4.17.1",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/redhat-plumbers-in-action/sprinter.git"
@@ -34,22 +34,22 @@
     "scrum"
   ],
   "dependencies": {
-    "@inquirer/checkbox": "^5.1.3",
-    "@inquirer/select": "5.1.3",
+    "@inquirer/checkbox": "^5.2.1",
+    "@inquirer/select": "5.2.1",
     "@total-typescript/ts-reset": "0.6.1",
     "chalk": "5.6.2",
-    "commander": "14.0.3",
-    "dotenv": "17.4.1",
-    "jira.js": "5.3.1",
-    "zod": "4.3.6"
+    "commander": "15.0.0",
+    "dotenv": "17.4.2",
+    "jira.js": "5.4.0",
+    "zod": "4.4.3"
   },
   "devDependencies": {
-    "@types/node": "25.5.2",
-    "@vitest/coverage-v8": "4.1.3",
-    "esbuild": "0.28.0",
-    "prettier": "3.8.1",
+    "@types/node": "26.1.1",
+    "@vitest/coverage-v8": "4.1.10",
+    "esbuild": "0.28.1",
+    "prettier": "3.9.5",
     "ts-node": "10.9.2",
-    "typescript": "6.0.2",
-    "vitest": "4.1.3"
+    "typescript": "7.0.2",
+    "vitest": "4.1.10"
   }
 }

package/src/auto.ts

@@ -0,0 +1,94 @@
+import chalk from 'chalk';
+import { OptionValues } from 'commander';
+
+import { Logger } from './logger';
+import { Jira } from './jira';
+
+export async function runAuto(options: OptionValues): Promise<void> {
+  const logger = new Logger(!!options.nocolor);
+
+  const jira = await Jira.getInstance(options.dry, logger, options.assignee);
+
+  const boardIssues = await jira.getBoardIssues(
+    options.board,
+    `project = RHEL and issuetype in (Bug, Story, Vulnerability) and statusCategory != Done`
+  );
+
+  const preliminaryTestingRequested = boardIssues.filter(
+    issue =>
+      issue.fields?.[jira.fields.preliminaryTesting]?.value === 'Requested' &&
+      !issue.fields?.issuelinks?.some(
+        l =>
+          l.type?.outward === 'split to' &&
+          l.outwardIssue?.fields?.summary.startsWith(
+            jira.preliminaryTestingTask.summary
+          ) &&
+          l.outwardIssue?.fields?.status.name !== 'Closed'
+      )
+  );
+  logger.log(
+    `${chalk.green('Preliminary Testing Requested')} - ${preliminaryTestingRequested.length}`
+  );
+
+  const preliminaryTestingFailed = boardIssues.filter(
+    issue =>
+      issue.fields?.[jira.fields.preliminaryTesting]?.value === 'Fail' &&
+      issue.fields?.issuelinks?.some(
+        l =>
+          l.type?.outward === 'split to' &&
+          l.outwardIssue?.fields?.summary.startsWith(
+            jira.preliminaryTestingTask.summary
+          ) &&
+          l.outwardIssue?.fields?.status.name !== 'Closed'
+      )
+  );
+  logger.log(
+    `${chalk.red('Preliminary Testing Failed')} - ${preliminaryTestingFailed.length}`
+  );
+
+  if (preliminaryTestingRequested.length > 0) {
+    logger.log(
+      `${chalk.cyan('Creating split tasks for Preliminary Testing Requested...')}`
+    );
+  }
+
+  for (const issue of preliminaryTestingRequested) {
+    if (!issue.key) {
+      continue;
+    }
+
+    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;
+    }
+
+    const preliminaryTestingTask = issue.fields?.issuelinks?.find(
+      l =>
+        l.type?.outward === 'split to' &&
+        l.outwardIssue?.fields?.summary.startsWith(
+          jira.preliminaryTestingTask.summary
+        ) &&
+        l.outwardIssue?.fields?.status.name !== 'Closed'
+    );
+
+    if (!preliminaryTestingTask || !preliminaryTestingTask.outwardIssue?.key) {
+      logger.log(
+        `${chalk.red('Preliminary Testing Task not found')} - ${issue.key}`
+      );
+      continue;
+    }
+
+    await jira.closeTask(preliminaryTestingTask.outwardIssue?.key);
+  }
+
+  process.exit(0);
+}

package/src/cli.ts

@@ -5,12 +5,8 @@ import checkbox from '@inquirer/checkbox';
 
 import { Jira } from './jira';
 import { Logger } from './logger';
-import {
-  getDefaultValue,
-  getOptions,
-  getUserFromLogin,
-  tokenUnavailable,
-} from './util';
+import { getDefaultValue, getOptions } from './util';
+import { runAuto } from './auto';
 
 import { SearchResults } from 'jira.js/dist/esm/types/agile/models';
 import {
@@ -28,7 +24,28 @@ export function cli(): Command {
   program
     .name('jira-sprinter')
     .description('🏃 Small CLI tool to manage sprints in JIRA Board')
-    .version('2.0.1');
+    .version('2.1.0');
+
+  program.addCommand(
+    new Command('auto')
+      .description(
+        'Automatically manages split tasks (DEV and Preliminary Testing) based on ticket state and status'
+      )
+      .option('-b, --board [board]', 'Jira Board ID', getDefaultValue('BOARD'))
+      .requiredOption(
+        '-t, --team [assigned team]',
+        'Jira Assigned Team',
+        getDefaultValue('TEAM')
+      )
+      .option(
+        '-c, --components [components]',
+        'Jira Components',
+        getDefaultValue('COMPONENTS')
+      )
+      .action(async (_opts, command) => {
+        await runAuto(command.optsWithGlobals());
+      })
+  );
 
   program
     .option('-b, --board [board]', 'Jira Board ID', getDefaultValue('BOARD'))
@@ -43,29 +60,23 @@ export function cli(): Command {
       getDefaultValue('YOLO')
     )
     .option('-n, --nocolor', 'Disable color output', getDefaultValue('NOCOLOR'))
-    .option('-x, --dry', 'dry run', getDefaultValue('DRY'));
+    .option('-x, --dry', 'dry run', getDefaultValue('DRY'))
+    .action(() => {});
 
   return program;
 }
 
 const runProgram = async () => {
   const program = cli();
-  program.parse();
+  await program.parseAsync();
+
+  // If there are any arguments (like auto), just return, the command logic is handled in separate functions
+  if (program.args.length > 0) return;
 
   const options = getOptions(program.opts());
   const logger = new Logger(!!options.nocolor);
 
-  const token = process.env.JIRA_API_TOKEN ?? tokenUnavailable();
-  const jira = new Jira(
-    'https://redhat.atlassian.net',
-    token,
-    options.dry,
-    logger,
-    getUserFromLogin()
-  );
-
-  const version = await jira.getVersion();
-  console.debug(`JIRA Version: ${version}`);
+  const jira = await Jira.getInstance(options.dry, logger, options.assignee);
 
   const sprints = await jira.getSprints(+options.board);
 
@@ -110,53 +121,12 @@ const runProgram = async () => {
       `See more: ${chalk.italic.underline(jira.getIssueURL(issue.key ?? ''))}\n`
     );
 
-    const availableTasks = [
-      {
-        name: 'DEV Task',
-        summary: '[DEV Task]:',
-        label: 'dev_task',
-        value: '14476',
-        checked: true,
-      },
-      {
-        name: 'QE Task',
-        summary: '[QE Task]:',
-        label: 'qe_task',
-        value: '14480',
-        checked: true,
-      },
-      {
-        name: 'Upstream',
-        summary: '[Upstream]:',
-        label: 'upstream_task',
-        value: '14475',
-      },
-      {
-        name: 'Root Cause Analysis Task',
-        summary: '[Root Cause Analysis Task]:',
-        label: 'root_cause_analysis_task',
-        value: '14483',
-      },
-      {
-        name: 'Preliminary Testing Task',
-        summary: '[Preliminary Testing Task]:',
-        label: 'preliminary_testing_task',
-        value: '14478',
-      },
-      {
-        name: 'Integration Testing',
-        summary: '[Integration Testing Task]:',
-        label: 'integration_testing_task',
-        value: '14481',
-      },
-    ];
-
-    let answer: number[] = [];
+    let answer: string[] = [];
     if (!options.yolo) {
       answer = await checkbox({
         message: `Split ${chalk.bold(issue.key)} into following tasks:\n`,
         choices: [
-          ...availableTasks.map(task => {
+          ...jira.availableTasks.map(task => {
             const isTaskOpen = issue.fields?.issuelinks?.some(
               l =>
                 l.type?.outward === 'split to' &&
@@ -172,24 +142,24 @@ const runProgram = async () => {
             };
           }),
           new Separator(),
-          { name: 'SKIP', value: -1 },
-          { name: 'EXIT', value: -2 },
+          { name: 'SKIP', value: '-1' },
+          { name: 'EXIT', value: '-2' },
         ],
         loop: false,
         pageSize: 10,
       });
 
-      if (answer.includes(-1)) {
+      if (answer.includes('-1')) {
         continue;
       }
 
-      if (answer.includes(-2)) {
+      if (answer.includes('-2')) {
         process.exit(0);
       }
     }
 
     if (options.yolo) {
-      answer = availableTasks
+      answer = jira.availableTasks
         .filter(task => task.checked ?? false)
         .map(task => task.value);
     }
@@ -203,7 +173,7 @@ const runProgram = async () => {
       tasks = await jira.getlinkedTasks(
         issue.key!,
         answer.map(
-          task => availableTasks.find(t => t.value === task)?.name ?? ''
+          task => jira.availableTasks.find(t => t.value === task)?.name ?? ''
         )
       );
 

package/src/jira.ts

@@ -2,7 +2,7 @@ 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 { raise } from './util';
+import { raise, tokenUnavailable } from './util';
 import { Size } from './schema/jira';
 import { Logger } from './logger';
 
@@ -16,9 +16,56 @@ export class Jira {
     severity: 'customfield_10840',
     sprint: 'customfield_10020',
     storyPoints: 'customfield_10028',
+    preliminaryTesting: 'customfield_10879',
   };
 
-  readonly nonTaskIssuesJQL = `(labels not in (upstream_task, dev_task, qe_task, root_cause_analysis_task, preliminary_testing_task, integration_testing_task) OR labels is EMPTY) AND type in (Bug, "Story", Vulnerability) AND Project = RHEL AND statusCategory != Done`;
+  readonly devTask = {
+    name: 'DEV Task',
+    summary: '[DEV Task]:',
+    label: 'dev_task',
+    value: '14476',
+  };
+  readonly qeTask = {
+    name: 'QE Task',
+    summary: '[QE Task]:',
+    label: 'qe_task',
+    value: '14480',
+  };
+  readonly upstreamTask = {
+    name: 'Upstream',
+    summary: '[Upstream]:',
+    label: 'upstream_task',
+    value: '14475',
+  };
+  readonly rootCauseAnalysisTask = {
+    name: 'Root Cause Analysis Task',
+    summary: '[Root Cause Analysis Task]:',
+    label: 'root_cause_analysis_task',
+    value: '14483',
+  };
+  readonly preliminaryTestingTask = {
+    name: 'Preliminary Testing Task',
+    summary: '[Preliminary Testing Task]:',
+    label: 'preliminary_testing_task',
+    value: '14478',
+  };
+  readonly integrationTestingTask = {
+    name: 'Integration Testing',
+    summary: '[Integration Testing Task]:',
+    label: 'integration_testing_task',
+    value: '14481',
+  };
+  readonly availableTasks = [
+    { ...this.devTask, checked: true },
+    { ...this.qeTask, checked: true },
+    { ...this.upstreamTask, checked: false },
+    { ...this.rootCauseAnalysisTask, checked: false },
+    { ...this.preliminaryTestingTask, checked: false },
+    { ...this.integrationTestingTask, checked: false },
+  ];
+  readonly availableTasksLabels = this.availableTasks.map(task => task.label);
+
+  readonly nonTaskIssuesJQL = `(labels not in (${this.availableTasksLabels.join(', ')}) OR labels is EMPTY) AND type in (Bug, "Story", Vulnerability) AND Project = RHEL AND statusCategory != Done`;
 
   constructor(
     readonly instance: string,
@@ -115,6 +162,32 @@ export class Jira {
     return response.issues;
   }
 
+  async getBoardIssues(
+    boardId: number,
+    jql?: string
+  ): Promise<SearchResults['issues']> {
+    const response = await this.agile.board.getIssuesForBoard({
+      boardId: boardId,
+      maxResults: 500,
+      jql: jql ?? '',
+      fields: [
+        'id',
+        'issuetype',
+        'status',
+        'summary',
+        'assignee',
+        'priority',
+        'components',
+        this.fields.storyPoints,
+        this.fields.severity,
+        this.fields.preliminaryTesting,
+        'issuelinks',
+      ],
+    });
+
+    return response.issues;
+  }
+
   composeTaskSummaryJQL(expectedTasks: string[]) {
     return `summary ~ "\\\\[${expectedTasks.join('\\\\]: " OR summary ~ "\\\\[')}\\\\]: "`;
   }
@@ -161,7 +234,7 @@ export class Jira {
     return response.issues ?? [];
   }
 
-  async createTasks(issue: string, tasks: number[]) {
+  async createTasks(issue: string, tasks: string[]) {
     if (this.dry) {
       this.logger.log(
         `Would create tasks: ${tasks.join(', ')} for issue: ${issue}`
@@ -174,7 +247,23 @@ export class Jira {
       issueIdOrKey: issue,
       fields: {
         // Jira expects multi-select values as objects with id/value
-        [this.fields.automation]: tasks.map(id => ({ id: String(id) })),
+        [this.fields.automation]: tasks.map(id => ({ id: id })),
+      },
+    });
+  }
+
+  async closeTask(issue: string) {
+    if (this.dry) {
+      this.logger.log(`Would close task: ${issue}`);
+      return;
+    }
+
+    this.logger.log(`Closing task: ${issue}`);
+
+    await this.api.issues.doTransition({
+      issueIdOrKey: issue,
+      transition: {
+        id: '31',
       },
     });
   }
@@ -208,4 +297,21 @@ export class Jira {
   getIssueURL(issue: string) {
     return `${this.instance}/browse/${issue}`;
   }
+
+  static async getInstance(dryRun: boolean, logger: Logger, assignee: string) {
+    const apiToken = process.env.JIRA_API_TOKEN ?? tokenUnavailable();
+
+    const instance = new this(
+      'https://redhat.atlassian.net',
+      apiToken,
+      dryRun,
+      logger,
+      assignee
+    );
+
+    const version = await instance.getVersion();
+    console.debug(`JIRA Version: ${version}`);
+
+    return instance;
+  }
 }

package/src/util.ts

@@ -21,7 +21,8 @@ export function isDefaultValuesDisabled(): boolean {
 }
 
 export function getDefaultValue(
-  envName: 'ASSIGNEE' | 'BOARD' | 'NOCOLOR' | 'DRY' | 'YOLO'
+  envName:
+    'ASSIGNEE' | 'BOARD' | 'TEAM' | 'COMPONENTS' | 'NOCOLOR' | 'DRY' | 'YOLO'
 ) {
   if (isDefaultValuesDisabled()) {
     return undefined;

package/systemd/jira-sprinter.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=Create split tasks for Scrum board
+
+[Service]
+Type=oneshot
+Environment=PATH=/home/user/.local/bin:/usr/local/bin:/usr/bin:/bin
+EnvironmentFile=/home/user/.config/jira-sprinter/.env
+ExecStart=/usr/bin/npx jira-sprinter auto ...

package/systemd/jira-sprinter.timer

@@ -0,0 +1,10 @@
+[Unit]
+Description=Run jira-sprinter auto every 20 minutes
+
+[Timer]
+OnCalendar=*:0/20
+AccuracySec=1min
+Persistent=true
+
+[Install]
+WantedBy=timers.target