From f83d79370409877514943453af2ebb7dea2b6b0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= <markus.makela@mariadb.com>
Date: Tue, 11 Jul 2017 10:52:07 +0300
Subject: [PATCH] MXS-1300: Split the code into core and cli parts

The cli part of the code just passes the process argument vector the the
core part. The core part contains the actual functional parts of the
code. This split is done to make testing easier.
---
 client/maxctrl/core.js    | 76 +++++++++++++++++++++++++++++++++++++++
 client/maxctrl/maxctrl.js | 61 +------------------------------
 2 files changed, 77 insertions(+), 60 deletions(-)
 create mode 100644 client/maxctrl/core.js

diff --git a/client/maxctrl/core.js b/client/maxctrl/core.js
new file mode 100644
index 000000000..1aa77ba0f
--- /dev/null
+++ b/client/maxctrl/core.js
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2016 MariaDB Corporation Ab
+ *
+ * Use of this software is governed by the Business Source License included
+ * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
+ *
+ * Change Date: 2020-01-01
+ *
+ * On the date above, in accordance with the Business Source License, use
+ * of this software will be governed by version 2 or later of the General
+ * Public License.
+ */
+require('./common.js')()
+
+const maxctrl_version = '1.0.0';
+
+module.exports = function(argv) {
+    program
+        .version(maxctrl_version)
+        .group(['u', 'p', 'h', 's', 't'], 'Global Options:')
+        .option('u', {
+            alias:'user',
+            global: true,
+            default: 'admin',
+            describe: 'Username to use',
+            type: 'string'
+        })
+        .option('p', {
+            alias: 'password',
+            describe: 'Password for the user',
+            default: 'mariadb',
+            type: 'string'
+        })
+        .option('h', {
+            alias: 'hosts',
+            describe: 'List of MaxScale hosts. The hosts must be in ' +
+                '<hostname>:<port> format and each host must be separated by spaces.',
+            default: 'localhost:8989',
+            type: 'array'
+        })
+        .option('s', {
+            alias: 'secure',
+            describe: 'Enable HTTPS requests',
+            default: 'false',
+            type: 'boolean'
+        })
+        .option('t', {
+            alias: 'timeout',
+            describe: 'Request timeout in milliseconds',
+            default: '10000',
+            type: 'number'
+        })
+
+        .command(require('./lib/list.js'))
+        .command(require('./lib/show.js'))
+        .command(require('./lib/set.js'))
+        .command(require('./lib/clear.js'))
+        .command(require('./lib/enable.js'))
+        .command(require('./lib/disable.js'))
+        .command(require('./lib/create.js'))
+        .command(require('./lib/destroy.js'))
+        .command(require('./lib/link.js'))
+        .command(require('./lib/unlink.js'))
+        .command(require('./lib/start.js'))
+        .command(require('./lib/stop.js'))
+        .command(require('./lib/alter.js'))
+        .command(require('./lib/rotate.js'))
+        .command(require('./lib/call.js'))
+        .help()
+        .demandCommand(1, 'At least one command is required')
+        .command('*', 'the default command', {}, () => {
+            console.log('Unknown command. See output of `help` for a list of commands.')
+        })
+        .parse(argv)
+        .argv
+}
diff --git a/client/maxctrl/maxctrl.js b/client/maxctrl/maxctrl.js
index 7c8751927..cc3fb7b1e 100644
--- a/client/maxctrl/maxctrl.js
+++ b/client/maxctrl/maxctrl.js
@@ -10,66 +10,7 @@
  * of this software will be governed by version 2 or later of the General
  * Public License.
  */
-require('./common.js')()
 
 'use strict';
 
-const maxctrl_version = '1.0.0';
-
-program
-    .version(maxctrl_version)
-    .group(['u', 'p', 'h', 's', 't'], 'Global Options:')
-    .option('u', {
-        alias:'user',
-        global: true,
-        default: 'admin',
-        describe: 'Username to use',
-        type: 'string'
-    })
-    .option('p', {
-        alias: 'password',
-        describe: 'Password for the user',
-        default: 'mariadb',
-        type: 'string'
-    })
-    .option('h', {
-        alias: 'hosts',
-        describe: 'List of MaxScale hosts. The hosts must be in ' +
-            '<hostname>:<port> format and each host must be separated by spaces.',
-        default: 'localhost:8989',
-        type: 'array'
-    })
-    .option('s', {
-        alias: 'secure',
-        describe: 'Enable HTTPS requests',
-        default: 'false',
-        type: 'boolean'
-    })
-    .option('t', {
-        alias: 'timeout',
-        describe: 'Request timeout in milliseconds',
-        default: '10000',
-        type: 'number'
-    })
-
-    .command(require('./lib/list.js'))
-    .command(require('./lib/show.js'))
-    .command(require('./lib/set.js'))
-    .command(require('./lib/clear.js'))
-    .command(require('./lib/enable.js'))
-    .command(require('./lib/disable.js'))
-    .command(require('./lib/create.js'))
-    .command(require('./lib/destroy.js'))
-    .command(require('./lib/link.js'))
-    .command(require('./lib/unlink.js'))
-    .command(require('./lib/start.js'))
-    .command(require('./lib/stop.js'))
-    .command(require('./lib/alter.js'))
-    .command(require('./lib/rotate.js'))
-    .command(require('./lib/call.js'))
-    .help()
-    .demandCommand(1, 'At least one command is required')
-    .command('*', 'the default command', {}, () => {
-        console.log('Unknown command. See output of `help` for a list of commands.')
-    })
-    .argv
+require('./core.js')(process.argv)