@spica/cli 0.9.14 → 0.9.17
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/index.js +2 -2
- package/index.js.map +1 -0
- package/package.json +15 -4
- package/src/commands/apply.js +8 -8
- package/src/commands/apply.js.map +1 -0
- package/src/commands/bucket/orm.js +2 -2
- package/src/commands/bucket/orm.js.map +1 -0
- package/src/commands/context/ls.js +14 -6
- package/src/commands/context/ls.js.map +1 -0
- package/src/commands/context/remove.d.ts +2 -0
- package/src/commands/context/remove.js +23 -0
- package/src/commands/context/remove.js.map +1 -0
- package/src/commands/context/set.js +1 -1
- package/src/commands/context/set.js.map +1 -0
- package/src/commands/context/switch.js +1 -1
- package/src/commands/context/switch.js.map +1 -0
- package/src/commands/delete.js +7 -7
- package/src/commands/delete.js.map +1 -0
- package/src/commands/get.js +3 -3
- package/src/commands/get.js.map +1 -0
- package/src/commands/project/ls.js +1 -1
- package/src/commands/project/ls.js.map +1 -0
- package/src/commands/project/remove.js +4 -4
- package/src/commands/project/remove.js.map +1 -0
- package/src/commands/project/start.d.ts +0 -3
- package/src/commands/project/start.js +42 -53
- package/src/commands/project/start.js.map +1 -0
- package/src/commands/project/upgrade.d.ts +2 -0
- package/src/commands/project/upgrade.js +175 -0
- package/src/commands/project/upgrade.js.map +1 -0
- package/src/config.js +2 -2
- package/src/config.js.map +1 -0
- package/src/console.js +4 -4
- package/src/console.js.map +1 -0
- package/src/context.d.ts +1 -0
- package/src/context.js +7 -1
- package/src/context.js.map +1 -0
- package/src/machinery.js +1 -1
- package/src/machinery.js.map +1 -0
- package/src/project.d.ts +11 -0
- package/src/project.js +70 -0
- package/src/project.js.map +1 -0
- package/src/range.js +1 -1
- package/src/range.js.map +1 -0
- package/src/status.js +2 -2
- package/src/status.js.map +1 -0
- package/src/validator.js +3 -3
- package/src/validator.js.map +1 -0
package/src/project.d.ts
ADDED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import * as docker from "dockerode";
|
|
2
|
+
export declare class DockerMachine extends docker {
|
|
3
|
+
constructor();
|
|
4
|
+
doesImageExist(image: string, tag: string): Promise<boolean>;
|
|
5
|
+
pullImage(image: string, tag: string): Promise<unknown>;
|
|
6
|
+
}
|
|
7
|
+
export declare class ImageNotFoundError extends Error {
|
|
8
|
+
constructor(image: string, tag: string);
|
|
9
|
+
}
|
|
10
|
+
export declare const version: (image: any) => Promise<string>;
|
|
11
|
+
export declare function isVersionUpgrade(desiredVersion: string, oldVersion: string): boolean;
|
package/src/project.js
ADDED
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isVersionUpgrade = exports.version = exports.ImageNotFoundError = exports.DockerMachine = void 0;
|
|
4
|
+
const docker = require("dockerode");
|
|
5
|
+
const semver = require("semver");
|
|
6
|
+
let machine;
|
|
7
|
+
class DockerMachine extends docker {
|
|
8
|
+
constructor() {
|
|
9
|
+
if (!machine) {
|
|
10
|
+
super();
|
|
11
|
+
machine = this;
|
|
12
|
+
}
|
|
13
|
+
return machine;
|
|
14
|
+
}
|
|
15
|
+
doesImageExist(image, tag) {
|
|
16
|
+
return machine
|
|
17
|
+
.listImages({
|
|
18
|
+
filters: JSON.stringify({ reference: [`${image}:${tag}`] })
|
|
19
|
+
})
|
|
20
|
+
.then(images => images.length > 0);
|
|
21
|
+
}
|
|
22
|
+
pullImage(image, tag) {
|
|
23
|
+
return new Promise((resolve, reject) => machine.pull(`${image}:${tag}`, {}, function (err, stream) {
|
|
24
|
+
if (err) {
|
|
25
|
+
if (err.message && err.message.indexOf(`manifest for ${image}`)) {
|
|
26
|
+
reject(new ImageNotFoundError(image, tag));
|
|
27
|
+
}
|
|
28
|
+
else {
|
|
29
|
+
reject(err);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
machine.modem.followProgress(stream, resolve);
|
|
34
|
+
}
|
|
35
|
+
}));
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
exports.DockerMachine = DockerMachine;
|
|
39
|
+
class ImageNotFoundError extends Error {
|
|
40
|
+
constructor(image, tag) {
|
|
41
|
+
super(`Could not find the image ${image}:${tag}.`);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
exports.ImageNotFoundError = ImageNotFoundError;
|
|
45
|
+
const version = image => {
|
|
46
|
+
const vers = /^spicaengine\/(spica|api):(.*)/g.exec(image)[2];
|
|
47
|
+
if (nonActualVersions.includes(vers)) {
|
|
48
|
+
return machine
|
|
49
|
+
.getImage(image)
|
|
50
|
+
.inspect()
|
|
51
|
+
.then(info => {
|
|
52
|
+
const actualVersion = info.RepoTags.map(tag => tag.slice(tag.indexOf(":") + 1)).find(tag => semver.valid(tag));
|
|
53
|
+
if (!actualVersion) {
|
|
54
|
+
throw Error(`Could not find the actual version of image '${image}'`);
|
|
55
|
+
}
|
|
56
|
+
return actualVersion;
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
return Promise.resolve(vers);
|
|
60
|
+
};
|
|
61
|
+
exports.version = version;
|
|
62
|
+
const nonActualVersions = ["latest"];
|
|
63
|
+
function isVersionUpgrade(desiredVersion, oldVersion) {
|
|
64
|
+
if (desiredVersion == "latest") {
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
return semver.gt(desiredVersion, oldVersion);
|
|
68
|
+
}
|
|
69
|
+
exports.isVersionUpgrade = isVersionUpgrade;
|
|
70
|
+
//# sourceMappingURL=project.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project.js","sourceRoot":"","sources":["../../../../../../stacks/cli/src/project.ts"],"names":[],"mappings":";;;AAAA,oCAAoC;AACpC,iCAAiC;AAEjC,IAAI,OAAsB,CAAC;AAE3B,MAAa,aAAc,SAAQ,MAAM;IACvC;QACE,IAAI,CAAC,OAAO,EAAE;YACZ,KAAK,EAAE,CAAC;YACR,OAAO,GAAG,IAAI,CAAC;SAChB;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,cAAc,CAAC,KAAa,EAAE,GAAW;QACvC,OAAO,OAAO;aACX,UAAU,CAAC;YACV,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,EAAC,SAAS,EAAE,CAAC,GAAG,KAAK,IAAI,GAAG,EAAE,CAAC,EAAC,CAAC;SAC1D,CAAC;aACD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACvC,CAAC;IAED,SAAS,CAAC,KAAa,EAAE,GAAW;QAClC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CACrC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,GAAG,EAAE,EAAE,EAAE,EAAE,UAAS,GAAG,EAAE,MAAM;YACtD,IAAI,GAAG,EAAE;gBACP,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,gBAAgB,KAAK,EAAE,CAAC,EAAE;oBAC/D,MAAM,CAAC,IAAI,kBAAkB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;iBAC5C;qBAAM;oBACL,MAAM,CAAC,GAAG,CAAC,CAAC;iBACb;aACF;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;aAC/C;QACH,CAAC,CAAC,CACH,CAAC;IACJ,CAAC;CACF;AAhCD,sCAgCC;AAED,MAAa,kBAAmB,SAAQ,KAAK;IAC3C,YAAY,KAAa,EAAE,GAAW;QACpC,KAAK,CAAC,4BAA4B,KAAK,IAAI,GAAG,GAAG,CAAC,CAAC;IACrD,CAAC;CACF;AAJD,gDAIC;AAEM,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE;IAC7B,MAAM,IAAI,GAAG,iCAAiC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAE9D,IAAI,iBAAiB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QACpC,OAAO,OAAO;aACX,QAAQ,CAAC,KAAK,CAAC;aACf,OAAO,EAAE;aACT,IAAI,CAAC,IAAI,CAAC,EAAE;YACX,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CACzF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAClB,CAAC;YACF,IAAI,CAAC,aAAa,EAAE;gBAClB,MAAM,KAAK,CAAC,+CAA+C,KAAK,GAAG,CAAC,CAAC;aACtE;YACD,OAAO,aAAa,CAAC;QACvB,CAAC,CAAC,CAAC;KACN;IAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAC/B,CAAC,CAAC;AAnBW,QAAA,OAAO,WAmBlB;AACF,MAAM,iBAAiB,GAAG,CAAC,QAAQ,CAAC,CAAC;AAErC,SAAgB,gBAAgB,CAAC,cAAsB,EAAE,UAAkB;IACzE,IAAI,cAAc,IAAI,QAAQ,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IACD,OAAO,MAAM,CAAC,EAAE,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;AAC/C,CAAC;AALD,4CAKC"}
|
package/src/range.js
CHANGED
|
@@ -14,4 +14,4 @@ function getLineNumberAndColumnFromRange(content, end) {
|
|
|
14
14
|
return [lineNumber, end - lastNewLinePos];
|
|
15
15
|
}
|
|
16
16
|
exports.getLineNumberAndColumnFromRange = getLineNumberAndColumnFromRange;
|
|
17
|
-
//# sourceMappingURL=
|
|
17
|
+
//# sourceMappingURL=range.js.map
|
package/src/range.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"range.js","sourceRoot":"","sources":["../../../../../../stacks/cli/src/range.ts"],"names":[],"mappings":";;;AAAA,SAAgB,+BAA+B,CAAC,OAAe,EAAE,GAAW;IAC1E,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,IAAI,cAAc,GAAG,CAAC,CAAC;IACvB,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,EAAE;QAClC,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACjC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC3B,UAAU,EAAE,CAAC;YACb,cAAc,GAAG,GAAG,CAAC;SACtB;KACF;IACD,OAAO,CAAC,UAAU,EAAE,GAAG,GAAG,cAAc,CAAC,CAAC;AAC5C,CAAC;AAXD,0EAWC"}
|
package/src/status.js
CHANGED
|
@@ -42,6 +42,6 @@ function getRange(document, documentContent, path) {
|
|
|
42
42
|
current = children;
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
|
-
return range_1.getLineNumberAndColumnFromRange(documentContent, current.range[0]);
|
|
45
|
+
return (0, range_1.getLineNumberAndColumnFromRange)(documentContent, current.range[0]);
|
|
46
46
|
}
|
|
47
|
-
//# sourceMappingURL=
|
|
47
|
+
//# sourceMappingURL=status.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../../../stacks/cli/src/status.ts"],"names":[],"mappings":";;;AAAA,mCAAwD;AACxD,6BAA6B;AA8B7B,SAAgB,YAAY,CAAC,MAAe;IAC1C,OAAO,OAAO,MAAM,IAAI,QAAQ,IAAI,MAAM,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC;AACrF,CAAC;AAFD,oCAEC;AAED,SAAgB,eAAe,CAAC,MAAe;IAC7C,OAAO,YAAY,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC;AAC5D,CAAC;AAFD,0CAEC;AAED,SAAgB,mBAAmB,CAAC,MAAc;IAChD,OAAO,sBAAsB,MAAM,CAAC,MAAM,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;AACnE,CAAC;AAFD,kDAEC;AAED,SAAgB,iBAAiB,CAAC,MAAe;IAC/C,OAAO,CACL,eAAe,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,SAAS,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAC9F,CAAC;AACJ,CAAC;AAJD,8CAIC;AAED,SAAgB,sBAAsB,CACpC,MAAc,EACd,QAAa,EACb,eAAuB,EACvB,YAAoB;IAEpB,IACE,CAAC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC;QAC9B,CAAC,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QAC9B,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,EAC/B;QACA,YAAY,GAAG,KAAK,YAAY,EAAE,CAAC;KACpC;IAED,MAAM,MAAM,GAAG,EAAE,CAAC;IAElB,KAAK,MAAM,KAAK,IAAI,MAAM,CAAC,OAAO,CAAC,MAAe,EAAE;QAClD,MAAM,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAExE,MAAM,CAAC,IAAI,CAAC,GAAG,YAAY,IAAI,KAAK,MAAM,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;KAC1E;IACD,OAAO,sBAAsB,MAAM,CAAC,MAAM,MAAM,MAAM,CAAC,OAAO,KAAK,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;AACzF,CAAC;AAtBD,wDAsBC;AAED,SAAS,QAAQ,CAAC,QAAQ,EAAE,eAAe,EAAE,IAAY;IACvD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC;IAEhC,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE;QAC/B,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxC,IAAI,QAAQ,EAAE;YACZ,OAAO,GAAG,QAAQ,CAAC;SACpB;KACF;IAED,OAAO,IAAA,uCAA+B,EAAC,eAAe,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5E,CAAC"}
|
package/src/validator.js
CHANGED
|
@@ -4,10 +4,10 @@ exports.projectName = void 0;
|
|
|
4
4
|
const colorette_1 = require("colorette");
|
|
5
5
|
function projectName(input) {
|
|
6
6
|
if (input && !input.match(/^[a-z][a-z0-9]+(?:-[a-z0-9]+)*$/)) {
|
|
7
|
-
throw new Error(`${colorette_1.red(input)} is an invalid project name.\n` +
|
|
8
|
-
`It should be in format like ${colorette_1.bold("infra1")}, ${colorette_1.bold("infra-1")} or ${colorette_1.bold("project-1")}`);
|
|
7
|
+
throw new Error(`${(0, colorette_1.red)(input)} is an invalid project name.\n` +
|
|
8
|
+
`It should be in format like ${(0, colorette_1.bold)("infra1")}, ${(0, colorette_1.bold)("infra-1")} or ${(0, colorette_1.bold)("project-1")}`);
|
|
9
9
|
}
|
|
10
10
|
return input;
|
|
11
11
|
}
|
|
12
12
|
exports.projectName = projectName;
|
|
13
|
-
//# sourceMappingURL=
|
|
13
|
+
//# sourceMappingURL=validator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../../../stacks/cli/src/validator.ts"],"names":[],"mappings":";;;AAAA,yCAAoC;AAEpC,SAAgB,WAAW,CAAC,KAAa;IACvC,IAAI,KAAK,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,iCAAiC,CAAC,EAAE;QAC5D,MAAM,IAAI,KAAK,CACb,GAAG,IAAA,eAAG,EAAC,KAAK,CAAC,gCAAgC;YAC3C,+BAA+B,IAAA,gBAAI,EAAC,QAAQ,CAAC,KAAK,IAAA,gBAAI,EAAC,SAAS,CAAC,OAAO,IAAA,gBAAI,EAAC,WAAW,CAAC,EAAE,CAC9F,CAAC;KACH;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AATD,kCASC"}
|