From 4ef0159ff00fafda440272323a6ef3cf1dbd36db Mon Sep 17 00:00:00 2001 From: Sweetlie Date: Sat, 16 Sep 2017 17:44:06 +0200 Subject: [PATCH 1/3] change fields to verbs --- cmds/request/wow/character.js | 14 +------------- cmds/request/wow/guild.js | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/cmds/request/wow/character.js b/cmds/request/wow/character.js index d727e21..ef85024 100644 --- a/cmds/request/wow/character.js +++ b/cmds/request/wow/character.js @@ -5,23 +5,11 @@ const logger = require('../../../lib/logger'); const character = yargs .command({ - command: 'character', + command: 'character ', describe: 'Fetch a World of Warcraft character', builder: yargs => { return yargs .options({ - realm: { - alias: 'r', - describe: 'The [realm] of the {character}', - type: 'string', - demand: true, - }, - name: { - alias: 'n', - describe: 'The [name] of the {character}', - type: 'string', - demand: true, - }, fields: { alias: 'f', describe: 'A list of one or more [fields] belonging to the {character}', diff --git a/cmds/request/wow/guild.js b/cmds/request/wow/guild.js index d3c2838..de08fa9 100644 --- a/cmds/request/wow/guild.js +++ b/cmds/request/wow/guild.js @@ -5,23 +5,11 @@ const logger = require('../../../lib/logger'); const guild = yargs .command({ - command: 'guild', + command: 'guild ', describe: 'Fetch a World of Warcraft guild', builder: yargs => { return yargs .options({ - realm: { - alias: 'r', - describe: 'The [realm] of the {guild}', - type: 'string', - demand: true, - }, - name: { - alias: 'n', - describe: 'The name of the guild', - type: 'string', - demand: true, - }, fields: { alias: 'f', describe: 'A list of one or more [fields] belonging to the {guild}', From 91f71c36139020af940326ef3c4196f99d01fe2e Mon Sep 17 00:00:00 2001 From: Sweetlie Date: Sat, 16 Sep 2017 17:44:38 +0200 Subject: [PATCH 2/3] implement a simple display function that display only result --- lib/logger.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/logger.js b/lib/logger.js index 2cf8543..62c8134 100644 --- a/lib/logger.js +++ b/lib/logger.js @@ -7,6 +7,10 @@ const db = require('./db'); module.exports = (command, resource, obj) => { const args = argv[command](resource, obj); + function display (request) { + console.log(request.response); + } + return db.models.RecentRequest.findOne({ where: { command, resource, args: JSON.stringify(args) }, @@ -17,7 +21,7 @@ module.exports = (command, resource, obj) => { }) .then(request => { if (request) { - return console.log(request.get()); // TODO log with winston.info + return display(request); } async.waterfall([ @@ -42,7 +46,8 @@ module.exports = (command, resource, obj) => { return console.log(err); // TODO log with winston.error } - return console.log(result.get()); // TODO log with winston.info + return display(result.get()); + // return console.log(result.get()); // TODO log with winston.info }); }) .catch(err => { From 84332119dbad45c8a5a160f7a6318d69cf65c7d9 Mon Sep 17 00:00:00 2001 From: Sweetlie Date: Tue, 19 Sep 2017 12:14:50 +0200 Subject: [PATCH 3/3] make id a verb in wow achievement command --- cmds/request/wow/achievement.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/cmds/request/wow/achievement.js b/cmds/request/wow/achievement.js index 01a2b90..4bef3f5 100644 --- a/cmds/request/wow/achievement.js +++ b/cmds/request/wow/achievement.js @@ -5,17 +5,10 @@ const logger = require('../../../lib/logger'); const request = yargs .command({ - command: 'achievement', + command: 'achievement ', describe: 'Fetch a World of Warcraft achievement', builder: yargs => { return yargs - .options({ - id: { - alias: 'i', - describe: 'The [id] of the {achievement}', - demand: true, - }, - }); }, handler: argv => logger('wow', 'achievement', argv), }).argv;