@appland/appmap 3.7.0 → 3.7.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +29 -0
- package/built/appmap.html +1 -1
- package/built/main.js.map +1 -1
- package/built/package.json +1 -1
- package/built/src/cmds/agentInstaller/commandRunner.js +38 -6
- package/built/src/cmds/agentInstaller/commandRunner.js.map +1 -1
- package/built/src/cmds/agentInstaller/gradleInstaller.js +13 -13
- package/built/src/cmds/agentInstaller/gradleInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/gradleParser.js +2 -2
- package/built/src/cmds/agentInstaller/gradleParser.js.map +1 -1
- package/built/src/cmds/agentInstaller/install-agent.js +14 -3
- package/built/src/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/src/cmds/agentInstaller/mavenInstaller.js +14 -14
- package/built/src/cmds/agentInstaller/mavenInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/pythonAgentInstaller.js +8 -6
- package/built/src/cmds/agentInstaller/pythonAgentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/rubyAgentInstaller.js +10 -8
- package/built/src/cmds/agentInstaller/rubyAgentInstaller.js.map +1 -1
- package/built/src/cmds/errors.js +21 -1
- package/built/src/cmds/errors.js.map +1 -1
- package/built/src/cmds/userInteraction.js +4 -3
- package/built/src/cmds/userInteraction.js.map +1 -1
- package/built/src/encodedFile.js +62 -0
- package/built/src/encodedFile.js.map +1 -0
- package/built/src/telemetry.js +11 -10
- package/built/src/telemetry.js.map +1 -1
- package/built/src/utils.js +10 -0
- package/built/src/utils.js.map +1 -1
- package/package.json +3 -3
package/built/package.json
CHANGED
|
@@ -8,6 +8,7 @@ const child_process_1 = require("child_process");
|
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const chalk_1 = __importDefault(require("chalk"));
|
|
10
10
|
const utils_1 = require("../../utils");
|
|
11
|
+
const errors_1 = require("../errors");
|
|
11
12
|
class ProcessLog {
|
|
12
13
|
static log(command, childProcess) {
|
|
13
14
|
var _a, _b;
|
|
@@ -25,6 +26,29 @@ class ProcessLog {
|
|
|
25
26
|
}
|
|
26
27
|
exports.ProcessLog = ProcessLog;
|
|
27
28
|
ProcessLog.buffer = '';
|
|
29
|
+
class CommandOutput {
|
|
30
|
+
constructor() {
|
|
31
|
+
this.chunks = [];
|
|
32
|
+
}
|
|
33
|
+
append(stream, data) {
|
|
34
|
+
this.chunks.push({ stream, data });
|
|
35
|
+
}
|
|
36
|
+
get stdout() {
|
|
37
|
+
return this.chunks
|
|
38
|
+
.filter((chunk) => chunk.stream === 'stdout')
|
|
39
|
+
.map((chunk) => chunk.data)
|
|
40
|
+
.join('');
|
|
41
|
+
}
|
|
42
|
+
get stderr() {
|
|
43
|
+
return this.chunks
|
|
44
|
+
.filter((chunk) => chunk.stream === 'stderr')
|
|
45
|
+
.map((chunk) => chunk.data)
|
|
46
|
+
.join('');
|
|
47
|
+
}
|
|
48
|
+
get all() {
|
|
49
|
+
return this.chunks.map((chunk) => chunk.data).join('');
|
|
50
|
+
}
|
|
51
|
+
}
|
|
28
52
|
async function run(command) {
|
|
29
53
|
return new Promise((resolve, reject) => {
|
|
30
54
|
var _a, _b, _c, _d;
|
|
@@ -32,8 +56,7 @@ async function run(command) {
|
|
|
32
56
|
env: command.environment,
|
|
33
57
|
cwd: command.path,
|
|
34
58
|
});
|
|
35
|
-
let
|
|
36
|
-
let stderr = '';
|
|
59
|
+
let output = new CommandOutput();
|
|
37
60
|
if (utils_1.verbose()) {
|
|
38
61
|
console.log([
|
|
39
62
|
`Running command: \`${chalk_1.default.yellow(command.toString())}\``,
|
|
@@ -44,21 +67,30 @@ async function run(command) {
|
|
|
44
67
|
(_b = cp.stdout) === null || _b === void 0 ? void 0 : _b.pipe(process.stdout);
|
|
45
68
|
}
|
|
46
69
|
(_c = cp.stderr) === null || _c === void 0 ? void 0 : _c.on('data', (data) => {
|
|
47
|
-
stderr
|
|
70
|
+
output.append('stderr', data.toString());
|
|
48
71
|
});
|
|
49
72
|
(_d = cp.stdout) === null || _d === void 0 ? void 0 : _d.on('data', (data) => {
|
|
50
|
-
stdout
|
|
73
|
+
output.append('stdout', data.toString());
|
|
51
74
|
});
|
|
52
75
|
ProcessLog.log(command.toString(), cp);
|
|
76
|
+
cp.on('error', (err) => {
|
|
77
|
+
if (err['code'] === 'ENOENT') {
|
|
78
|
+
reject(new errors_1.ChildProcessError(command.toString(), `${command.toString()} was not found. Verify the command can be found in your PATH and try again.`));
|
|
79
|
+
}
|
|
80
|
+
reject(err);
|
|
81
|
+
});
|
|
53
82
|
cp.on('exit', (code, signal) => {
|
|
54
83
|
if (utils_1.verbose()) {
|
|
55
84
|
console.log(`'${command.program}' exited with code ${code}`);
|
|
56
85
|
}
|
|
57
86
|
ProcessLog.recordExit(command.program, code, signal);
|
|
58
87
|
if (code === 0) {
|
|
59
|
-
return resolve({
|
|
88
|
+
return resolve({
|
|
89
|
+
stdout: output.stdout,
|
|
90
|
+
stderr: output.stderr,
|
|
91
|
+
});
|
|
60
92
|
}
|
|
61
|
-
return reject(code);
|
|
93
|
+
return reject(new errors_1.ChildProcessError(command.toString(), output.all, code));
|
|
62
94
|
});
|
|
63
95
|
});
|
|
64
96
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandRunner.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const os_1 = __importDefault(require("os"));
|
|
7
7
|
const path_1 = require("path");
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
@@ -13,6 +13,7 @@ const sourceUtil_1 = require("./sourceUtil");
|
|
|
13
13
|
const errors_1 = require("../errors");
|
|
14
14
|
const javaBuildToolInstaller_1 = __importDefault(require("./javaBuildToolInstaller"));
|
|
15
15
|
const gradleParser_1 = require("./gradleParser");
|
|
16
|
+
const encodedFile_1 = __importDefault(require("../../encodedFile"));
|
|
16
17
|
class GradleInstaller extends javaBuildToolInstaller_1.default {
|
|
17
18
|
constructor(path) {
|
|
18
19
|
super(path);
|
|
@@ -31,10 +32,7 @@ class GradleInstaller extends javaBuildToolInstaller_1.default {
|
|
|
31
32
|
return new commandStruct_1.default(await this.runCommand(), ['appmap-print-jar-path'], this.path);
|
|
32
33
|
}
|
|
33
34
|
async postInstallMessage() {
|
|
34
|
-
let gradleBin =
|
|
35
|
-
if (await utils_1.exists(path_1.join(this.path, 'gradlew'))) {
|
|
36
|
-
gradleBin = `.${path_1.sep}gradlew`;
|
|
37
|
-
}
|
|
35
|
+
let gradleBin = await this.runCommand();
|
|
38
36
|
return [
|
|
39
37
|
`Record your tests by running ${chalk_1.default.blue(`${gradleBin} appmap test`)}`,
|
|
40
38
|
`By default, AppMap files will be output to ${chalk_1.default.blue('build/appmap')}`,
|
|
@@ -44,12 +42,13 @@ class GradleInstaller extends javaBuildToolInstaller_1.default {
|
|
|
44
42
|
return await utils_1.exists(this.buildFilePath);
|
|
45
43
|
}
|
|
46
44
|
async runCommand() {
|
|
47
|
-
const
|
|
45
|
+
const ext = os_1.default.platform() === 'win32' ? '.bat' : '';
|
|
46
|
+
const wrapperExists = await utils_1.exists(path_1.join(this.path, `gradlew${ext}`));
|
|
48
47
|
if (wrapperExists) {
|
|
49
|
-
return `.${path_1.sep}gradlew`;
|
|
48
|
+
return `.${path_1.sep}gradlew${ext}`;
|
|
50
49
|
}
|
|
51
50
|
else if (utils_1.verbose()) {
|
|
52
|
-
console.warn(`${chalk_1.default.yellow(
|
|
51
|
+
console.warn(`${chalk_1.default.yellow(`gradlew${ext} wrapper`)} not located, falling back to ${chalk_1.default.yellow(`gradle${ext}`)}`);
|
|
53
52
|
}
|
|
54
53
|
return 'gradle';
|
|
55
54
|
}
|
|
@@ -111,7 +110,7 @@ ${whitespace.padLine(pluginSpec)}
|
|
|
111
110
|
const updatedSrc = [
|
|
112
111
|
buildFileSource.substring(0, buildscriptEnd),
|
|
113
112
|
pluginsBlock,
|
|
114
|
-
].join(
|
|
113
|
+
].join(os_1.default.EOL);
|
|
115
114
|
const offset = buildscriptEnd;
|
|
116
115
|
return { updatedSrc, offset };
|
|
117
116
|
}
|
|
@@ -126,8 +125,8 @@ ${whitespace.padLine(pluginSpec)}
|
|
|
126
125
|
const column = sourceUtil_1.getColumn(buildFileSource, parseResult.plugins.lbrace);
|
|
127
126
|
const updatedSrc = [
|
|
128
127
|
buildFileSource.substring(0, parseResult.plugins.lbrace + 1),
|
|
129
|
-
lines.map((l) => whitespace.padLine(l)).join(
|
|
130
|
-
].join(
|
|
128
|
+
lines.map((l) => whitespace.padLine(l)).join(os_1.default.EOL),
|
|
129
|
+
].join(os_1.default.EOL);
|
|
131
130
|
const offset = parseResult.plugins.rbrace - 1;
|
|
132
131
|
return { updatedSrc, offset };
|
|
133
132
|
}
|
|
@@ -173,7 +172,8 @@ ${whitespace.padLine(mavenCentral)}
|
|
|
173
172
|
return { updatedSrc, offset };
|
|
174
173
|
}
|
|
175
174
|
async installAgent() {
|
|
176
|
-
const
|
|
175
|
+
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
176
|
+
const buildFileSource = encodedFile.toString();
|
|
177
177
|
const parser = new gradleParser_1.GradleParser();
|
|
178
178
|
const parseResult = parser.parse(buildFileSource);
|
|
179
179
|
parser.checkSyntax(parseResult);
|
|
@@ -181,7 +181,7 @@ ${whitespace.padLine(mavenCentral)}
|
|
|
181
181
|
let { updatedSrc, offset } = await this.insertPluginSpec(buildFileSource, parseResult, whitespace);
|
|
182
182
|
({ updatedSrc, offset } = await this.insertRepository(buildFileSource, updatedSrc, offset, parseResult, whitespace));
|
|
183
183
|
updatedSrc += buildFileSource.substring(offset);
|
|
184
|
-
|
|
184
|
+
encodedFile.write(updatedSrc);
|
|
185
185
|
}
|
|
186
186
|
}
|
|
187
187
|
exports.default = GradleInstaller;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,10 +86,10 @@ class GradleParser {
|
|
|
86
86
|
if (ignored.includes(t.type)) {
|
|
87
87
|
continue;
|
|
88
88
|
}
|
|
89
|
-
if (this.debug
|
|
89
|
+
if (this.debug === 1) {
|
|
90
90
|
writeDebug();
|
|
91
91
|
}
|
|
92
|
-
if (t.type
|
|
92
|
+
if (t.type === 'keyword') {
|
|
93
93
|
if (result.startOffset < 0) {
|
|
94
94
|
result.startOffset = t.offset;
|
|
95
95
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gradleParser.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleParser.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AAEtB,MAAM,aAAa;IAKjB,YAAqB,SAAiB,EAAW,MAAc;QAA1C,cAAS,GAAT,SAAS,CAAQ;QAAW,WAAM,GAAN,MAAM,CAAQ;QAJ/D,aAAQ,GAAW,CAAC,CAAC;QACrB,6EAA6E;QAC7E,UAAU;QACV,WAAM,GAAW,CAAC,CAAC,CAAC;IAC8C,CAAC;CACpE;AAED;;;;;;;IAOI;AACJ,MAAa,iBAAiB;IAA9B;QACE,gBAAW,GAAW,CAAC,CAAC,CAAC;QACzB,gBAAW,GAAyB,IAAI,CAAC;QACzC,iBAAY,GAAyB,IAAI,CAAC;QAC1C,YAAO,GAAyB,IAAI,CAAC;QACrC,iBAAY,GAAY,KAAK,CAAC;IAChC,CAAC;CAAA;AAND,8CAMC;AAED,MAAa,YAAY;IAAzB;QACS,UAAK,GAAW,CAAC,CAAC;IAoI3B,CAAC;IAjIC;;;;OAIG;IACH,KAAK,CAAC,GAAW;QACf,MAAM,KAAK,GAAG,aAAG,CAAC,MAAM,CAAC;YACvB,MAAM,EAAE;gBACN,OAAO,EAAE,YAAY,CAAC,QAAQ;gBAC9B,YAAY,EAAE,cAAc;gBAC5B,OAAO,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,EAAE;gBACjD,YAAY,EAAE,eAAe;gBAC7B,4DAA4D;gBAC5D,KAAK,EAAE,QAAQ;gBACf,WAAW,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE;gBACjD,MAAM,EAAE,2CAA2C;gBACnD,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE;gBACrC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE;gBACzC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE;aAC1C;YACD,UAAU,EAAE;gBACV,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE;gBACpC,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE;aAC1C;YACD,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE;gBAC9B,uEAAuE;gBACvE,OAAO,EAAE,QAAQ;aAClB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,CAAC;QACN,IAAI,UAAU,GAAkB,IAAI,CAAC;QACrC,MAAM,UAAU,GAAoB,EAAE,CAAC;QACvC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjB,IAAI,MAAM,GAAG,IAAI,iBAAiB,EAAE,CAAC;QAErC,0CAA0C;QAC1C,gCAAgC;QAChC,gCAAgC;QAChC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE;YACzB,MAAM,UAAU,GAAG,GAAG,EAAE;gBACtB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YACpE,CAAC,CAAC;YAEF,IAAI,IAAI,CAAC,KAAK,GAAG,CAAC,EAAE;gBAClB,UAAU,EAAE,CAAC;aACd;YAED,MAAM,OAAO,GAAG,CAAC,SAAS,EAAE,cAAc,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC9D,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAK,CAAC,EAAE;gBAC7B,SAAS;aACV;YACD,IAAI,IAAI,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"gradleParser.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -151,11 +151,22 @@ exports.default = {
|
|
|
151
151
|
console.warn(err.message);
|
|
152
152
|
return yargs_1.default.exit(1, err);
|
|
153
153
|
}
|
|
154
|
-
if (
|
|
155
|
-
userInteraction_1.default.
|
|
154
|
+
if (err instanceof errors_1.ChildProcessError) {
|
|
155
|
+
const { showError } = await userInteraction_1.default.prompt({
|
|
156
|
+
name: 'showError',
|
|
157
|
+
type: 'confirm',
|
|
158
|
+
message: `An error has occurred while running:\n ${chalk_1.default.red(err.command)}\n${chalk_1.default.green('?')} View error details?`,
|
|
159
|
+
prefix: chalk_1.default.red('!'),
|
|
160
|
+
}, { supressSpinner: true });
|
|
161
|
+
if (showError) {
|
|
162
|
+
userInteraction_1.default.error(err.message);
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
else if (err instanceof Error) {
|
|
166
|
+
userInteraction_1.default.error(err.stack);
|
|
156
167
|
}
|
|
157
168
|
else {
|
|
158
|
-
userInteraction_1.default.error(
|
|
169
|
+
userInteraction_1.default.error(err);
|
|
159
170
|
}
|
|
160
171
|
yargs_1.default.exit(3, err);
|
|
161
172
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":";;;;;AAAA,2BAAoC;AACpC,kDAA0B;AAC1B,+BAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const
|
|
6
|
+
const os_1 = __importDefault(require("os"));
|
|
7
|
+
const path_1 = require("path");
|
|
7
8
|
const jsdom_1 = require("jsdom");
|
|
8
9
|
const w3c_xmlserializer_1 = __importDefault(require("w3c-xmlserializer"));
|
|
9
|
-
const path_1 = require("path");
|
|
10
10
|
const chalk_1 = __importDefault(require("chalk"));
|
|
11
11
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
12
12
|
const utils_1 = require("../../utils");
|
|
13
13
|
const javaBuildToolInstaller_1 = __importDefault(require("./javaBuildToolInstaller"));
|
|
14
|
+
const encodedFile_1 = __importDefault(require("../../encodedFile"));
|
|
14
15
|
class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
15
16
|
constructor(path) {
|
|
16
17
|
super(path);
|
|
@@ -26,10 +27,7 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
26
27
|
return path_1.join(this.path, this.buildFile);
|
|
27
28
|
}
|
|
28
29
|
async postInstallMessage() {
|
|
29
|
-
let mvnBin =
|
|
30
|
-
if (await utils_1.exists(path_1.join(this.path, 'mvnw'))) {
|
|
31
|
-
mvnBin = `.${path_1.sep}mvnw`;
|
|
32
|
-
}
|
|
30
|
+
let mvnBin = await this.runCommand();
|
|
33
31
|
return [
|
|
34
32
|
`The AppMap agent will automatically record your tests when you run ${chalk_1.default.blue(`${mvnBin} test`)}`,
|
|
35
33
|
`By default, AppMap files will be output to ${chalk_1.default.blue('target/appmap')}`,
|
|
@@ -39,12 +37,13 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
39
37
|
return await utils_1.exists(this.buildFilePath);
|
|
40
38
|
}
|
|
41
39
|
async runCommand() {
|
|
42
|
-
const
|
|
40
|
+
const ext = os_1.default.platform() === 'win32' ? '.cmd' : '';
|
|
41
|
+
const wrapperExists = await utils_1.exists(path_1.join(this.path, `mvnw${ext}`));
|
|
43
42
|
if (wrapperExists) {
|
|
44
|
-
return `.${path_1.sep}mvnw`;
|
|
43
|
+
return `.${path_1.sep}mvnw${ext}`;
|
|
45
44
|
}
|
|
46
45
|
else if (utils_1.verbose()) {
|
|
47
|
-
console.warn(`${chalk_1.default.yellow(
|
|
46
|
+
console.warn(`${chalk_1.default.yellow(`mvnw${ext} wrapper`)} not found, falling back to ${chalk_1.default.yellow(`mvn${ext}`)}`);
|
|
48
47
|
}
|
|
49
48
|
return 'mvn';
|
|
50
49
|
}
|
|
@@ -55,7 +54,8 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
55
54
|
return new commandStruct_1.default(await this.runCommand(), ['appmap:print-jar-path'], this.path);
|
|
56
55
|
}
|
|
57
56
|
async installAgent() {
|
|
58
|
-
const
|
|
57
|
+
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
58
|
+
const buildFileSource = encodedFile.toString();
|
|
59
59
|
const jsdom = new jsdom_1.JSDOM();
|
|
60
60
|
const domParser = new jsdom.window.DOMParser();
|
|
61
61
|
const doc = domParser.parseFromString(buildFileSource, 'text/xml');
|
|
@@ -95,13 +95,13 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
95
95
|
if (!buildSection) {
|
|
96
96
|
buildSection = createEmptySection('build', ns);
|
|
97
97
|
projectSection.appendChild(buildSection);
|
|
98
|
-
projectSection.appendChild(doc.createTextNode(
|
|
98
|
+
projectSection.appendChild(doc.createTextNode(os_1.default.EOL));
|
|
99
99
|
}
|
|
100
100
|
let pluginsSection = doc.evaluate('/project/build/plugins', doc, doc.createNSResolver(doc.getRootNode()), 9).singleNodeValue;
|
|
101
101
|
if (!pluginsSection) {
|
|
102
102
|
pluginsSection = createEmptySection('plugins', ns);
|
|
103
103
|
buildSection.appendChild(pluginsSection);
|
|
104
|
-
buildSection.appendChild(doc.createTextNode(
|
|
104
|
+
buildSection.appendChild(doc.createTextNode(os_1.default.EOL));
|
|
105
105
|
}
|
|
106
106
|
const appmapPlugin = doc.evaluate(`/project/build/plugins/plugin[groupId/text() = 'com.appland' and artifactId/text() = 'appmap-maven-plugin']`, doc, doc.createNSResolver(doc.getRootNode()), 9).singleNodeValue;
|
|
107
107
|
if (appmapPlugin) {
|
|
@@ -120,10 +120,10 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
120
120
|
const node = pluginNode.childNodes[0];
|
|
121
121
|
pluginsSection.appendChild(node);
|
|
122
122
|
}
|
|
123
|
-
pluginsSection.appendChild(doc.createTextNode(
|
|
123
|
+
pluginsSection.appendChild(doc.createTextNode(os_1.default.EOL));
|
|
124
124
|
}
|
|
125
125
|
const serialized = w3c_xmlserializer_1.default(doc.getRootNode());
|
|
126
|
-
|
|
126
|
+
encodedFile.write(serialized);
|
|
127
127
|
}
|
|
128
128
|
}
|
|
129
129
|
exports.default = MavenInstaller;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,18 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
/* eslint-disable class-methods-use-this */
|
|
3
|
-
/* eslint-disable max-classes-per-file */
|
|
4
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
5
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
6
4
|
};
|
|
7
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
6
|
exports.PipInstaller = exports.PoetryInstaller = void 0;
|
|
7
|
+
/* eslint-disable class-methods-use-this */
|
|
8
|
+
/* eslint-disable max-classes-per-file */
|
|
9
|
+
const os_1 = __importDefault(require("os"));
|
|
9
10
|
const path_1 = require("path");
|
|
10
|
-
const fs_1 = require("fs");
|
|
11
11
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
12
12
|
const utils_1 = require("../../utils");
|
|
13
13
|
const chalk_1 = __importDefault(require("chalk"));
|
|
14
14
|
const commandRunner_1 = require("./commandRunner");
|
|
15
15
|
const commandUtil_1 = require("./commandUtil");
|
|
16
|
+
const encodedFile_1 = __importDefault(require("../../encodedFile"));
|
|
16
17
|
const REGEX_PKG_DEPENDENCY = /^\s*appmap\s*[=>~]+=.*$/m;
|
|
17
18
|
// include .dev0 so pip will allow prereleases
|
|
18
19
|
const PKG_DEPENDENCY = 'appmap>=1.1.0.dev0';
|
|
@@ -94,7 +95,8 @@ class PipInstaller extends PythonInstaller {
|
|
|
94
95
|
return await utils_1.exists(this.buildFilePath);
|
|
95
96
|
}
|
|
96
97
|
async installAgent() {
|
|
97
|
-
|
|
98
|
+
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
99
|
+
let requirements = encodedFile.toString();
|
|
98
100
|
const pkgExists = requirements.search(REGEX_PKG_DEPENDENCY) !== -1;
|
|
99
101
|
if (pkgExists) {
|
|
100
102
|
// Replace the existing package declaration entirely.
|
|
@@ -103,9 +105,9 @@ class PipInstaller extends PythonInstaller {
|
|
|
103
105
|
else {
|
|
104
106
|
// Insert a new package declaration.
|
|
105
107
|
// eslint-disable-next-line prefer-template
|
|
106
|
-
requirements =
|
|
108
|
+
requirements = PKG_DEPENDENCY + os_1.default.EOL + requirements;
|
|
107
109
|
}
|
|
108
|
-
|
|
110
|
+
encodedFile.write(requirements);
|
|
109
111
|
const cmd = new commandStruct_1.default('pip', ['install', '-r', this.buildFile], this.path);
|
|
110
112
|
await commandRunner_1.run(cmd);
|
|
111
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
6
6
|
};
|
|
7
7
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
8
8
|
exports.BundleInstaller = void 0;
|
|
9
|
-
const
|
|
10
|
-
const fs_1 = require("fs");
|
|
9
|
+
const os_1 = __importDefault(require("os"));
|
|
11
10
|
const path_1 = require("path");
|
|
11
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
12
12
|
const utils_1 = require("../../utils");
|
|
13
13
|
const commandRunner_1 = require("./commandRunner");
|
|
14
14
|
const commandUtil_1 = require("./commandUtil");
|
|
15
15
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
16
|
-
const
|
|
16
|
+
const encodedFile_1 = __importDefault(require("../../encodedFile"));
|
|
17
|
+
const REGEX_GEM_DECLARATION = /^(?:gem|group|require)\s/m;
|
|
17
18
|
const REGEX_GEM_DEPENDENCY = /^\s*gem\s+['|"]appmap['|"].*$/m;
|
|
18
19
|
const GEM_DEPENDENCY = "gem 'appmap', :groups => [:development, :test]";
|
|
19
20
|
class BundleInstaller {
|
|
@@ -42,24 +43,25 @@ class BundleInstaller {
|
|
|
42
43
|
return await utils_1.exists(this.buildFilePath);
|
|
43
44
|
}
|
|
44
45
|
async installAgent() {
|
|
45
|
-
|
|
46
|
+
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
47
|
+
let gemfile = encodedFile.toString();
|
|
46
48
|
const index = gemfile.search(REGEX_GEM_DECLARATION);
|
|
47
49
|
if (index !== -1) {
|
|
48
50
|
const gemExists = gemfile.search(REGEX_GEM_DEPENDENCY) !== -1;
|
|
49
51
|
if (gemExists) {
|
|
50
52
|
// Replace the existing gem declaration entirely
|
|
51
|
-
gemfile = gemfile.replace(REGEX_GEM_DEPENDENCY,
|
|
53
|
+
gemfile = gemfile.replace(REGEX_GEM_DEPENDENCY, `${os_1.default.EOL}${GEM_DEPENDENCY}`);
|
|
52
54
|
}
|
|
53
55
|
else {
|
|
54
56
|
// Insert a new gem declaration
|
|
55
57
|
const chars = gemfile.split('');
|
|
56
|
-
chars.splice(index, 0, `${GEM_DEPENDENCY}
|
|
58
|
+
chars.splice(index, 0, `${GEM_DEPENDENCY}${os_1.default.EOL + os_1.default.EOL}`);
|
|
57
59
|
gemfile = chars.join('');
|
|
58
60
|
}
|
|
59
|
-
|
|
61
|
+
encodedFile.write(gemfile);
|
|
60
62
|
}
|
|
61
63
|
else {
|
|
62
|
-
|
|
64
|
+
encodedFile.write(`${gemfile}${os_1.default.EOL}${GEM_DEPENDENCY}${os_1.default.EOL}`);
|
|
63
65
|
}
|
|
64
66
|
await commandRunner_1.run(new commandStruct_1.default('bundle', ['install'], this.path));
|
|
65
67
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,yCAAyC;;;;;;AAEzC,
|
|
1
|
+
{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":"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"}
|
package/built/src/cmds/errors.js
CHANGED
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ValidationError = exports.AbortError = exports.InstallError = void 0;
|
|
6
|
+
exports.ChildProcessError = exports.ValidationError = exports.AbortError = exports.InstallError = void 0;
|
|
7
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
8
|
+
const utils_1 = require("../utils");
|
|
4
9
|
class InstallError {
|
|
5
10
|
constructor(error, installer) {
|
|
6
11
|
this.error = error;
|
|
@@ -14,4 +19,19 @@ exports.AbortError = AbortError;
|
|
|
14
19
|
class ValidationError extends Error {
|
|
15
20
|
}
|
|
16
21
|
exports.ValidationError = ValidationError;
|
|
22
|
+
class ChildProcessError extends Error {
|
|
23
|
+
constructor(command, output, code) {
|
|
24
|
+
super([
|
|
25
|
+
`An error occurred while running the command: ${chalk_1.default.red(command)}\n`,
|
|
26
|
+
code && `The command exited with code ${chalk_1.default.red(code)}\n`,
|
|
27
|
+
output && utils_1.prefixLines(output.trim(), chalk_1.default.red('> ')),
|
|
28
|
+
]
|
|
29
|
+
.filter(Boolean)
|
|
30
|
+
.join(''));
|
|
31
|
+
this.command = command;
|
|
32
|
+
this.output = output;
|
|
33
|
+
this.code = code;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
exports.ChildProcessError = ChildProcessError;
|
|
17
37
|
//# sourceMappingURL=errors.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/cmds/errors.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/cmds/errors.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oCAAuC;AAGvC,MAAa,YAAY;IACvB,YAAqB,KAAc,EAAW,SAA0B;QAAnD,UAAK,GAAL,KAAK,CAAS;QAAW,cAAS,GAAT,SAAS,CAAiB;IAAG,CAAC;CAC7E;AAFD,oCAEC;AAED,MAAa,UAAW,SAAQ,KAAK;CAAG;AAAxC,gCAAwC;AACxC,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAC7C,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,YACW,OAAe,EACf,MAAc,EACd,IAAoB;QAE7B,KAAK,CACH;YACE,gDAAgD,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI;YACtE,IAAI,IAAI,gCAAgC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YAC3D,MAAM,IAAI,mBAAW,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,eAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvD;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,EAAE,CAAC,CACZ,CAAC;QAZO,YAAO,GAAP,OAAO,CAAQ;QACf,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAgB;IAW/B,CAAC;CACF;AAhBD,8CAgBC"}
|
|
@@ -12,14 +12,14 @@ class UserInteraction {
|
|
|
12
12
|
constructor() {
|
|
13
13
|
this.spinner = ora_1.default();
|
|
14
14
|
}
|
|
15
|
-
async prompt(questions) {
|
|
15
|
+
async prompt(questions, opts) {
|
|
16
16
|
const wasSpinning = this.spinner.isSpinning;
|
|
17
17
|
if (wasSpinning) {
|
|
18
18
|
this.spinner.stop();
|
|
19
19
|
this.spinner.clear();
|
|
20
20
|
}
|
|
21
21
|
const result = await inquirer_1.default.prompt(questions);
|
|
22
|
-
if (wasSpinning) {
|
|
22
|
+
if (wasSpinning && !(opts === null || opts === void 0 ? void 0 : opts.supressSpinner)) {
|
|
23
23
|
this.spinner.start();
|
|
24
24
|
}
|
|
25
25
|
return result;
|
|
@@ -43,7 +43,8 @@ class UserInteraction {
|
|
|
43
43
|
this.spinner.fail();
|
|
44
44
|
}
|
|
45
45
|
if (msg) {
|
|
46
|
-
console.error('
|
|
46
|
+
console.error('');
|
|
47
|
+
console.error(msg);
|
|
47
48
|
}
|
|
48
49
|
}
|
|
49
50
|
warn(msg) {
|