@learnpack/learnpack 2.1.56 → 2.1.57
Sign up to get free protection for your applications and to get access to all the features.
- package/README.md +10 -10
- package/lib/managers/config/index.js +40 -0
- package/lib/models/config.d.ts +8 -0
- package/oclif.manifest.json +1 -1
- package/package.json +1 -1
- package/src/managers/config/index.ts +49 -0
- package/src/models/config.ts +9 -0
package/README.md
CHANGED
@@ -21,7 +21,7 @@ $ npm install -g @learnpack/learnpack
|
|
21
21
|
$ learnpack COMMAND
|
22
22
|
running command...
|
23
23
|
$ learnpack (-v|--version|version)
|
24
|
-
@learnpack/learnpack/2.1.
|
24
|
+
@learnpack/learnpack/2.1.57 win32-x64 node-v20.10.0
|
25
25
|
$ learnpack --help [COMMAND]
|
26
26
|
USAGE
|
27
27
|
$ learnpack COMMAND
|
@@ -74,7 +74,7 @@ DESCRIPTION
|
|
74
74
|
12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)
|
75
75
|
```
|
76
76
|
|
77
|
-
_See code: [src\commands\audit.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
77
|
+
_See code: [src\commands\audit.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\audit.ts)_
|
78
78
|
|
79
79
|
## `learnpack clean`
|
80
80
|
|
@@ -89,7 +89,7 @@ DESCRIPTION
|
|
89
89
|
Extra documentation goes here
|
90
90
|
```
|
91
91
|
|
92
|
-
_See code: [src\commands\clean.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
92
|
+
_See code: [src\commands\clean.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\clean.ts)_
|
93
93
|
|
94
94
|
## `learnpack download [PACKAGE]`
|
95
95
|
|
@@ -107,7 +107,7 @@ DESCRIPTION
|
|
107
107
|
Extra documentation goes here
|
108
108
|
```
|
109
109
|
|
110
|
-
_See code: [src\commands\download.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
110
|
+
_See code: [src\commands\download.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\download.ts)_
|
111
111
|
|
112
112
|
## `learnpack help [COMMAND]`
|
113
113
|
|
@@ -138,7 +138,7 @@ OPTIONS
|
|
138
138
|
-h, --grading show CLI help
|
139
139
|
```
|
140
140
|
|
141
|
-
_See code: [src\commands\init.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
141
|
+
_See code: [src\commands\init.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\init.ts)_
|
142
142
|
|
143
143
|
## `learnpack login [PACKAGE]`
|
144
144
|
|
@@ -156,7 +156,7 @@ DESCRIPTION
|
|
156
156
|
Extra documentation goes here
|
157
157
|
```
|
158
158
|
|
159
|
-
_See code: [src\commands\login.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
159
|
+
_See code: [src\commands\login.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\login.ts)_
|
160
160
|
|
161
161
|
## `learnpack logout [PACKAGE]`
|
162
162
|
|
@@ -174,7 +174,7 @@ DESCRIPTION
|
|
174
174
|
Extra documentation goes here
|
175
175
|
```
|
176
176
|
|
177
|
-
_See code: [src\commands\logout.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
177
|
+
_See code: [src\commands\logout.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\logout.ts)_
|
178
178
|
|
179
179
|
## `learnpack plugins`
|
180
180
|
|
@@ -309,7 +309,7 @@ DESCRIPTION
|
|
309
309
|
Extra documentation goes here
|
310
310
|
```
|
311
311
|
|
312
|
-
_See code: [src\commands\publish.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
312
|
+
_See code: [src\commands\publish.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\publish.ts)_
|
313
313
|
|
314
314
|
## `learnpack start`
|
315
315
|
|
@@ -330,7 +330,7 @@ OPTIONS
|
|
330
330
|
-w, --watch Watch for file changes
|
331
331
|
```
|
332
332
|
|
333
|
-
_See code: [src\commands\start.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
333
|
+
_See code: [src\commands\start.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\start.ts)_
|
334
334
|
|
335
335
|
## `learnpack test [EXERCISESLUG]`
|
336
336
|
|
@@ -344,7 +344,7 @@ ARGUMENTS
|
|
344
344
|
EXERCISESLUG The name of the exercise to test
|
345
345
|
```
|
346
346
|
|
347
|
-
_See code: [src\commands\test.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.
|
347
|
+
_See code: [src\commands\test.ts](https://github.com/learnpack/learnpack-cli/blob/v2.1.57/src\commands\test.ts)_
|
348
348
|
<!-- commandsstop -->
|
349
349
|
|
350
350
|
> > > > > > > 0cb3e56d84c197f9d008836bb573eade212b7e57
|
@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const path = require("path");
|
4
4
|
const fs = require("fs");
|
5
5
|
const shell = require("shelljs");
|
6
|
+
const child_process_1 = require("child_process");
|
7
|
+
const util_1 = require("util");
|
8
|
+
const execAsync = util_1.promisify(child_process_1.exec);
|
6
9
|
const console_1 = require("../../utils/console");
|
7
10
|
const watcher_1 = require("../../utils/watcher");
|
8
11
|
const errors_1 = require("../../utils/errors");
|
@@ -146,6 +149,43 @@ exports.default = async ({ grading, mode, disableGrading, version, }) => {
|
|
146
149
|
}
|
147
150
|
configObj.config.dirPath = "./" + confPath.base;
|
148
151
|
configObj.config.exercisesPath = getExercisesPath(confPath.base) || "./";
|
152
|
+
const allowedCommands = new Set(["ls", "pwd", "echo", "node", "python"]);
|
153
|
+
if (configObj.config.variables) {
|
154
|
+
const variableKeys = Object.keys(configObj.config.variables);
|
155
|
+
const promises = [];
|
156
|
+
for (const v of variableKeys) {
|
157
|
+
if (Object.prototype.hasOwnProperty.call(configObj.config.variables, v)) {
|
158
|
+
const variable = configObj.config.variables[v];
|
159
|
+
if (typeof variable === "string") {
|
160
|
+
continue;
|
161
|
+
}
|
162
|
+
const type = variable.type;
|
163
|
+
if (type === "command") {
|
164
|
+
const promise = (async () => {
|
165
|
+
try {
|
166
|
+
// Validate the command
|
167
|
+
if (!allowedCommands.has(variable.source.split(" ")[0])) {
|
168
|
+
throw new Error("Command not allowed");
|
169
|
+
}
|
170
|
+
// Execute the code and replace the value
|
171
|
+
const { stdout } = await execAsync(variable.source);
|
172
|
+
if (!configObj.config || !configObj.config.variables)
|
173
|
+
return;
|
174
|
+
configObj.config.variables[v] = stdout.trim();
|
175
|
+
}
|
176
|
+
catch (error) {
|
177
|
+
console.error(`Error executing code: ${error}`);
|
178
|
+
}
|
179
|
+
})();
|
180
|
+
promises.push(promise);
|
181
|
+
}
|
182
|
+
else if (type === "string") {
|
183
|
+
configObj.config.variables[v] = variable.source;
|
184
|
+
}
|
185
|
+
}
|
186
|
+
}
|
187
|
+
await Promise.all(promises);
|
188
|
+
}
|
149
189
|
return {
|
150
190
|
validLanguages: {},
|
151
191
|
get: () => configObj,
|
package/lib/models/config.d.ts
CHANGED
@@ -55,9 +55,17 @@ export interface IConfig {
|
|
55
55
|
videoSolutions?: boolean;
|
56
56
|
skills: Array<string>;
|
57
57
|
telemetry?: TTelemetryUrls;
|
58
|
+
variables?: TVariables;
|
58
59
|
runHook: (...agrs: Array<any>) => void;
|
59
60
|
testingFinishedCallback: (arg: any | undefined) => void;
|
60
61
|
}
|
62
|
+
declare type TVariable = {
|
63
|
+
type: "command" | "string";
|
64
|
+
source: string;
|
65
|
+
};
|
66
|
+
declare type TVariables = {
|
67
|
+
[key: string]: TVariable | string;
|
68
|
+
};
|
61
69
|
export interface IConfigObj {
|
62
70
|
session?: number;
|
63
71
|
currentExercise?: any;
|
package/oclif.manifest.json
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":"2.1.
|
1
|
+
{"version":"2.1.57","commands":{"audit":{"id":"audit","description":"learnpack audit is the command in charge of creating an auditory of the repository\n...\nlearnpack audit checks for the following information in a repository:\n 1. The configuration object has slug, repository and description. (Error)\n 2. The command learnpack clean has been run. (Error)\n 3. If a markdown or test file doesn't have any content. (Error)\n 4. The links are accessing to valid servers. (Error)\n 5. The relative images are working (If they have the shortest path to the image or if the images exists in the assets). (Error)\n 6. The external images are working (If they are pointing to a valid server). (Error)\n 7. The exercises directory names are valid. (Error)\n 8. If an exercise doesn't have a README file. (Error)\n 9. The exercises array (Of the config file) has content. (Error)\n 10. The exercses have the same translations. (Warning)\n 11. The .gitignore file exists. (Warning)\n 12. If there is a file within the exercises folder but not inside of any particular exercise's folder. (Warning)\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"clean":{"id":"clean","description":"Clean the configuration object\n ...\n Extra documentation goes here\n ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[]},"download":{"id":"download","description":"Describe the command here\n...\nExtra documentation goes here\n","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"init":{"id":"init","description":"Create a new learning package: Book, Tutorial or Exercise","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"grading":{"name":"grading","type":"boolean","char":"h","description":"show CLI help","allowNo":false}},"args":[]},"login":{"id":"login","description":"Describe the command here\n ...\n Extra documentation goes here\n ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"logout":{"id":"logout","description":"Describe the command here\n ...\n Extra documentation goes here\n ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"publish":{"id":"publish","description":"Describe the command here\n ...\n Extra documentation goes here\n ","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"package","description":"The unique string that identifies this package on learnpack","required":false,"hidden":false}]},"start":{"id":"start","description":"Runs a small server with all the exercise instructions","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{"port":{"name":"port","type":"option","char":"p","description":"server port"},"host":{"name":"host","type":"option","char":"h","description":"server host"},"disableGrading":{"name":"disableGrading","type":"boolean","char":"D","description":"disble grading functionality","allowNo":false},"watch":{"name":"watch","type":"boolean","char":"w","description":"Watch for file changes","allowNo":false},"editor":{"name":"editor","type":"option","char":"e","description":"[preview, extension]","options":["extension","preview"]},"version":{"name":"version","type":"option","char":"v","description":"E.g: 1.0.1"},"grading":{"name":"grading","type":"option","char":"g","description":"[isolated, incremental]","options":["isolated","incremental"]},"debug":{"name":"debug","type":"boolean","char":"d","description":"debugger mode for more verbage","allowNo":false}},"args":[]},"test":{"id":"test","description":"Test exercises","pluginName":"@learnpack/learnpack","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"exerciseSlug","description":"The name of the exercise to test","required":false,"hidden":false}]}}}
|
package/package.json
CHANGED
@@ -1,6 +1,11 @@
|
|
1
1
|
import * as path from "path"
|
2
2
|
import * as fs from "fs"
|
3
3
|
import * as shell from "shelljs"
|
4
|
+
import { exec } from "child_process"
|
5
|
+
import { promisify } from "util"
|
6
|
+
|
7
|
+
const execAsync = promisify(exec)
|
8
|
+
|
4
9
|
import Console from "../../utils/console"
|
5
10
|
import watch from "../../utils/watcher"
|
6
11
|
import {
|
@@ -207,6 +212,50 @@ configObj.config.editor.version = version
|
|
207
212
|
configObj.config.dirPath = "./" + confPath.base
|
208
213
|
configObj.config.exercisesPath = getExercisesPath(confPath.base) || "./"
|
209
214
|
|
215
|
+
const allowedCommands = new Set(["ls", "pwd", "echo", "node", "python"])
|
216
|
+
|
217
|
+
if (configObj.config.variables) {
|
218
|
+
const variableKeys = Object.keys(configObj.config.variables)
|
219
|
+
const promises = []
|
220
|
+
|
221
|
+
for (const v of variableKeys) {
|
222
|
+
if (Object.prototype.hasOwnProperty.call(configObj.config.variables, v)) {
|
223
|
+
const variable = configObj.config.variables[v]
|
224
|
+
|
225
|
+
if (typeof variable === "string") {
|
226
|
+
continue
|
227
|
+
}
|
228
|
+
|
229
|
+
const type = variable.type
|
230
|
+
|
231
|
+
if (type === "command") {
|
232
|
+
const promise = (async () => {
|
233
|
+
try {
|
234
|
+
// Validate the command
|
235
|
+
if (!allowedCommands.has(variable.source.split(" ")[0])) {
|
236
|
+
throw new Error("Command not allowed")
|
237
|
+
}
|
238
|
+
|
239
|
+
// Execute the code and replace the value
|
240
|
+
const { stdout } = await execAsync(variable.source)
|
241
|
+
if (!configObj.config || !configObj.config.variables)
|
242
|
+
return
|
243
|
+
|
244
|
+
configObj.config.variables[v] = stdout.trim()
|
245
|
+
} catch (error) {
|
246
|
+
console.error(`Error executing code: ${error}`)
|
247
|
+
}
|
248
|
+
})()
|
249
|
+
promises.push(promise)
|
250
|
+
} else if (type === "string") {
|
251
|
+
configObj.config.variables[v] = variable.source
|
252
|
+
}
|
253
|
+
}
|
254
|
+
}
|
255
|
+
|
256
|
+
await Promise.all(promises)
|
257
|
+
}
|
258
|
+
|
210
259
|
return {
|
211
260
|
validLanguages: {},
|
212
261
|
get: () => configObj,
|
package/src/models/config.ts
CHANGED
@@ -78,11 +78,20 @@ export interface IConfig {
|
|
78
78
|
videoSolutions?: boolean;
|
79
79
|
skills: Array<string>;
|
80
80
|
telemetry?: TTelemetryUrls;
|
81
|
+
variables?: TVariables;
|
81
82
|
|
82
83
|
runHook: (...agrs: Array<any>) => void;
|
83
84
|
testingFinishedCallback: (arg: any | undefined) => void;
|
84
85
|
}
|
85
86
|
|
87
|
+
type TVariable = {
|
88
|
+
type: "command" | "string";
|
89
|
+
source: string;
|
90
|
+
};
|
91
|
+
type TVariables = {
|
92
|
+
[key: string]: TVariable | string;
|
93
|
+
};
|
94
|
+
|
86
95
|
export interface IConfigObj {
|
87
96
|
session?: number;
|
88
97
|
currentExercise?: any;
|