Skip to content

Commit edb8e06

Browse files
FatmeFatme
committed
Respect getInfos() method from nativescript-doctor package
1 parent d27e80c commit edb8e06

File tree

5 files changed

+171
-15
lines changed

5 files changed

+171
-15
lines changed

‎lib/bootstrap.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,3 +144,4 @@ $injector.requirePublic("extensibilityService", "./services/extensibility-servic
144144

145145
$injector.require("nodeModulesDependenciesBuilder", "./tools/node-modules/node-modules-dependencies-builder");
146146
$injector.require("subscriptionService", "./services/subscription-service");
147+
$injector.require("terminalSpinnerService", "./services/terminal-spinner-service");

‎lib/definitions/terminal-spinner-service.d.ts

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
interface ITerminalSpinnerService {
2+
createSpinner(spinnerOptions?: ITerminalSpinnerOptions): ITerminalSpinner;
3+
execute<T>(spinnerOptions: ITerminalSpinnerOptions, action: () => Promise<T>): Promise<T>;
4+
}
5+
6+
type SpinnerName =
7+
'dots'
8+
| 'dots2'
9+
| 'dots3'
10+
| 'dots4'
11+
| 'dots5'
12+
| 'dots6'
13+
| 'dots7'
14+
| 'dots8'
15+
| 'dots9'
16+
| 'dots10'
17+
| 'dots11'
18+
| 'dots12'
19+
| 'line'
20+
| 'line2'
21+
| 'pipe'
22+
| 'simpleDots'
23+
| 'simpleDotsScrolling'
24+
| 'star'
25+
| 'star2'
26+
| 'flip'
27+
| 'hamburger'
28+
| 'growVertical'
29+
| 'growHorizontal'
30+
| 'balloon'
31+
| 'balloon2'
32+
| 'noise'
33+
| 'bounce'
34+
| 'boxBounce'
35+
| 'boxBounce2'
36+
| 'triangle'
37+
| 'arc'
38+
| 'circle'
39+
| 'squareCorners'
40+
| 'circleQuarters'
41+
| 'circleHalves'
42+
| 'squish'
43+
| 'toggle'
44+
| 'toggle2'
45+
| 'toggle3'
46+
| 'toggle4'
47+
| 'toggle5'
48+
| 'toggle6'
49+
| 'toggle7'
50+
| 'toggle8'
51+
| 'toggle9'
52+
| 'toggle10'
53+
| 'toggle11'
54+
| 'toggle12'
55+
| 'toggle13'
56+
| 'arrow'
57+
| 'arrow2'
58+
| 'arrow3'
59+
| 'bouncingBar'
60+
| 'bouncingBall'
61+
| 'smiley'
62+
| 'monkey'
63+
| 'hearts'
64+
| 'clock'
65+
| 'earth'
66+
| 'moon'
67+
| 'runner'
68+
| 'pong'
69+
| 'shark'
70+
| 'dqpb';
71+
72+
interface Spinner {
73+
interval?: number;
74+
frames: string[];
75+
}
76+
77+
interface ITerminalSpinner {
78+
text: string;
79+
start(text?: string): ITerminalSpinner;
80+
stop(): ITerminalSpinner;
81+
succeed(text?: string): ITerminalSpinner;
82+
fail(text?: string): ITerminalSpinner;
83+
warn(text?: string): ITerminalSpinner;
84+
info(text?: string): ITerminalSpinner;
85+
clear(): ITerminalSpinner;
86+
render(): ITerminalSpinner;
87+
frame(): ITerminalSpinner;
88+
}
89+
90+
interface ITerminalSpinnerOptions {
91+
text?: string;
92+
spinner?: SpinnerName | Spinner;
93+
color?: 'black' | 'red' | 'green' | 'yellow' | 'blue' | 'magenta' | 'cyan' | 'white' | 'gray';
94+
interval?: number;
95+
stream?: NodeJS.WritableStream;
96+
enabled?: boolean;
97+
}

‎lib/services/doctor-service.ts

Lines changed: 44 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { EOL } from "os";
22
import * as path from "path";
33
import * as helpers from "../common/helpers";
44
import { doctor, constants } from "nativescript-doctor";
5+
// import { createTable } from "../common/helpers";
56

67
class DoctorService implements IDoctorService {
78
private static DarwinSetupScriptLocation = path.join(__dirname, "..", "..", "setup", "mac-startup-shell-script.sh");
@@ -17,10 +18,15 @@ class DoctorService implements IDoctorService {
1718
private $childProcess: IChildProcess,
1819
private $opener: IOpener,
1920
private $prompter: IPrompter,
21+
private $terminalSpinnerService: ITerminalSpinnerService,
2022
private $versionsService: IVersionsService) { }
2123

2224
public async printWarnings(configOptions?: { trackResult: boolean }): Promise<boolean> {
23-
const warnings = await doctor.getWarnings();
25+
const infos = await this.$terminalSpinnerService.execute<NativeScriptDoctor.IInfo[]>({
26+
text: `Getting environment information ${EOL}`
27+
}, () => doctor.getInfos());
28+
29+
const warnings = infos.filter(info => info.type === constants.WARNING_TYPE_NAME);
2430
const hasWarnings = warnings.length > 0;
2531

2632
const hasAndroidWarnings = warnings.filter(warning => _.includes(warning.platforms, constants.ANDROID_PLATFORM_NAME)).length > 0;
@@ -33,19 +39,9 @@ class DoctorService implements IDoctorService {
3339
}
3440

3541
if (hasWarnings) {
36-
warnings.map(warning => {
37-
this.$logger.warn(warning.warning);
38-
this.$logger.out(warning.additionalInformation);
39-
});
40-
42+
this.printInfosCore(infos);
4143
this.$logger.info("There seem to be issues with your configuration.");
42-
if (this.$hostInfo.isDarwin) {
43-
await this.promptForHelp(DoctorService.DarwinSetupDocsLink, DoctorService.DarwinSetupScriptLocation, []);
44-
} else if (this.$hostInfo.isWindows) {
45-
await this.promptForHelp(DoctorService.WindowsSetupDocsLink, DoctorService.WindowsSetupScriptExecutable, DoctorService.WindowsSetupScriptArguments);
46-
} else {
47-
await this.promptForDocs(DoctorService.LinuxSetupDocsLink);
48-
}
44+
await this.promptForHelp();
4945
}
5046

5147
try {
@@ -63,20 +59,54 @@ class DoctorService implements IDoctorService {
6359
}
6460
}
6561

66-
private async promptForHelp(link: string, commandName: string, commandArguments: string[]): Promise<void> {
62+
private async promptForHelpCore(link: string, commandName: string, commandArguments: string[]): Promise<void> {
6763
await this.promptForDocs(link);
6864

6965
if (await this.$prompter.confirm("Do you want to run the setup script?", () => helpers.isInteractive())) {
7066
await this.$childProcess.spawnFromEvent(commandName, commandArguments, "close", { stdio: "inherit" });
7167
}
7268
}
7369

70+
private async promptForHelp(): Promise<void> {
71+
if (this.$hostInfo.isDarwin) {
72+
await this.promptForHelpCore(DoctorService.DarwinSetupDocsLink, DoctorService.DarwinSetupScriptLocation, []);
73+
} else if (this.$hostInfo.isWindows) {
74+
await this.promptForHelpCore(DoctorService.WindowsSetupDocsLink, DoctorService.WindowsSetupScriptExecutable, DoctorService.WindowsSetupScriptArguments);
75+
} else {
76+
await this.promptForDocs(DoctorService.LinuxSetupDocsLink);
77+
}
78+
}
79+
7480
private printPackageManagerTip() {
7581
if (this.$hostInfo.isWindows) {
7682
this.$logger.out("TIP: To avoid setting up the necessary environment variables, you can use the chocolatey package manager to install the Android SDK and its dependencies." + EOL);
7783
} else if (this.$hostInfo.isDarwin) {
7884
this.$logger.out("TIP: To avoid setting up the necessary environment variables, you can use the Homebrew package manager to install the Android SDK and its dependencies." + EOL);
7985
}
8086
}
87+
88+
private printInfosCore(infos: NativeScriptDoctor.IInfo[]): void {
89+
infos.filter(info => info.type === constants.WARNING_TYPE_NAME)
90+
.map(info => {
91+
const spinner = this.$terminalSpinnerService.createSpinner();
92+
spinner.text = `${info.message.yellow} ${EOL} ${info.additionalInformation} ${EOL}`;
93+
spinner.fail();
94+
});
95+
96+
infos.filter(info => info.type === constants.INFO_TYPE_NAME)
97+
.map(info => {
98+
const spinner = this.$terminalSpinnerService.createSpinner();
99+
spinner.text = info.message;
100+
spinner.succeed();
101+
});
102+
103+
// const table = createTable(["Index", "Message", "Additional Info"],
104+
// infos.map((info, index) => {
105+
// const message = info.type === constants.INFO_TYPE_NAME ? info.message.green : info.message.yellow;
106+
// return [index.toString(), `${message.toString()} ${EOL}`, info.additionalInformation];
107+
// })
108+
// );
109+
// console.log(table.toString());
110+
}
81111
}
82112
$injector.register("doctorService", DoctorService);

‎lib/services/terminal-spinner-service.ts

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
import * as ora from 'ora';
2+
3+
export class TerminalSpinnerService implements ITerminalSpinnerService {
4+
public createSpinner(spinnerOptions: ITerminalSpinnerOptions): ITerminalSpinner {
5+
return new ora(spinnerOptions);
6+
}
7+
8+
public async execute<T>(spinnerOptions: ITerminalSpinnerOptions, action: () => Promise<T>): Promise<T> {
9+
const spinner = this.createSpinner(spinnerOptions);
10+
11+
spinner.start();
12+
13+
let result: T = null;
14+
try {
15+
result = await action();
16+
} catch (err) {
17+
spinner.fail();
18+
return null;
19+
}
20+
21+
spinner.succeed();
22+
23+
return result;
24+
}
25+
}
26+
$injector.register('terminalSpinnerService', TerminalSpinnerService);

‎package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"mobile"
3131
],
3232
"dependencies": {
33+
"@types/ora": "^1.3.2",
3334
"bplist-parser": "0.1.0",
3435
"bufferpack": "0.0.6",
3536
"byline": "4.2.1",
@@ -56,8 +57,9 @@
5657
"minimatch": "3.0.2",
5758
"mkdirp": "0.5.1",
5859
"mute-stream": "0.0.5",
59-
"nativescript-doctor": "0.9.0",
60+
"nativescript-doctor": "file:../nativescript-doctor/nativescript-doctor-0.9.0.tgz",
6061
"open": "0.0.5",
62+
"ora": "^2.0.0",
6163
"osenv": "0.1.3",
6264
"pbxproj-dom": "1.0.11",
6365
"plist": "1.1.0",

0 commit comments

Comments
 (0)