MXS-1300: Make output optional

Minor refactoring to the core library to allow multiple calls from within
the same program.

Added --quiet option to silence output so that tests aren't so
verbose. Currently this only works on UNIX based systems.

maxctrl/common.js

@@ -14,19 +14,27 @@
 var request = require('request-promise-native');
 var colors = require('colors/safe');
 var Table = require('cli-table');
+var consoleLib = require('console')
+var fs = require('fs')
 
 module.exports = function() {
 
     this._ = require('lodash-getpath')
 
+    this.logger = console
+
     this.maxctrl = function(argv) {
+
+        if (argv.quiet) {
+            this.logger = new consoleLib.Console(fs.createWriteStream('/dev/null'), process.stderr)
+        }
+
         this.argv = argv
         return this
     }
 
     // Request a resource collection and format it as a table
     this.getCollection = function (resource, fields) {
-
         doRequest(resource, function(res) {
 
             var header = []
@@ -52,7 +60,7 @@ module.exports = function() {
                 table.push(row)
             })
 
-            console.log(table.toString())
+            logger.log(table.toString())
         })
     }
 
@@ -86,7 +94,7 @@ module.exports = function() {
                 table.push(row)
             })
 
-            console.log(table.toString())
+            logger.log(table.toString())
         })
     }
 
@@ -112,7 +120,7 @@ module.exports = function() {
                 table.push(o)
             })
 
-            console.log(table.toString())
+            logger.log(table.toString())
         })
     }
 
@@ -147,17 +155,24 @@ module.exports = function() {
                             .then(function(res) {
                                 if (res && cb) {
                                     // Request OK, returns data
-                                    if (!this.argv.tsv) {
+                                    if (!this.argv.tsv && this.argv.hosts.length > 1) {
-                                        console.log(colors.yellow(host) + ':')
+                                        logger.log(colors.yellow(host) + ':')
                                     }
+
                                     return cb(res)
                                 } else {
                                     // Request OK, no data or data is ignored
-                                    console.log(colors.yellow(host) + ': ' + colors.green('OK'))
+                                    if (this.argv.hosts.length > 1) {
+                                        logger.log(colors.yellow(host) + ': ' + colors.green('OK'))
+                                    } else {
+                                        logger.log(colors.green('OK'))
                                     }
                                     return Promise.resolve()
+                                }
                             }, function(err) {
-                                console.log(colors.yellow(host) + ':')
+                                if (this.argv.hosts.length > 1) {
+                                    logger.log(colors.yellow(host) + ':')
+                                }
                                 if (err.response.body) {
                                     logError(JSON.stringify(err.response.body, null, 4))
                                 } else {
@@ -193,11 +208,11 @@ module.exports = function() {
     }
 
     this.logError = function(err) {
-        console.log(colors.red('Error:'), err)
+        this.logger.error(colors.red('Error:'), err)
     }
 
     this.error = function(err) {
-        console.log(colors.red('Error:'), err)
+        logger.log(colors.red('Error:'), err)
         this.argv.reject()
     }
 }

maxctrl/core.js

@@ -18,12 +18,9 @@ const maxctrl_version = '1.0.0';
 
 require('./common.js')()
 
-module.exports = function(argv) {
+program
-
-    return new Promise(function(resolve, reject) {
-        program
     .version(maxctrl_version)
-            .group(['u', 'p', 'h', 's', 't', 'tsv'], 'Global Options:')
+    .group(['u', 'p', 'h', 's', 't', 'q', 'tsv'], 'Global Options:')
     .option('u', {
         alias:'user',
         global: true,
@@ -56,6 +53,12 @@ module.exports = function(argv) {
         default: '10000',
         type: 'number'
     })
+    .option('q', {
+        alias: 'quiet',
+        describe: 'Output only errors',
+        default: 'false',
+        type: 'boolean'
+    })
     .option('tsv', {
         describe: 'Print tab separated output',
         default: 'false',
@@ -82,6 +85,15 @@ module.exports = function(argv) {
     .command('*', 'the default command', {}, () => {
         console.log('Unknown command. See output of `help` for a list of commands.')
     })
+
+module.exports.execute = function(argv, opts) {
+    if (opts && opts.extra_args) {
+        // Add extra options to the end of the argument list
+        argv = argv.concat(opts.extra_args)
+    }
+
+    return new Promise(function(resolve, reject) {
+        program
             .parse(argv, {resolve: resolve, reject: reject})
     })
 }

maxctrl/lib/alter.js

@@ -40,6 +40,6 @@ exports.builder = function(yargs) {
         .usage('Usage: alter <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help alter` for a list of commands.')
+            logger.log('Unknown command. See output of `help alter` for a list of commands.')
         })
 }

maxctrl/lib/call.js

@@ -35,13 +35,13 @@ exports.builder = function(yargs) {
                     return maxctrl
                         .doAsyncRequest('maxscale/modules/' + argv.module + '/' + argv.command + '?' + argv.parameters.join('&'),
                                         function(resp) {
-                                            console.log(JSON.stringify(resp, null, 4))
+                                            logger.log(JSON.stringify(resp, null, 4))
                                         }, { method: verb })
                 })
         })
         .usage('Usage: call <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help call` for a list of commands.')
+            logger.log('Unknown command. See output of `help call` for a list of commands.')
         })
 }

maxctrl/lib/clear.js

@@ -25,6 +25,6 @@ exports.builder = function(yargs) {
         .usage('Usage: clear <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help clear` for a list of commands.')
+            logger.log('Unknown command. See output of `help clear` for a list of commands.')
         })
 }

maxctrl/lib/create.js

@@ -181,6 +181,6 @@ exports.builder = function(yargs) {
         .usage('Usage: create <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help create` for a list of commands.')
+            logger.log('Unknown command. See output of `help create` for a list of commands.')
         })
 }

maxctrl/lib/destroy.js

@@ -36,6 +36,6 @@ exports.builder = function(yargs) {
         .usage('Usage: destroy <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help destroy` for a list of commands.')
+            logger.log('Unknown command. See output of `help destroy` for a list of commands.')
         })
 }

maxctrl/lib/disable.js

@@ -48,6 +48,6 @@ exports.builder = function(yargs) {
         .usage('Usage: disable <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help disable` for a list of commands.')
+            logger.log('Unknown command. See output of `help disable` for a list of commands.')
         })
 }

maxctrl/lib/enable.js

@@ -54,6 +54,6 @@ exports.builder = function(yargs) {
         .usage('Usage: enable <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help enable` for a list of commands.')
+            logger.log('Unknown command. See output of `help enable` for a list of commands.')
         })
 }

maxctrl/lib/link.js

@@ -44,6 +44,6 @@ exports.builder = function(yargs) {
         .usage('Usage: link <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help link` for a list of commands.')
+            logger.log('Unknown command. See output of `help link` for a list of commands.')
         })
 }

maxctrl/lib/list.js

@@ -87,6 +87,6 @@ exports.builder = function(yargs) {
         .usage('Usage: list <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help list` for a list of commands.')
+            logger.log('Unknown command. See output of `help list` for a list of commands.')
         })
 }

maxctrl/lib/rotate.js

@@ -24,6 +24,6 @@ exports.builder = function(yargs) {
         .usage('Usage: rotate <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help rotate` for a list of commands.')
+            logger.log('Unknown command. See output of `help rotate` for a list of commands.')
         })
 }

maxctrl/lib/set.js

@@ -25,6 +25,6 @@ exports.builder = function(yargs) {
         .usage('Usage: set <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help set` for a list of commands.')
+            logger.log('Unknown command. See output of `help set` for a list of commands.')
         })
 }

maxctrl/lib/show.js

@@ -111,6 +111,6 @@ exports.builder = function(yargs) {
         .usage('Usage: show <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help show` for a list of commands.')
+            logger.log('Unknown command. See output of `help show` for a list of commands.')
         })
 }

maxctrl/lib/start.js

@@ -28,6 +28,6 @@ exports.builder = function(yargs) {
         .usage('Usage: start <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help start` for a list of commands.')
+            logger.log('Unknown command. See output of `help start` for a list of commands.')
         })
 }

maxctrl/lib/stop.js

@@ -28,6 +28,6 @@ exports.builder = function(yargs) {
         .usage('Usage: stop <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help stop` for a list of commands.')
+            logger.log('Unknown command. See output of `help stop` for a list of commands.')
         })
 }

maxctrl/lib/unlink.js

@@ -44,6 +44,6 @@ exports.builder = function(yargs) {
         .usage('Usage: unlink <command>')
         .help()
         .command('*', 'the default command', {}, () => {
-            console.log('Unknown command. See output of `help unlink` for a list of commands.')
+            logger.log('Unknown command. See output of `help unlink` for a list of commands.')
         })
 }

maxctrl/maxctrl.js

@@ -22,5 +22,5 @@ if (process.argv[0] == process.execPath) {
     process.argv.shift()
 }
 
-maxctrl(process.argv)
+maxctrl.execute(process.argv)
     .then(function(out) {}, function(out) {})