jira-sprinter 2.5.0 → 2.6.0

package/dist/main.js

@@ -12151,7 +12151,7 @@ var require_follow_redirects = __commonJS({
           self2.emit("error", cause instanceof RedirectionError ? cause : new RedirectionError({ cause }));
         }
       };
-      this._headerFilter = new RegExp("^(?:" + sensitiveHeaders.concat(options.sensitiveHeaders).map(escapeRegex2).join("|") + ")$", "i");
+      this._headerFilter = new RegExp("^(?:" + sensitiveHeaders.concat(options.sensitiveHeaders).map(escapeRegex3).join("|") + ")$", "i");
       this._performRequest();
     }
     RedirectableRequest.prototype = Object.create(Writable.prototype);
@@ -12561,7 +12561,7 @@ var require_follow_redirects = __commonJS({
     function isURL(value) {
       return URL2 && value instanceof URL2;
     }
-    function escapeRegex2(regex) {
+    function escapeRegex3(regex) {
       return regex.replace(/[\]\\/()*+?.$]/g, "\\$&");
     }
     module2.exports = wrap({ http: http4, https: https3 });
@@ -47675,7 +47675,7 @@ var Jira = class {
     };
     this.availableTasks = [
       { ...this.devTask, checked: true },
-      { ...this.qeTask, checked: true },
+      { ...this.qeTask, checked: false },
       { ...this.upstreamTask, checked: false },
       { ...this.rootCauseAnalysisTask, checked: false },
       { ...this.preliminaryTestingTask, checked: false },
@@ -47844,6 +47844,12 @@ var Jira = class {
     const assigneeValue = values.assignee ? { [this.fields.assignee]: { accountId: values.assignee } } : {};
     const storyPointsValue = values.size !== void 0 ? { [this.fields.storyPoints]: values.size } : {};
     const sprintValue = values.sprint !== void 0 ? { [this.fields.sprint]: values.sprint } : {};
+    if (this.dry) {
+      this.logger.log(
+        `  ${source_default.dim(`Setting values ${JSON.stringify(values)} on ${issue2} (dry-run)`)}`
+      );
+      return;
+    }
     await this.api.issues.editIssue({
       issueIdOrKey: issue2,
       fields: { ...assigneeValue, ...storyPointsValue, ...sprintValue }
@@ -53431,7 +53437,8 @@ var relPrepEntrySchema = external_exports.object({
 });
 var releaseDeadlinesSchema = external_exports.object({
   rel_prep: external_exports.array(relPrepEntrySchema),
-  itm_26: external_exports.string().nullable()
+  itm_26: external_exports.string().nullable(),
+  all_built_rel_prep: external_exports.string().nullable().default(null)
 });
 var deadlinesFileSchema = external_exports.object({
   updated_at: external_exports.string(),
@@ -53443,7 +53450,13 @@ var DEFAULT_DEADLINES_PATH = import_path3.default.resolve(
   "jira-sprinter",
   "deadlines.json"
 );
-var SCHEDULE_TASK_REGEX = ".*(Package Advisory REL_PREP Deadline|ITM 26 DevTestDoc).*";
+var TASK_NAME_REL_PREP = "Package Advisory REL_PREP Deadline";
+var TASK_NAME_ITM_26 = "ITM 26 DevTestDoc";
+var TASK_NAME_ALL_BUILT_REL_PREP = "All packages built & All Errata in REL_PREP (non-container)";
+function escapeRegex2(str) {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+var SCHEDULE_TASK_REGEX = `.*(${escapeRegex2(TASK_NAME_REL_PREP)}|${escapeRegex2(TASK_NAME_ITM_26)}|${escapeRegex2(TASK_NAME_ALL_BUILT_REL_PREP)}).*`;
 function readDeadlines(filePath = DEFAULT_DEADLINES_PATH) {
   try {
     const raw = import_fs.default.readFileSync(filePath, "utf-8");
@@ -53459,14 +53472,20 @@ function formatDate(date5) {
   return `${y}-${m}-${d}`;
 }
 function classifyScheduleTasks(tasks) {
-  const deadlines = { rel_prep: [], itm_26: null };
+  const deadlines = {
+    rel_prep: [],
+    itm_26: null,
+    all_built_rel_prep: null
+  };
   for (const task of tasks) {
-    if (task.name.includes("REL_PREP")) {
+    if (task.name.includes(TASK_NAME_ALL_BUILT_REL_PREP)) {
+      deadlines.all_built_rel_prep = task.date_finish;
+    } else if (task.name.includes(TASK_NAME_REL_PREP)) {
       deadlines.rel_prep.push({
         name: task.name,
         date_finish: task.date_finish
       });
-    } else if (task.name.includes("ITM 26")) {
+    } else if (task.name.includes(TASK_NAME_ITM_26)) {
       deadlines.itm_26 = task.date_finish;
     }
   }
@@ -53489,13 +53508,23 @@ function computePreliminaryTestingDueDate(deadlines, isZStream, today = /* @__PU
     if (!closest) return twoWeeksStr;
     return closest < twoWeeksStr ? closest : twoWeeksStr;
   }
+  const todayStr = formatDate(today);
   if (deadlines.itm_26) {
-    const todayStr = formatDate(today);
     if (deadlines.itm_26 >= todayStr && deadlines.itm_26 < twoWeeksStr) {
       return deadlines.itm_26;
     }
   }
-  return twoWeeksStr;
+  const pastItm26 = !deadlines.itm_26 || deadlines.itm_26 < todayStr;
+  const oneWeek = new Date(today);
+  oneWeek.setDate(oneWeek.getDate() + 7);
+  const oneWeekStr = formatDate(oneWeek);
+  const maxCap = pastItm26 ? oneWeekStr : twoWeeksStr;
+  if (deadlines.all_built_rel_prep) {
+    if (deadlines.all_built_rel_prep >= todayStr && deadlines.all_built_rel_prep < maxCap) {
+      return deadlines.all_built_rel_prep;
+    }
+  }
+  return maxCap;
 }
 function computeQeTaskDueDate(deadlines, isZStream, today = /* @__PURE__ */ new Date()) {
   if (isZStream) {
@@ -53504,9 +53533,13 @@ function computeQeTaskDueDate(deadlines, isZStream, today = /* @__PURE__ */ new
       today
     );
   }
-  if (deadlines.itm_26 && deadlines.itm_26 >= formatDate(today)) {
+  const todayStr = formatDate(today);
+  if (deadlines.itm_26 && deadlines.itm_26 >= todayStr) {
     return deadlines.itm_26;
   }
+  if (deadlines.all_built_rel_prep && deadlines.all_built_rel_prep >= todayStr) {
+    return deadlines.all_built_rel_prep;
+  }
   return null;
 }
 function writeDeadlines(data, filePath = DEFAULT_DEADLINES_PATH) {
@@ -53801,6 +53834,8 @@ ${source_default.cyan("Syncing")} ${source_default.bold(release)}...`);
       }
       const itm26 = deadlines.itm_26 ? source_default.bold(deadlines.itm_26) : source_default.dim("not found");
       logger.log(`  ITM 26:   ${itm26}`);
+      const allBuiltRelPrep = deadlines.all_built_rel_prep ? source_default.bold(deadlines.all_built_rel_prep) : source_default.dim("not found");
+      logger.log(`  All built REL_PREP: ${allBuiltRelPrep}`);
     } catch (error51) {
       logger.log(source_default.yellow(`  Failed to sync ${release}: ${error51}`));
     }
@@ -53921,7 +53956,7 @@ var issueStatusSchema = external_exports.union([
 });
 
 // package.json
-var version2 = "2.5.0";
+var version2 = "2.6.0";
 
 // src/cli.ts
 function cli() {

package/package.json

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

package/src/jira.ts

@@ -59,7 +59,7 @@ export class Jira {
   };
   readonly availableTasks = [
     { ...this.devTask, checked: true },
-    { ...this.qeTask, checked: true },
+    { ...this.qeTask, checked: false },
     { ...this.upstreamTask, checked: false },
     { ...this.rootCauseAnalysisTask, checked: false },
     { ...this.preliminaryTestingTask, checked: false },
@@ -286,6 +286,13 @@ export class Jira {
         ? { [this.fields.sprint]: values.sprint }
         : {};
 
+    if (this.dry) {
+      this.logger.log(
+        `  ${chalk.dim(`Setting values ${JSON.stringify(values)} on ${issue} (dry-run)`)}`
+      );
+      return;
+    }
+
     await this.api.issues.editIssue({
       issueIdOrKey: issue,
       fields: { ...assigneeValue, ...storyPointsValue, ...sprintValue },

package/src/pp-sync.ts

@@ -53,6 +53,10 @@ export async function runPpSync(
         ? chalk.bold(deadlines.itm_26)
         : chalk.dim('not found');
       logger.log(`  ITM 26:   ${itm26}`);
+      const allBuiltRelPrep = deadlines.all_built_rel_prep
+        ? chalk.bold(deadlines.all_built_rel_prep)
+        : chalk.dim('not found');
+      logger.log(`  All built REL_PREP: ${allBuiltRelPrep}`);
     } catch (error) {
       logger.log(chalk.yellow(`  Failed to sync ${release}: ${error}`));
     }

package/src/schema/deadlines.ts

@@ -13,6 +13,7 @@ export type RelPrepEntry = z.infer<typeof relPrepEntrySchema>;
 const releaseDeadlinesSchema = z.object({
   rel_prep: z.array(relPrepEntrySchema),
   itm_26: z.string().nullable(),
+  all_built_rel_prep: z.string().nullable().default(null),
 });
 
 const deadlinesFileSchema = z.object({
@@ -30,8 +31,16 @@ export const DEFAULT_DEADLINES_PATH = path.resolve(
   'deadlines.json'
 );
 
-export const SCHEDULE_TASK_REGEX =
-  '.*(Package Advisory REL_PREP Deadline|ITM 26 DevTestDoc).*';
+const TASK_NAME_REL_PREP = 'Package Advisory REL_PREP Deadline';
+const TASK_NAME_ITM_26 = 'ITM 26 DevTestDoc';
+const TASK_NAME_ALL_BUILT_REL_PREP =
+  'All packages built & All Errata in REL_PREP (non-container)';
+
+export function escapeRegex(str: string): string {
+  return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+export const SCHEDULE_TASK_REGEX = `.*(${escapeRegex(TASK_NAME_REL_PREP)}|${escapeRegex(TASK_NAME_ITM_26)}|${escapeRegex(TASK_NAME_ALL_BUILT_REL_PREP)}).*`;
 
 export function readDeadlines(
   filePath: string = DEFAULT_DEADLINES_PATH
@@ -54,14 +63,20 @@ function formatDate(date: Date): string {
 export function classifyScheduleTasks(
   tasks: { name: string; date_finish: string }[]
 ): ReleaseDeadlines {
-  const deadlines: ReleaseDeadlines = { rel_prep: [], itm_26: null };
+  const deadlines: ReleaseDeadlines = {
+    rel_prep: [],
+    itm_26: null,
+    all_built_rel_prep: null,
+  };
   for (const task of tasks) {
-    if (task.name.includes('REL_PREP')) {
+    if (task.name.includes(TASK_NAME_ALL_BUILT_REL_PREP)) {
+      deadlines.all_built_rel_prep = task.date_finish;
+    } else if (task.name.includes(TASK_NAME_REL_PREP)) {
       deadlines.rel_prep.push({
         name: task.name,
         date_finish: task.date_finish,
       });
-    } else if (task.name.includes('ITM 26')) {
+    } else if (task.name.includes(TASK_NAME_ITM_26)) {
       deadlines.itm_26 = task.date_finish;
     }
   }
@@ -95,14 +110,30 @@ export function computePreliminaryTestingDueDate(
     return closest < twoWeeksStr ? closest : twoWeeksStr;
   }
 
+  const todayStr = formatDate(today);
+
   if (deadlines.itm_26) {
-    const todayStr = formatDate(today);
     if (deadlines.itm_26 >= todayStr && deadlines.itm_26 < twoWeeksStr) {
       return deadlines.itm_26;
     }
   }
 
-  return twoWeeksStr;
+  const pastItm26 = !deadlines.itm_26 || deadlines.itm_26 < todayStr;
+  const oneWeek = new Date(today);
+  oneWeek.setDate(oneWeek.getDate() + 7);
+  const oneWeekStr = formatDate(oneWeek);
+  const maxCap = pastItm26 ? oneWeekStr : twoWeeksStr;
+
+  if (deadlines.all_built_rel_prep) {
+    if (
+      deadlines.all_built_rel_prep >= todayStr &&
+      deadlines.all_built_rel_prep < maxCap
+    ) {
+      return deadlines.all_built_rel_prep;
+    }
+  }
+
+  return maxCap;
 }
 
 export function computeQeTaskDueDate(
@@ -117,10 +148,19 @@ export function computeQeTaskDueDate(
     );
   }
 
-  if (deadlines.itm_26 && deadlines.itm_26 >= formatDate(today)) {
+  const todayStr = formatDate(today);
+
+  if (deadlines.itm_26 && deadlines.itm_26 >= todayStr) {
     return deadlines.itm_26;
   }
 
+  if (
+    deadlines.all_built_rel_prep &&
+    deadlines.all_built_rel_prep >= todayStr
+  ) {
+    return deadlines.all_built_rel_prep;
+  }
+
   return null;
 }