Use Subclassing introduced in repository.js

Author: andreas-marschke

cli/core.js

@@ -1,63 +1,28 @@
 "use strict";
 
-//
-// Imports
-//
 var fs = require("fs");
-var _ = require("lodash");
 
 var log = require("../lib/util/log");
 var constants = require("../lib/constants");
 var SOASTA = require("../lib/model/mPulse.js");
+var CLI = require("soasta-repository").CLI;
+
+Object.keys(CLI).forEach(function(functionName) {
+    exports[functionName] = CLI[functionName];
+});
 
-//
-// Exports
-//
 /**
  * Initializes the command-line interface
  *
  * @param {object} options Options
  */
 exports.init = function(options) {
-    if (options && options.parent && options.parent.verbose) {
-        log.transports.console.level = "debug";
-    }
-
-    if (fs.existsSync("auth.json")) {
-        // read in auth info
-        var authContents = fs.readFileSync("auth.json", "utf-8");
-        var auth = JSON.parse(authContents);
-
-        // use auth contents as fallback
-        options.parent = _.merge({}, auth, options.parent);
-    }
-
-    // use defaults for repository
-    if (!options.parent.repository) {
-        options.parent.repository = constants.REPOSITORY_URL;
-    }
+    log.transports.console.json = options.parent.json;
+    CLI.init.call(null, options);
 
     if (!options.parent.mpulse) {
         options.parent.mpulse = constants.QUERY_URL;
     }
-
-    console.log(options.parent);
-
-    // ensure username and password have been specified
-    if (!options.parent.username) {
-        log.error("--username (-u) is required");
-        process.exit(1);
-    }
-
-    if (!options.parent.password) {
-        log.error("--password (-p) is required");
-        process.exit(1);
-    }
-
-    if (!options.parent.apikey) {
-        log.error("--apikey (-a) is required!");
-        process.exit(1);
-    }
 };
 
 /**
@@ -67,7 +32,6 @@ exports.init = function(options) {
  * @param {function(err, repo)} callback Callback
  */
 exports.connectToRepository = function(options, callback) {
-
     var repo = new SOASTA.mPulse(options.parent.apikey, options.parent.mpulse, options.parent.repository);
     repo.connect(options.parent.tenant, options.parent.username, options.parent.password, function(err) {
         return callback && callback(err, repo);

cli/mpulse.js

@@ -6,5 +6,32 @@ var fs = require("fs");
 
 module.exports = function(type, params, options) {
     cmdCore.init(options);
-    log.debug(params);
+    var properties;
+
+    if (!options.parent.apikey) {
+        log.error("--apikey (-a) is required!");
+        process.exit(1);
+    }
+
+    try {
+        properties = JSON.parse(params);
+    }
+    catch(exception) {
+        log.error("Parsing parameters failed!");
+        process.exit(1);
+    }
+
+    log.debug("Querying  for Type: " + type + " with params: " + params);
+
+    cmdCore.connectToRepository(options, function(err, repo) {
+        cmdCore.handleError(err);
+        repo.setApiKey(options.parent.apikey);
+
+        repo.mPulse(type, properties, function(err, result) {
+
+            cmdCore.handleError(err);
+            log.info(result);
+
+        });
+    });
 };

cli/query.js

@@ -1,25 +1,13 @@
 #!/usr/bin/env node
-var program = require("commander");
-var fs = require("fs");
+var SOASTA = require("soasta-repository");
+var program = SOASTA.cmd;
 
 program
-    .version(JSON.parse(fs.readFileSync("./package.json", "utf-8")).version)
-    .option("-u, --username <username>", "User name")
-    .option("-p, --password <password>", "Password")
-    .option("-t, --tenant <tenant>", "Tenant name")
-    .option("-r, --repository <url>", "Repository URL")
     .option("-m, --mpulse <url>", "mPulse Query API URL")
-    .option("-o, --output <file>", "Output file")
-    .option("-v, --verbose", "Verbose debugging")
-    .option("-a, --apikey", "API Key for queried domain");
+    .option("-a, --apikey <apikey>", "API Key for queried domain");
 
-// commands
-program.command("query <type>")
-    .description("query objects")
-    .action(require("./cli/query.js"));
-
-program.command("mpulse <type> <params>")
+program.command("mpulse-query <type> <params>")
     .description("mPulse type parameters")
     .action(require("./cli/mpulse.js"));
-// go
+
 program.parse(process.argv);

cmd.js

@@ -2,7 +2,7 @@
 
 var log = require("../util/log"),
     constants = require("../constants"),
-    Repository = require("soasta-repository").Repository;
+    Repository = require("soasta-repository").SOASTA.Repository;
 
 /**
  * @namespace SOASTA
@@ -53,12 +53,12 @@ var SOASTA = {
 	this.Query = query;
         var self = this;
 
-        this.query = function(type, props, callback) {
+        this.mPulse = function(type, props, callback) {
             self.Query.run(self.token, type, props, callback);
         };
 
 	this.setApiKey = function(apiKey) {
-	    self.query = new Query(queryUrl, apiKey);
+	    self.Query = new Query(queryUrl, apiKey);
 	};
 
         this.asPromises = function(Promises) {
@@ -68,7 +68,7 @@ var SOASTA = {
                 if (promisesMPulse.hasOwnProperty(name)) {
                     var func = promisesMPulse[name];
 
-                    if (typeof func === "function" && name !== "asPromises") {
+                    if (typeof func === "function" && name !== "asPromises" && name !== "setApiKey") {
                         log.debug("Replacing function " + name + " with promise-ified version.");
                         func = Promises.denodeify(func);
                         promisesMPulse[name] = func;