Skip to content

make it useful (from my point of view) #5

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
coline-carle wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

make it useful (from my point of view) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ef0159
change fields to verbs
Sep 16, 2017
91f71c3
implement a simple display function that display only result
Sep 16, 2017
8433211
make id a verb in wow achievement command
Sep 19, 2017
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
9 changes: 1 addition & 8 deletions cmds/request/wow/achievement.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,10 @@ const logger = require('../../../lib/logger');

const request = yargs
.command({
command: 'achievement',
command: 'achievement <id>',
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;
Expand Down
14 changes: 1 addition & 13 deletions cmds/request/wow/character.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,11 @@ const logger = require('../../../lib/logger');

const character = yargs
.command({
command: 'character',
command: 'character <origin> <realm> <name>',
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}',
Expand Down
14 changes: 1 addition & 13 deletions cmds/request/wow/guild.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,11 @@ const logger = require('../../../lib/logger');

const guild = yargs
.command({
command: 'guild',
command: 'guild <origin> <realm> <name>',
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}',
Expand Down
9 changes: 7 additions & 2 deletions lib/logger.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) },
Expand All @@ -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([
Expand All @@ -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 => {
Expand Down