Skip to content

Commit 1cb4570

Browse files
committed
Simplified print job names functionality
1 parent 35ddb73 commit 1cb4570

File tree

2 files changed

+22
-26
lines changed

2 files changed

+22
-26
lines changed

src/commander.ts

+10-26
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import * as c from "ansi-colors";
22

33
import {Job} from "./job";
44
import {Parser} from "./parser";
5+
import {Utils} from "./utils";
56

67
export class Commander {
78

@@ -27,10 +28,12 @@ export class Commander {
2728
}
2829

2930
if (skippingNever.length > 0) {
30-
process.stdout.write(`${skippingNever.map((j) => j.name).join(', ')} ${c.magentaBright("skipped")} when:never\n`);
31+
skippingNever.forEach(Utils.printJobNames);
32+
process.stdout.write(` ${c.magentaBright("skipped")} when:never\n`);
3133
}
3234
if (skippingManual.length > 0) {
33-
process.stdout.write(`${skippingManual.map((j) => j.name).join(', ')} ${c.magentaBright("skipped")} when:manual\n`);
35+
skippingManual.forEach(Utils.printJobNames);
36+
process.stdout.write(` ${c.magentaBright("skipped")} when:manual\n`);
3437
}
3538

3639
let stage = stages.shift();
@@ -196,52 +199,33 @@ export class Commander {
196199
}
197200
}
198201

199-
let terminalLength = 0;
200-
const printJobName = (job: Job, i: number, arr: Job[]) => {
201-
terminalLength += job.name.length;
202-
if (terminalLength > 180) {
203-
process.stdout.write(`\n${"".padEnd(2)}`);
204-
terminalLength = 0;
205-
}
206-
if (i === arr.length - 1) {
207-
process.stdout.write(`${c.blueBright(`${job.name}`)}`);
208-
} else {
209-
process.stdout.write(`${c.blueBright(`${job.name}`)}, `);
210-
}
211-
};
212-
213202
if (preScripts.never.length !== 0) {
214203
process.stdout.write(`${c.magenta("not started")} `);
215-
terminalLength = 0;
216-
preScripts.never.forEach(printJobName);
204+
preScripts.never.forEach(Utils.printJobNames);
217205
process.stdout.write(`\n`);
218206
}
219207

220208
if (preScripts.successful.length !== 0) {
221209
process.stdout.write(`${c.green("successful")} `);
222-
terminalLength = 0;
223-
preScripts.successful.forEach(printJobName);
210+
preScripts.successful.forEach(Utils.printJobNames);
224211
process.stdout.write(`\n`);
225212
}
226213

227214
if (preScripts.warned.length !== 0) {
228215
process.stdout.write(`${c.yellowBright("warning")} `);
229-
terminalLength = 0;
230-
preScripts.warned.forEach(printJobName);
216+
preScripts.warned.forEach(Utils.printJobNames);
231217
process.stdout.write(`\n`);
232218
}
233219

234220
if (afterScripts.warned.length !== 0) {
235221
process.stdout.write(`${c.yellowBright("after script")} `);
236-
terminalLength = 0;
237-
afterScripts.warned.forEach(printJobName);
222+
afterScripts.warned.forEach(Utils.printJobNames);
238223
process.stdout.write(`\n`);
239224
}
240225

241226
if (preScripts.failed.length !== 0) {
242227
process.stdout.write(`${c.red("failure")} `);
243-
terminalLength = 0;
244-
preScripts.failed.forEach(printJobName);
228+
preScripts.failed.forEach(Utils.printJobNames);
245229
process.stdout.write(`\n`);
246230
}
247231

src/utils.ts

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import * as c from "ansi-colors";
2+
import {Job} from "./job";
3+
4+
export class Utils {
5+
static printJobNames(job: Job, i: number, arr: Job[]) {
6+
if (i === arr.length - 1) {
7+
process.stdout.write(`${c.blueBright(`${job.name}`)}`);
8+
} else {
9+
process.stdout.write(`${c.blueBright(`${job.name}`)}, `);
10+
}
11+
}
12+
}

0 commit comments

Comments
 (0)