From a284a347f6c3ab02eafa648603978ed56399a4de Mon Sep 17 00:00:00 2001 From: duc0905 Date: Wed, 4 Dec 2019 23:15:52 +0700 Subject: [PATCH 1/2] add emoji to logger function --- bin/nc.js | 2 +- lib/core.js | 2 +- lib/helper.js | 22 ++++++-- lib/services.js | 137 +++++++++++++++++++++++++++++------------------- package.json | 2 + 5 files changed, 107 insertions(+), 58 deletions(-) diff --git a/bin/nc.js b/bin/nc.js index 39d21f3..35a210b 100644 --- a/bin/nc.js +++ b/bin/nc.js @@ -7,7 +7,7 @@ const spinner = ora(); program .version("0.0.1", "-v, --version") - .option("-a, --about", "View about section of NodeCloud CLI") + .option("-a, --about", "View about section of NodeCloud CLI") .option("-i, --init", "Initialize provider") .option("-t, --type ", "Type") .option("-j, --service ", "Service") diff --git a/lib/core.js b/lib/core.js index 74f7e0e..1c17100 100644 --- a/lib/core.js +++ b/lib/core.js @@ -2,7 +2,7 @@ class Core { constructor() { const nodecloud = require("nodecloud"); const optionsProvider = { - overrideProviders: false + overrideProviders: true }; this._core = nodecloud.getProviders(optionsProvider); } diff --git a/lib/helper.js b/lib/helper.js index 4269c36..997fe73 100644 --- a/lib/helper.js +++ b/lib/helper.js @@ -3,6 +3,7 @@ const fs = require("fs"); const figlet = require("figlet"); const chalk = require("chalk"); const path = "./.nc.config.js"; +const emoji = require("node-emoji"); /** * Display text as CLI logo @@ -37,9 +38,23 @@ let logofied = text => { */ let logger = (data, error) => { if (error) { - console.log(chalk.red(`${JSON.stringify(data, null, 2)}`)); + let exclamationMarks = + emoji.get("heavy_exclamation_mark") + + emoji.get("heavy_exclamation_mark") + + emoji.get("heavy_exclamation_mark"); + console.log( + exclamationMarks + + "\n" + + chalk.red(chalk.bgWhite(`${JSON.stringify(data, null, 2)}`)) + ); } else { - console.log(chalk.green(`${JSON.stringify(data, null, 2)}`)); + let checkMarks = + emoji.get("white_check_mark") + + emoji.get("white_check_mark") + + emoji.get("white_check_mark"); + console.log( + checkMarks + "\n" + chalk.green(`${JSON.stringify(data, null, 2)}`) + ); } }; @@ -52,8 +67,9 @@ let checkPlugin = plugin => { detectInstalled(plugin).then(exists => { if (exists) { resolve(true); + } else { + resolve(false); } - resolve(false); }); }); }; diff --git a/lib/services.js b/lib/services.js index 6404e10..5e441d9 100644 --- a/lib/services.js +++ b/lib/services.js @@ -47,18 +47,20 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; case "list": compute.listInstances({}, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); }); break; case "stop": @@ -68,9 +70,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -81,9 +84,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -94,9 +98,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -107,14 +112,16 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; default: + logger(null, true); throw new Error("Please select a valid command for Compute"); break; } @@ -130,24 +137,30 @@ function Services(program, spinner) { ACL: "public-read" }, (error, data) => { - logger(data, null); + if (error) { + logger(data, true); + } else { + logger(data, false); + } } ); break; case "list": storage.listStorage({}, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); }); break; case "upload": storage.uploadToStorage({}, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); }); break; case "delete": @@ -157,9 +170,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -176,33 +190,37 @@ function Services(program, spinner) { case "create": database.createNewItem(option, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); }); break; case "query": database.query(option, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, null); } - logger(data, null); }); break; case "delete": database.delete(option, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, null); } - logger(data, null); }); break; case "update": database.updateItem(option, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); }); break; @@ -222,9 +240,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -235,9 +254,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, null); } - logger(data, null); } ); break; @@ -249,9 +269,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -263,9 +284,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -295,18 +317,20 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; case "list": network.list({}, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); }); break; case "delete": @@ -316,9 +340,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -335,9 +360,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -353,9 +379,10 @@ function Services(program, spinner) { }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; @@ -364,18 +391,20 @@ function Services(program, spinner) { { CallerReference: program.cr, Name: program.name }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; case "listz": network.listZones({}, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); }); break; case "deletez": @@ -383,18 +412,20 @@ function Services(program, spinner) { { Id: `/hostedzone/${program.id}` }, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); } ); break; case "record": network.changeRecordSets({}, (error, data) => { if (error) { - logger(error, true); + logger(data, true); + } else { + logger(data, false); } - logger(data, null); }); break; default: diff --git a/package.json b/package.json index 3644bfd..da5d793 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,9 @@ "detect-installed": "^2.0.4", "figlet": "^1.2.3", "inquirer": "^6.4.1", + "node-emoji": "^1.10.0", "nodecloud": "^1.0.0-beta.1", + "nodecloud-aws-plugin": "^1.0.0-beta.0", "npm-programmatic": "^0.0.12", "ora": "^3.4.0", "prettier": "^1.17.1" From 4e9d829ca3ac216a7dda590ecc371113b6eefacc Mon Sep 17 00:00:00 2001 From: duc0905 Date: Thu, 5 Dec 2019 13:00:48 +0700 Subject: [PATCH 2/2] add Github URL to version flag --- bin/nc.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/bin/nc.js b/bin/nc.js index 35a210b..cdda1c0 100644 --- a/bin/nc.js +++ b/bin/nc.js @@ -2,11 +2,16 @@ const program = require("commander"); const Services = require("../lib/services"); const ora = require("ora"); - +const package = require("../package.json"); const spinner = ora(); program - .version("0.0.1", "-v, --version") + .version( + ` + Version: ${package.version} + Github: ${package.repository}`, + "-v, --version" + ) .option("-a, --about", "View about section of NodeCloud CLI") .option("-i, --init", "Initialize provider") .option("-t, --type ", "Type")