@appland/appmap 3.71.0 → 3.72.0
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 +7 -0
- package/built/cmds/agentInstaller/agentInstaller.js +2 -2
- package/built/cmds/agentInstaller/agentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/agentInstallerProcedure.js +26 -37
- package/built/cmds/agentInstaller/agentInstallerProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/agentProcedure.js +19 -24
- package/built/cmds/agentInstaller/agentProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/agentStatusProcedure.js +4 -5
- package/built/cmds/agentInstaller/agentStatusProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/gradleInstaller.js +10 -23
- package/built/cmds/agentInstaller/gradleInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/install-agent.js +35 -21
- package/built/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/cmds/agentInstaller/installerUI.js +174 -0
- package/built/cmds/agentInstaller/installerUI.js.map +1 -0
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js +4 -4
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/mavenInstaller.js +2 -2
- package/built/cmds/agentInstaller/mavenInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/projectConfiguration.js +12 -36
- package/built/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/built/cmds/agentInstaller/pythonAgentInstaller.js +11 -20
- package/built/cmds/agentInstaller/pythonAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/rubyAgentInstaller.js +2 -2
- package/built/cmds/agentInstaller/rubyAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/status.js +4 -2
- package/built/cmds/agentInstaller/status.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,2BAAoC;AACpC,sCAMmB;AACnB,uCAA4D;AAC5D,wFAAgE;AAChE,kDAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,174 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.OverwriteOption = void 0;
|
|
7
|
+
const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
8
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
9
|
+
var OverwriteOption;
|
|
10
|
+
(function (OverwriteOption) {
|
|
11
|
+
OverwriteOption["USE_EXISTING"] = "Use existing";
|
|
12
|
+
OverwriteOption["OVERWRITE"] = "Overwrite";
|
|
13
|
+
OverwriteOption["ABORT"] = "Abort";
|
|
14
|
+
})(OverwriteOption = exports.OverwriteOption || (exports.OverwriteOption = {}));
|
|
15
|
+
class InstallerUI {
|
|
16
|
+
constructor(interactive, options) {
|
|
17
|
+
this.interactive = interactive;
|
|
18
|
+
this.options = options;
|
|
19
|
+
}
|
|
20
|
+
message(message) {
|
|
21
|
+
console.log(message);
|
|
22
|
+
}
|
|
23
|
+
status(status) {
|
|
24
|
+
userInteraction_1.default.status = status;
|
|
25
|
+
}
|
|
26
|
+
success(message) {
|
|
27
|
+
userInteraction_1.default.success(message);
|
|
28
|
+
}
|
|
29
|
+
warn(message) {
|
|
30
|
+
userInteraction_1.default.warn(message);
|
|
31
|
+
}
|
|
32
|
+
error(message) {
|
|
33
|
+
userInteraction_1.default.error(message);
|
|
34
|
+
}
|
|
35
|
+
async confirm(message) {
|
|
36
|
+
if (!this.interactive)
|
|
37
|
+
return true;
|
|
38
|
+
const { confirm } = await userInteraction_1.default.prompt({
|
|
39
|
+
type: 'confirm',
|
|
40
|
+
name: 'confirm',
|
|
41
|
+
message: message,
|
|
42
|
+
});
|
|
43
|
+
return confirm;
|
|
44
|
+
}
|
|
45
|
+
async attemptUnsupportedProjectType(message) {
|
|
46
|
+
if (this.interactive)
|
|
47
|
+
return true;
|
|
48
|
+
const { willContinue } = await userInteraction_1.default.prompt([
|
|
49
|
+
{
|
|
50
|
+
type: 'confirm',
|
|
51
|
+
name: 'willContinue',
|
|
52
|
+
prefix: chalk_1.default.yellow('!'),
|
|
53
|
+
message,
|
|
54
|
+
},
|
|
55
|
+
]);
|
|
56
|
+
return willContinue;
|
|
57
|
+
}
|
|
58
|
+
async chooseSubprojects(rootHasInstaller) {
|
|
59
|
+
if (!this.interactive)
|
|
60
|
+
return false;
|
|
61
|
+
const { addSubprojects } = await userInteraction_1.default.prompt({
|
|
62
|
+
type: 'confirm',
|
|
63
|
+
default: !rootHasInstaller,
|
|
64
|
+
name: 'addSubprojects',
|
|
65
|
+
message: 'This directory contains sub-projects. Would you like to choose sub-projects for installation?',
|
|
66
|
+
});
|
|
67
|
+
return addSubprojects;
|
|
68
|
+
}
|
|
69
|
+
async selectSubprojects(projects) {
|
|
70
|
+
if (!this.interactive) {
|
|
71
|
+
console.warn(`The installer should not be prompting for sub-projects in non-interactive mode!`);
|
|
72
|
+
return [];
|
|
73
|
+
}
|
|
74
|
+
const { selectedSubprojects } = await userInteraction_1.default.prompt({
|
|
75
|
+
type: 'checkbox',
|
|
76
|
+
name: 'selectedSubprojects',
|
|
77
|
+
message: 'Select the projects to install AppMap to.',
|
|
78
|
+
choices: projects,
|
|
79
|
+
});
|
|
80
|
+
return selectedSubprojects;
|
|
81
|
+
}
|
|
82
|
+
async pythonBuildFile(defaultChoice, choices) {
|
|
83
|
+
if (this.options.buildFile)
|
|
84
|
+
return this.options.buildFile;
|
|
85
|
+
if (!this.interactive)
|
|
86
|
+
throw new Error(`Multiple build files are available in this project (${choices.join(', ')}). Use the --build-file option to specify one of them.`);
|
|
87
|
+
const { buildFile } = await userInteraction_1.default.prompt([
|
|
88
|
+
{
|
|
89
|
+
type: 'list',
|
|
90
|
+
name: 'buildFile',
|
|
91
|
+
message: 'Please choose the requirements file used for development:',
|
|
92
|
+
choices,
|
|
93
|
+
default: defaultChoice,
|
|
94
|
+
},
|
|
95
|
+
]);
|
|
96
|
+
return buildFile;
|
|
97
|
+
}
|
|
98
|
+
async selectProject(message, name, availableInstallers) {
|
|
99
|
+
if (this.options.installerName)
|
|
100
|
+
return this.options.installerName;
|
|
101
|
+
if (!this.interactive)
|
|
102
|
+
throw new Error(`Project can be configured with multiple different installers (${availableInstallers.join(', ')}). Use the --installer-name option to specify one of them.`);
|
|
103
|
+
const result = await userInteraction_1.default.prompt({
|
|
104
|
+
type: 'list',
|
|
105
|
+
name,
|
|
106
|
+
message: message,
|
|
107
|
+
choices: availableInstallers,
|
|
108
|
+
});
|
|
109
|
+
return result[name];
|
|
110
|
+
}
|
|
111
|
+
async addMavenCentral() {
|
|
112
|
+
if (!this.interactive)
|
|
113
|
+
return true;
|
|
114
|
+
const { addMavenCentral } = await userInteraction_1.default.prompt({
|
|
115
|
+
type: 'list',
|
|
116
|
+
name: 'addMavenCentral',
|
|
117
|
+
message: 'The Maven Central repository is required by the AppMap plugin to fetch the AppMap agent JAR. Add it now?',
|
|
118
|
+
choices: ['Yes', 'No'],
|
|
119
|
+
});
|
|
120
|
+
return addMavenCentral === 'Yes';
|
|
121
|
+
}
|
|
122
|
+
async commitConfiguration(message) {
|
|
123
|
+
if (!this.interactive) {
|
|
124
|
+
console.warn(`The installer should not be trying to commit configuration in non-interactive mode!`);
|
|
125
|
+
return false;
|
|
126
|
+
}
|
|
127
|
+
const { commit } = await userInteraction_1.default.prompt({
|
|
128
|
+
type: 'confirm',
|
|
129
|
+
name: 'commit',
|
|
130
|
+
message: message,
|
|
131
|
+
});
|
|
132
|
+
return commit;
|
|
133
|
+
}
|
|
134
|
+
async continueWithoutJavaPlugin() {
|
|
135
|
+
if (!this.interactive)
|
|
136
|
+
return true;
|
|
137
|
+
const { userWillContinue } = await userInteraction_1.default.prompt({
|
|
138
|
+
type: 'list',
|
|
139
|
+
name: 'userWillContinue',
|
|
140
|
+
message: `The ${chalk_1.default.red("'java'")} plugin was not found. This configuration is unsupported and is likely to fail. Continue?`,
|
|
141
|
+
default: 'Abort',
|
|
142
|
+
choices: ['Abort', 'Continue'],
|
|
143
|
+
});
|
|
144
|
+
return userWillContinue === 'Continue';
|
|
145
|
+
}
|
|
146
|
+
async overwriteAppMapConfig() {
|
|
147
|
+
if (this.options.overwriteAppMapConfig === true)
|
|
148
|
+
return OverwriteOption.OVERWRITE;
|
|
149
|
+
if (this.options.overwriteAppMapConfig === false)
|
|
150
|
+
return OverwriteOption.USE_EXISTING;
|
|
151
|
+
if (!this.interactive)
|
|
152
|
+
throw new Error(`The project already contains an AppMap config file (e.g. appmap.yml). Use the --overwrite-appmap-config option to specify whether it should be overwritten.`);
|
|
153
|
+
const { overwriteAppMapYml } = await userInteraction_1.default.prompt({
|
|
154
|
+
type: 'list',
|
|
155
|
+
name: 'overwriteAppMapYml',
|
|
156
|
+
message: 'An appmap.yml configuration file already exists. How should the conflict be resolved?',
|
|
157
|
+
choices: [OverwriteOption.USE_EXISTING, OverwriteOption.OVERWRITE, OverwriteOption.ABORT],
|
|
158
|
+
});
|
|
159
|
+
return overwriteAppMapYml;
|
|
160
|
+
}
|
|
161
|
+
async shouldShowError(message) {
|
|
162
|
+
if (!this.interactive)
|
|
163
|
+
return true;
|
|
164
|
+
const { showError } = await userInteraction_1.default.prompt({
|
|
165
|
+
name: 'showError',
|
|
166
|
+
type: 'confirm',
|
|
167
|
+
message,
|
|
168
|
+
prefix: chalk_1.default.red('!'),
|
|
169
|
+
}, { supressSpinner: true });
|
|
170
|
+
return showError;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
exports.default = InstallerUI;
|
|
174
|
+
//# sourceMappingURL=installerUI.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"installerUI.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/installerUI.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,10 +53,10 @@ class NpmInstaller extends JavaScriptInstaller {
|
|
|
53
53
|
async available() {
|
|
54
54
|
return await (0, utils_1.exists)(this.buildFilePath);
|
|
55
55
|
}
|
|
56
|
-
async checkConfigCommand() {
|
|
56
|
+
async checkConfigCommand(_ui) {
|
|
57
57
|
return new commandStruct_1.default('npm', ['install', '--dry-run'], this.path);
|
|
58
58
|
}
|
|
59
|
-
async installAgent() {
|
|
59
|
+
async installAgent(_ui) {
|
|
60
60
|
const cmd = new commandStruct_1.default('npm', ['install', '--saveDev', process.env.APPMAP_AGENT_PACKAGE || AGENT_PACKAGE], this.path);
|
|
61
61
|
await (0, commandRunner_1.run)(cmd);
|
|
62
62
|
}
|
|
@@ -79,10 +79,10 @@ class YarnInstaller extends JavaScriptInstaller {
|
|
|
79
79
|
async available() {
|
|
80
80
|
return await (0, utils_1.exists)(this.buildFilePath);
|
|
81
81
|
}
|
|
82
|
-
async checkConfigCommand() {
|
|
82
|
+
async checkConfigCommand(_ui) {
|
|
83
83
|
return new commandStruct_1.default('yarn', ['install', '--immutable'], this.path);
|
|
84
84
|
}
|
|
85
|
-
async installAgent() {
|
|
85
|
+
async installAgent(_ui) {
|
|
86
86
|
const cmd = new commandStruct_1.default('yarn', ['add', '--dev', process.env.APPMAP_AGENT_PACKAGE || AGENT_PACKAGE], this.path);
|
|
87
87
|
await (0, commandRunner_1.run)(cmd);
|
|
88
88
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"javaScriptAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/javaScriptAgentInstaller.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAqC;AACrC,+CAA0C;AAC1C,+BAA4B;AAC5B,mDAAsC;AACtC,sEAA8C;AAC9C,kDAA0B;AAC1B,oEAA4C;AAC5C,sCAA4C;AAC5C,oDAA4B;
|
|
1
|
+
{"version":3,"file":"javaScriptAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/javaScriptAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,10 +50,10 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
50
50
|
return new commandStruct_1.default(this.runCommand(), ['appmap:print-jar-path'], this.path);
|
|
51
51
|
}
|
|
52
52
|
// TODO: validate the user's project before adding AppMap
|
|
53
|
-
async checkConfigCommand() {
|
|
53
|
+
async checkConfigCommand(_ui) {
|
|
54
54
|
return undefined;
|
|
55
55
|
}
|
|
56
|
-
async installAgent() {
|
|
56
|
+
async installAgent(_ui) {
|
|
57
57
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
58
58
|
const buildFileSource = encodedFile.toString();
|
|
59
59
|
const jsdom = new jsdom_1.JSDOM();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":";;;;;AAAA,2BAAgC;AAChC,4CAAoB;AACpB,+BAA6D;AAC7D,iCAA8B;AAC9B,0EAA8C;AAC9C,kDAA0B;AAC1B,oEAA4C;AAC5C,uCAA8C;AAC9C,sFAA8D;AAC9D,oEAA4C;
|
|
1
|
+
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,11 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
9
9
|
const fs_1 = require("fs");
|
|
10
10
|
const path_1 = require("path");
|
|
11
11
|
const errors_1 = require("../errors");
|
|
12
|
-
const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
13
12
|
const installers_1 = __importDefault(require("./installers"));
|
|
14
13
|
const javaScriptAgentInstaller_1 = require("./javaScriptAgentInstaller");
|
|
15
14
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
16
15
|
const commandRunner_1 = require("./commandRunner");
|
|
17
|
-
async function resolveSelectedInstallers(projects, userSpecifiedInstaller) {
|
|
16
|
+
async function resolveSelectedInstallers(ui, projects, userSpecifiedInstaller) {
|
|
18
17
|
// Attempt to resolve selectedInstallers from the user's arg line input.
|
|
19
18
|
if (userSpecifiedInstaller) {
|
|
20
19
|
for (const project of projects) {
|
|
@@ -22,16 +21,9 @@ async function resolveSelectedInstallers(projects, userSpecifiedInstaller) {
|
|
|
22
21
|
let selectedInstaller;
|
|
23
22
|
selectedInstaller = availableInstallers.find((i) => i.name.toLowerCase() === userSpecifiedInstaller.toLowerCase());
|
|
24
23
|
if (!selectedInstaller) {
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
name: 'willContinue',
|
|
29
|
-
prefix: chalk_1.default.yellow('!'),
|
|
30
|
-
message: `${chalk_1.default.red(userSpecifiedInstaller)} is not a supported project type. However, installation may continue with: ${availableInstallers
|
|
31
|
-
.map((i) => chalk_1.default.blue(i.name))
|
|
32
|
-
.join(', ')}. Continue?`,
|
|
33
|
-
},
|
|
34
|
-
]);
|
|
24
|
+
const willContinue = await ui.attemptUnsupportedProjectType(`${chalk_1.default.red(userSpecifiedInstaller)} is not a supported project type. However, installation may continue with: ${availableInstallers
|
|
25
|
+
.map((i) => chalk_1.default.blue(i.name))
|
|
26
|
+
.join(', ')}. Continue?`);
|
|
35
27
|
if (!willContinue) {
|
|
36
28
|
throw new errors_1.AbortError([
|
|
37
29
|
`user attempted to install via \`${userSpecifiedInstaller}\` but aborted.`,
|
|
@@ -52,13 +44,7 @@ async function resolveSelectedInstallers(projects, userSpecifiedInstaller) {
|
|
|
52
44
|
}
|
|
53
45
|
else {
|
|
54
46
|
const key = `installer${i}`;
|
|
55
|
-
const
|
|
56
|
-
type: 'list',
|
|
57
|
-
name: key,
|
|
58
|
-
message: `Multiple project types were found in ${chalk_1.default.blue((0, path_1.resolve)(project.path))}. Select one to continue.`,
|
|
59
|
-
choices: project.availableInstallers.map((i) => i.name),
|
|
60
|
-
});
|
|
61
|
-
const installerName = result[key];
|
|
47
|
+
const installerName = await ui.selectProject(`Multiple project types were found in ${chalk_1.default.blue((0, path_1.resolve)(project.path))}. Select one to continue.`, key, project.availableInstallers.map((i) => i.name));
|
|
62
48
|
project.selectedInstaller = project.availableInstallers.find((i) => i.name === installerName);
|
|
63
49
|
}
|
|
64
50
|
}
|
|
@@ -167,7 +153,7 @@ exports.getYarnSubprojects = getYarnSubprojects;
|
|
|
167
153
|
* @returns ProjectConfiguration[] if the user chooses to install to subprojects, otherwise
|
|
168
154
|
* undefined
|
|
169
155
|
*/
|
|
170
|
-
async function getSubprojects(dir, rootHasInstaller, availableInstallers) {
|
|
156
|
+
async function getSubprojects(ui, dir, rootHasInstaller, availableInstallers) {
|
|
171
157
|
let subprojects = [];
|
|
172
158
|
const yarnSubprojects = await getYarnSubprojects(dir, availableInstallers);
|
|
173
159
|
if (yarnSubprojects.length > 0) {
|
|
@@ -204,34 +190,24 @@ async function getSubprojects(dir, rootHasInstaller, availableInstallers) {
|
|
|
204
190
|
// There's nothing that we can do here.
|
|
205
191
|
return undefined;
|
|
206
192
|
}
|
|
207
|
-
const
|
|
208
|
-
|
|
209
|
-
default: !rootHasInstaller,
|
|
210
|
-
name: 'addSubprojects',
|
|
211
|
-
message: 'This directory contains sub-projects. Would you like to choose sub-projects for installation?',
|
|
212
|
-
});
|
|
213
|
-
if (!addSubprojects) {
|
|
193
|
+
const chooseSubprojects = await ui.chooseSubprojects(rootHasInstaller);
|
|
194
|
+
if (!chooseSubprojects) {
|
|
214
195
|
// The user has opted not to continue by not selecting subprojects.
|
|
215
196
|
return undefined;
|
|
216
197
|
}
|
|
217
198
|
const subProjectConfigurations = [];
|
|
218
|
-
const
|
|
219
|
-
type: 'checkbox',
|
|
220
|
-
name: 'selectedSubprojects',
|
|
221
|
-
message: 'Select the projects to install AppMap to.',
|
|
222
|
-
choices: subprojects.map(({ name }) => name),
|
|
223
|
-
});
|
|
199
|
+
const selectedSubprojects = await ui.selectSubprojects(subprojects.map(({ name }) => name));
|
|
224
200
|
if (selectedSubprojects.length > 0) {
|
|
225
201
|
subProjectConfigurations.push(...subprojects.filter(({ name }) => selectedSubprojects.includes(name)));
|
|
226
202
|
}
|
|
227
203
|
return subProjectConfigurations;
|
|
228
204
|
}
|
|
229
|
-
async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller) {
|
|
205
|
+
async function getProjects(ui, installers, dir, allowMulti, userSpecifiedInstaller) {
|
|
230
206
|
let projectConfigurations = [];
|
|
231
207
|
const availableInstallers = await (0, installers_1.default)(dir);
|
|
232
208
|
const rootHasInstaller = !!availableInstallers.length;
|
|
233
209
|
if (allowMulti) {
|
|
234
|
-
const subprojects = await getSubprojects(dir, rootHasInstaller, availableInstallers);
|
|
210
|
+
const subprojects = await getSubprojects(ui, dir, rootHasInstaller, availableInstallers);
|
|
235
211
|
if (subprojects === null || subprojects === void 0 ? void 0 : subprojects.length) {
|
|
236
212
|
projectConfigurations.push(...subprojects);
|
|
237
213
|
}
|
|
@@ -268,7 +244,7 @@ async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller)
|
|
|
268
244
|
].join('\n'), dir);
|
|
269
245
|
}
|
|
270
246
|
}
|
|
271
|
-
await resolveSelectedInstallers(projectConfigurations, userSpecifiedInstaller);
|
|
247
|
+
await resolveSelectedInstallers(ui, projectConfigurations, userSpecifiedInstaller);
|
|
272
248
|
return projectConfigurations;
|
|
273
249
|
}
|
|
274
250
|
exports.getProjects = getProjects;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,kDAA0B;AAC1B,2BAA8D;AAE9D,+BAA+C;AAC/C,sCAA4E;
|
|
1
|
+
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,kDAA0B;AAC1B,2BAA8D;AAE9D,+BAA+C;AAC/C,sCAA4E;AAG5E,8DAAkD;AAClD,yEAA2D;AAC3D,oEAA+D;AAC/D,mDAAsC;AAUtC,KAAK,UAAU,yBAAyB,CACtC,EAAe,EACf,QAAgC,EAChC,sBAA+B;IAE/B,wEAAwE;IACxE,IAAI,sBAAsB,EAAE;QAC1B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;YACxC,IAAI,iBAA6C,CAAC;YAElD,iBAAiB,GAAG,mBAAmB,CAAC,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,sBAAsB,CAAC,WAAW,EAAE,CACrE,CAAC;YAEF,IAAI,CAAC,iBAAiB,EAAE;gBACtB,MAAM,YAAY,GAAG,MAAM,EAAE,CAAC,6BAA6B,CACzD,GAAG,eAAK,CAAC,GAAG,CACV,sBAAsB,CACvB,8EAA8E,mBAAmB;qBAC/F,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;qBAC9B,IAAI,CAAC,IAAI,CAAC,aAAa,CAC3B,CAAC;gBACF,IAAI,CAAC,YAAY,EAAE;oBACjB,MAAM,IAAI,mBAAU,CAClB;wBACE,mCAAmC,sBAAsB,iBAAiB;wBAC1E,yBAAyB,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;qBAC7E,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;iBACH;aACF;YAED,OAAO,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;SAC/C;KACF;IAED,+FAA+F;IAC/F,uBAAuB;IACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;YAC9B,IAAI,OAAO,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC5C,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;aAC5D;iBAAM;gBACL,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,CAAC;gBAC5B,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,aAAa,CAC1C,wCAAwC,eAAK,CAAC,IAAI,CAChD,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CACtB,2BAA2B,EAC5B,GAAG,EACH,OAAO,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAC/C,CAAC;gBACF,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAC1D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CAChC,CAAC;aACH;SACF;KACF;IAED,qFAAqF;IACrF,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC,iBAAiB,CAAC,EAAE;QAChE,MAAM,IAAI,KAAK,CAAC,mBAAmB,CAAC,CAAC;KACtC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,IAAa;IACpC,IAAA,gBAAM,EAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAoB,EAAE,EAAE;QAClE,IAAA,gBAAM,EAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC;QACzC,IAAA,gBAAM,EAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QAC3B,IAAA,gBAAM,EAAC,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,QAAQ,CAAC,CAAC;QAC7C,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACL,CAAC;AACD,eAAe;AACf,+EAA+E;AAC/E,kCAAkC;AAClC,6BAA6B;AAC7B,iGAAiG;AACjG,gGAAgG;AAChG,4EAA4E;AAC5E,gCAAgC;AAChC,kCAAkC;AAClC,6BAA6B;AAC7B,MAAM;AACN,sBAAsB;AACtB,kCAAkC;AAClC,oCAAoC;AACpC,6CAA6C;AAC7C,OAAO;AACP,MAAM;AACN,mBAAmB;AACnB,KAAK,UAAU,4BAA4B,CACzC,GAAW,EACX,SAAwB,EACxB,WAAmC;IAEnC,MAAM,GAAG,GAAG,IAAI,uBAAa,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IACxF,IAAI,MAAqB,CAAC;IAC1B,IAAI;QACF,MAAM,GAAG,MAAM,IAAA,mBAAG,EAAC,GAAG,CAAC,CAAC;KACzB;IAAC,OAAO,CAAC,EAAE;QACV,IAAI,0BAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;YAAE,OAAO;QACvC,MAAM,CAAC,CAAC;KACT;IAED,wCAAwC;IACxC,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACtC,IAAI,WAAW,GAAG,EAAE,CAAC;IACrB,KAAK,MAAM,IAAI,IAAI,KAAK;QACtB,IAAI,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YAAE,WAAW,IAAI,IAAI,CAAC;IAElG,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,EAAE;QACvE,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAG,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;QACtC,MAAM,oBAAoB,GAAyB;YACjD,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,cAAc;YACpB,yCAAyC;YACzC,mBAAmB,EAAE,CAAC,IAAI,wCAAa,CAAC,cAAc,CAAC,CAAC;SACzD,CAAC;QACF,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;KACxC;AACH,CAAC;AAED,KAAK,UAAU,iCAAiC,CAC9C,GAAW,EACX,SAAwB,EACxB,WAAmC;IAEnC,MAAM,GAAG,GAAG,IAAI,uBAAa,CAAC,MAAM,EAAE,CAAC,YAAY,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IACxF,MAAM,MAAM,GAAG,MAAM,IAAA,mBAAG,EAAC,GAAG,CAAC,CAAC;IAE9B,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;QAC5C,IAAI,IAAI,KAAK,EAAE,EAAE;YACf,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACvC,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;YAC5D,MAAM,cAAc,GAAG,IAAA,eAAQ,EAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC;YACvD,MAAM,oBAAoB,GAAyB;gBACjD,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,cAAc;gBACpB,yCAAyC;gBACzC,mBAAmB,EAAE,CAAC,IAAI,wCAAa,CAAC,cAAc,CAAC,CAAC;aACzD,CAAC;YACF,WAAW,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;SACxC;KACF;AACH,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,GAAW,EACX,mBAAqC;IAErC,IAAI,WAAW,GAA2B,EAAE,CAAC;IAE7C,KAAK,MAAM,SAAS,IAAI,mBAAmB,EAAE;QAC3C,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE;YAC7B,MAAM,aAAa,GAAG,SAA0B,CAAC;YACjD,IAAI,MAAM,aAAa,CAAC,gBAAgB,EAAE,EAAE;gBAC1C,MAAM,4BAA4B,CAAC,GAAG,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;aACrE;iBAAM;gBACL,MAAM,iCAAiC,CAAC,GAAG,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;aAC1E;SACF;KACF;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAlBD,gDAkBC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,cAAc,CAC3B,EAAe,EACf,GAAW,EACX,gBAAyB,EACzB,mBAAqC;IAErC,IAAI,WAAW,GAA2B,EAAE,CAAC;IAC7C,MAAM,eAAe,GAA2B,MAAM,kBAAkB,CACtE,GAAG,EACH,mBAAmB,CACpB,CAAC;IAEF,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;QAC9B,uCAAuC;QACvC,WAAW,GAAG,eAAe,CAAC;KAC/B;SAAM;QACL,wCAAwC;QACxC,MAAM,IAAI,GAAG,MAAM,aAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5D,WAAW,GAAG,CACZ,MAAM,OAAO,CAAC,GAAG,CACf,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAwC,EAAE;YAC3D,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,EAAE;gBACtB,OAAO,IAAI,CAAC;aACb;YAED,MAAM,cAAc,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;YAC3C,IAAI;gBACF,MAAM,aAAE,CAAC,MAAM,CAAC,cAAc,EAAE,cAAW,CAAC,IAAI,CAAC,CAAC;aACnD;YAAC,WAAM;gBACN,6CAA6C;gBAC7C,OAAO,IAAI,CAAC;aACb;YAED,MAAM,UAAU,GAAG,MAAM,IAAA,oBAAsB,EAAC,cAAc,CAAC,CAAC;YAChE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;gBACtB,OAAO,IAAI,CAAC;aACb;YAED,OAAO;gBACL,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,IAAI,EAAE,cAAc;gBACpB,mBAAmB,EAAE,UAAU;aAChC,CAAC;QACJ,CAAC,CAAC,CACH,CACF,CAAC,MAAM,CAAC,OAAO,CAA2B,CAAC;KAC7C;IAED,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE;QACvB,uCAAuC;QACvC,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,iBAAiB,GAAG,MAAM,EAAE,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,CAAC;IACvE,IAAI,CAAC,iBAAiB,EAAE;QACtB,mEAAmE;QACnE,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,wBAAwB,GAA2B,EAAE,CAAC;IAC5D,MAAM,mBAAmB,GAAG,MAAM,EAAE,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5F,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;QAClC,wBAAwB,CAAC,IAAI,CAC3B,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CACxE,CAAC;KACH;IAED,OAAO,wBAAwB,CAAC;AAClC,CAAC;AAEM,KAAK,UAAU,WAAW,CAC/B,EAAe,EACf,UAAqC,EACrC,GAAW,EACX,UAAoB,EACpB,sBAA+B;IAE/B,IAAI,qBAAqB,GAA2B,EAAE,CAAC;IAEvD,MAAM,mBAAmB,GAAG,MAAM,IAAA,oBAAsB,EAAC,GAAG,CAAC,CAAC;IAC9D,MAAM,gBAAgB,GAAG,CAAC,CAAC,mBAAmB,CAAC,MAAM,CAAC;IACtD,IAAI,UAAU,EAAE;QACd,MAAM,WAAW,GAAG,MAAM,cAAc,CAAC,EAAE,EAAE,GAAG,EAAE,gBAAgB,EAAE,mBAAmB,CAAC,CAAC;QACzF,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,EAAE;YACvB,qBAAqB,CAAC,IAAI,CAAC,GAAI,WAAsC,CAAC,CAAC;SACxE;aAAM,IAAI,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,MAAK,CAAC,EAAE;YACpC,MAAM,IAAI,yBAAgB,CACxB,kEAAkE,EAClE,GAAG,CACJ,CAAC;SACH;KACF;IAED,wFAAwF;IACxF,IAAI,CAAC,qBAAqB,CAAC,MAAM,EAAE;QACjC,IAAI,mBAAmB,CAAC,MAAM,EAAE;YAC9B,qBAAqB,GAAG;gBACtB;oBACE,IAAI,EAAE,IAAA,eAAQ,EAAC,GAAG,CAAC;oBACnB,IAAI,EAAE,IAAA,cAAO,EAAC,GAAG,CAAC;oBAClB,mBAAmB;iBACpB;aACF,CAAC;SACH;aAAM;YACL,MAAM,oBAAoB,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;YAE/E,MAAM,IAAI,yBAAgB,CACxB;gBACE,qCAAqC,eAAK,CAAC,GAAG,CAAC,IAAA,cAAO,EAAC,GAAG,CAAC,CAAC,GAAG;gBAC/D,EAAE;gBACF,uEAAuE;gBACvE,UAAU;qBACP,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ,GAAG,eAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,oBAAoB,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,IAAI,eAAK,CAAC,MAAM,CACzE,GAAG,CAAC,CAAC,SAAS,YAAY,CAC3B,EAAE,CACN;qBACA,MAAM,CAAC,OAAO,CAAC;qBACf,IAAI,CAAC,IAAI,CAAC;gBACb,EAAE;gBACF,uEAAuE;gBACvE,EAAE;gBACF,qGAAqG;gBACrG,OAAO,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB;aACpD,CAAC,IAAI,CAAC,IAAI,CAAC,EACZ,GAAG,CACJ,CAAC;SACH;KACF;IAED,MAAM,yBAAyB,CAAC,EAAE,EAAE,qBAAqB,EAAE,sBAAsB,CAAC,CAAC;IAEnF,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAhED,kCAgEC"}
|
|
@@ -15,7 +15,6 @@ const semver_1 = __importDefault(require("semver"));
|
|
|
15
15
|
const encodedFile_1 = __importDefault(require("../../encodedFile"));
|
|
16
16
|
const utils_1 = require("../../utils");
|
|
17
17
|
const errors_1 = require("../errors");
|
|
18
|
-
const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
19
18
|
const agentInstaller_1 = __importDefault(require("./agentInstaller"));
|
|
20
19
|
const commandRunner_1 = require("./commandRunner");
|
|
21
20
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
@@ -63,7 +62,7 @@ class PoetryInstaller extends PythonInstaller {
|
|
|
63
62
|
async initCommand() {
|
|
64
63
|
return new commandStruct_1.default('poetry', ['run', 'appmap-agent-init'], this.path);
|
|
65
64
|
}
|
|
66
|
-
async checkConfigCommand() {
|
|
65
|
+
async checkConfigCommand(_ui) {
|
|
67
66
|
return new commandStruct_1.default('poetry', ['install', '--dry-run'], this.path);
|
|
68
67
|
}
|
|
69
68
|
async installAgent() {
|
|
@@ -99,10 +98,10 @@ class PipenvInstaller extends PythonInstaller {
|
|
|
99
98
|
async initCommand() {
|
|
100
99
|
return new commandStruct_1.default('pipenv', ['run', 'appmap-agent-init'], this.path);
|
|
101
100
|
}
|
|
102
|
-
async checkConfigCommand() {
|
|
101
|
+
async checkConfigCommand(_ui) {
|
|
103
102
|
return new commandStruct_1.default('pipenv', ['install', '--dev'], this.path);
|
|
104
103
|
}
|
|
105
|
-
async installAgent() {
|
|
104
|
+
async installAgent(_ui) {
|
|
106
105
|
const cmd = new commandStruct_1.default('pipenv', ['install', '--dev', '--pre', 'appmap'], this.path);
|
|
107
106
|
await (0, commandRunner_1.run)(cmd);
|
|
108
107
|
}
|
|
@@ -139,36 +138,28 @@ class PipInstaller extends PythonInstaller {
|
|
|
139
138
|
nodir: true,
|
|
140
139
|
});
|
|
141
140
|
}
|
|
142
|
-
async chooseBuildFile(choices) {
|
|
141
|
+
async chooseBuildFile(ui, choices) {
|
|
143
142
|
const defaultChoice = choices.filter((f) => (0, minimatch_1.default)(f, '*dev*', { matchBase: true }));
|
|
144
|
-
const
|
|
145
|
-
{
|
|
146
|
-
type: 'list',
|
|
147
|
-
name: 'buildFile',
|
|
148
|
-
message: 'Please choose the requirements file used for development:',
|
|
149
|
-
choices,
|
|
150
|
-
default: defaultChoice[0],
|
|
151
|
-
},
|
|
152
|
-
]);
|
|
143
|
+
const buildFile = await ui.pythonBuildFile(defaultChoice[0], choices);
|
|
153
144
|
return (0, path_1.basename)(buildFile);
|
|
154
145
|
}
|
|
155
|
-
async resolveBuildFile() {
|
|
146
|
+
async resolveBuildFile(ui) {
|
|
156
147
|
const choices = this.findBuildFiles();
|
|
157
148
|
if (choices.length === 1) {
|
|
158
149
|
return choices[0];
|
|
159
150
|
}
|
|
160
151
|
else {
|
|
161
|
-
|
|
152
|
+
ui.message(`
|
|
162
153
|
|
|
163
154
|
This project contains multiple Pip requirements files. AppMap should only be
|
|
164
155
|
installed during development and testing, not when deploying in a production
|
|
165
156
|
environment.
|
|
166
157
|
`);
|
|
167
|
-
return this.chooseBuildFile(choices);
|
|
158
|
+
return this.chooseBuildFile(ui, choices);
|
|
168
159
|
}
|
|
169
160
|
}
|
|
170
|
-
async checkConfigCommand() {
|
|
171
|
-
this._buildFile = await this.resolveBuildFile();
|
|
161
|
+
async checkConfigCommand(ui) {
|
|
162
|
+
this._buildFile = await this.resolveBuildFile(ui);
|
|
172
163
|
let commandArgs = ['-m', 'pip', 'install', '-r', this.buildFile];
|
|
173
164
|
let supportsDryRun;
|
|
174
165
|
try {
|
|
@@ -187,7 +178,7 @@ environment.
|
|
|
187
178
|
}
|
|
188
179
|
return new commandStruct_1.default('python3', commandArgs, this.path);
|
|
189
180
|
}
|
|
190
|
-
async installAgent() {
|
|
181
|
+
async installAgent(_ui) {
|
|
191
182
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
192
183
|
let requirements = encodedFile.toString();
|
|
193
184
|
const pkgExists = requirements.search(REGEX_PKG_DEPENDENCY) !== -1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA2C;AAC3C,yCAAyC;AACzC,kDAA0B;AAC1B,+BAA4B;AAC5B,0DAAkC;AAClC,4CAAoB;AACpB,+BAAsC;AACtC,oDAA4B;
|
|
1
|
+
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ class BundleInstaller extends agentInstaller_1.default {
|
|
|
41
41
|
async available() {
|
|
42
42
|
return await (0, utils_1.exists)(this.buildFilePath);
|
|
43
43
|
}
|
|
44
|
-
async checkConfigCommand() {
|
|
44
|
+
async checkConfigCommand(_ui) {
|
|
45
45
|
return new commandStruct_1.default('bundle', ['check', '--dry-run'], this.path);
|
|
46
46
|
}
|
|
47
47
|
async checkBundlerConfig() {
|
|
@@ -51,7 +51,7 @@ class BundleInstaller extends agentInstaller_1.default {
|
|
|
51
51
|
throw new errors_1.BundlerConfigError('Bundler is currently configured to install without the test and development groups\n');
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
-
async installAgent() {
|
|
54
|
+
async installAgent(_ui) {
|
|
55
55
|
await this.checkBundlerConfig();
|
|
56
56
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
57
57
|
let gemfile = encodedFile.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,yCAAyC;;;;;;AAEzC,4CAAoB;AACpB,+BAA4B;AAC5B,kDAA0B;AAC1B,uCAAqC;AACrC,sEAA8C;AAC9C,mDAAsC;AACtC,+CAA0C;AAC1C,oEAA4C;AAC5C,oEAA4C;AAC5C,sCAA+C;
|
|
1
|
+
{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
|
10
10
|
const installers_1 = require("./installers");
|
|
11
11
|
const agentStatusProcedure_1 = __importDefault(require("./agentStatusProcedure"));
|
|
12
12
|
const projectConfiguration_1 = require("./projectConfiguration");
|
|
13
|
+
const installerUI_1 = __importDefault(require("./installerUI"));
|
|
13
14
|
exports.default = {
|
|
14
15
|
command: 'status [directory]',
|
|
15
16
|
aliases: ['s'],
|
|
@@ -38,10 +39,11 @@ exports.default = {
|
|
|
38
39
|
const { projectType, directory, verbose: isVerbose } = args;
|
|
39
40
|
const installers = installers_1.INSTALLERS.map((constructor) => new constructor(directory));
|
|
40
41
|
(0, utils_1.verbose)(isVerbose);
|
|
42
|
+
const ui = new installerUI_1.default(false, { overwriteAppMapConfig: false });
|
|
41
43
|
try {
|
|
42
|
-
const [project] = await (0, projectConfiguration_1.getProjects)(installers, directory, false, projectType);
|
|
44
|
+
const [project] = await (0, projectConfiguration_1.getProjects)(ui, installers, directory, false, projectType);
|
|
43
45
|
const statusProcedure = new agentStatusProcedure_1.default(project.selectedInstaller, directory);
|
|
44
|
-
await statusProcedure.run();
|
|
46
|
+
await statusProcedure.run(ui);
|
|
45
47
|
}
|
|
46
48
|
catch (e) {
|
|
47
49
|
const err = e;
|