Skip to content

fixed issue13 #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MarkChenYutian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed issue13 #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions bin/nc.js
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ program
.option("-r, --cr <type>", "Caller Reference")
.option("-z, --name <type>", "Name")
.option("-p, --port <type>", "Port")
.option("--pretty", "Prettify JSON output for arrays")
.option("-y, --key <type>", "Key")
.option("-u, --value <type>", "Value")
.option("-h, --id <type>", "Id")
Expand Down
18 changes: 15 additions & 3 deletions lib/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ const fs = require("fs");
const figlet = require("figlet");
const chalk = require("chalk");
const path = "./.nc.config.js";
const Table = require("cli-table3");

/**
* Display text as CLI logo
Expand Down Expand Up @@ -35,11 +36,22 @@ let logofied = text => {
* @param {*} data
* @param {*} error
*/
let logger = (data, error) => {
let logger = (data, error, pretty) => {
let table;
if (pretty && Array.isArray(data)) {
table = new Table();
table.push(...data);
}
if (error) {
console.log(chalk.red(`${JSON.stringify(data, null, 2)}`));
console.log(
chalk.red(`${pretty ? table.toString() : JSON.stringify(data, null, 2)}`)
);
} else {
console.log(chalk.green(`${JSON.stringify(data, null, 2)}`));
console.log(
chalk.green(
`${pretty ? table.toString() : JSON.stringify(data, null, 2)}`
)
);
}
};

Expand Down
111 changes: 55 additions & 56 deletions lib/services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ const options = {
};

function Services(program, spinner) {
if (program.about) {
logofied("NodeCloud CLI");
}
const pretty = !!program.pretty;

if (program.init) {
let Initialize = new Init(program, spinner);
Initialize.selectProvider();
Expand All @@ -46,18 +45,18 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
case "list":
compute.listInstances({}, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
case "stop":
Expand All @@ -67,9 +66,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -80,9 +79,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -93,9 +92,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -106,9 +105,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -129,24 +128,24 @@ function Services(program, spinner) {
ACL: "public-read"
},
(error, data) => {
logger(data, null);
logger(data, null, pretty);
}
);
break;
case "list":
storage.listStorage({}, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
case "upload":
storage.uploadToStorage({}, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
case "delete":
Expand All @@ -156,9 +155,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -175,33 +174,33 @@ function Services(program, spinner) {
case "create":
database.createNewItem(option, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
case "query":
database.query(option, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
case "delete":
database.delete(option, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
case "update":
database.updateItem(option, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;

Expand All @@ -221,9 +220,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -234,9 +233,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -248,9 +247,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -262,9 +261,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand Down Expand Up @@ -294,18 +293,18 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
case "list":
network.list({}, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
case "delete":
Expand All @@ -315,9 +314,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -334,9 +333,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -352,9 +351,9 @@ function Services(program, spinner) {
},
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
Expand All @@ -363,37 +362,37 @@ function Services(program, spinner) {
{ CallerReference: program.cr, Name: program.name },
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
case "listz":
network.listZones({}, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
case "deletez":
network.deleteZone(
{ Id: `/hostedzone/${program.id}` },
(error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
}
);
break;
case "record":
network.changeRecordSets({}, (error, data) => {
if (error) {
logger(error, true);
logger(error, true, pretty);
}
logger(data, null);
logger(data, null, pretty);
});
break;
default:
Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"private": false,
"dependencies": {
"chalk": "^2.4.2",
"cli-table3": "^0.5.1",
"commander": "^2.20.0",
"detect-installed": "^2.0.4",
"figlet": "^1.2.3",
Expand Down
15 changes: 15 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -745,6 +745,16 @@ cli-spinners@^2.0.0:
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77"
integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ==

cli-table3@^0.5.1:
version "0.5.1"
resolved "https://registry.npm.taobao.org/cli-table3/download/cli-table3-0.5.1.tgz#0252372d94dfc40dbd8df06005f48f31f656f202"
integrity sha1-AlI3LZTfxA29jfBgBfSPMfZW8gI=
dependencies:
object-assign "^4.1.0"
string-width "^2.1.1"
optionalDependencies:
colors "^1.1.2"

cli-width@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
Expand Down Expand Up @@ -790,6 +800,11 @@ color-name@1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"

colors@^1.1.2:
version "1.4.0"
resolved "https://registry.npm.taobao.org/colors/download/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
integrity sha1-xQSRR51MG9rtLJztMs98fcI2D3g=

combined-stream@^1.0.6, combined-stream@~1.0.6:
version "1.0.8"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
Expand Down