More consistent suppport of --json flag

Author: knolleary

lib/commands/hash.js

@@ -19,6 +19,9 @@ try { bcrypt = require('bcrypt'); }
 catch(e) { bcrypt = require('bcryptjs'); }
 
 function command(argv,result) {
+    if (argv.json) {
+        console.warn("hash-pw command does not support json format output")
+    }
     return new Promise(resolve => {
         prompt.read({prompt:"Password:",silent: true},function(err, password) {
             if (password) {
@@ -28,7 +31,7 @@ function command(argv,result) {
         });
     });
 }
-command.alias = "hash-pwd";
+command.alias = "hash-pw";
 command.usage = command.alias;
 command.description = "Creates a password hash suitable for use with adminAuth or httpNodeAuth";
 

lib/commands/login.js

@@ -20,6 +20,9 @@ var prompt = require("../prompt");
 
 function command(argv,result) {
     config.tokens(null);
+    if (argv.json) {
+        console.warn("login command does not support json format output")
+    }
     return request.request('/auth/login',{}).then(function(resp) {
         if (resp.type) {
             if (resp.type == "credentials") {

lib/commands/remove.js

@@ -15,7 +15,7 @@
  **/
 
 var request = require("../request");
- 
+
 function command(argv,result) {
     var module = argv._[1];
     if (!module) {
@@ -24,7 +24,11 @@ function command(argv,result) {
     return request.request('/nodes/' + module, {
         method: "DELETE"
     }).then(function() {
-        result.log("Uninstalled " + module);
+        if (argv.json) {
+            result.log(JSON.stringify({message: "Uninstalled " + module}," ",4));
+        } else {
+            result.log("Uninstalled " + module);
+        }
     }).catch(result.warn);
 }
 command.alias = "remove";

lib/commands/search.js

@@ -39,16 +39,30 @@ function command(argv,result) {
                     var index = label.indexOf(module);
                     matches.push({
                         label: label,
-                        index: index===-1?1000:index
+                        index: index===-1?1000:index,
+                        n:n
                     });
                 }
                 matches.sort(function(A,B) { return A.index - B.index; });
-                matches.forEach(function(m) {
-                    result.log(m.label);
-                });
+                if (argv.json) {
+                    result.log(JSON.stringify(matches.map(function(m) { return {
+                        name: m.n.name,
+                        description: m.n.description,
+                        version: (m.n['dist-tags']&& m.n['dist-tags'].latest)?m.n['dist-tags'].latest:undefined,
+                        updated_at: m.n.updated_at
+                    }})," ",4));
+                } else {
+                    matches.forEach(function(m) {
+                        result.log(m.label);
+                    });
+                }
 
             } else {
-                result.log("No results found");
+                if (argv.json) {
+                    result.log("[]")
+                } else {
+                    result.log("No results found");
+                }
             }
         } else {
             result.warn(response.status + ": " + response.data);

lib/commands/target.js

@@ -29,7 +29,11 @@ function command(argv,result) {
         config.target(target);
 
     }
-    result.log("Target: " + config.target());
+    if (argv.json) {
+        result.log(JSON.stringify({target: config.target()}," ",4))
+    } else {
+        result.log("Target: " + config.target());
+    }
 }
 
 command.alias = "target";

lib/result.js

@@ -154,18 +154,38 @@ module.exports = {
         }
         if (msg.response) {
             if (msg.response.status === 401) {
-                console.warn("Not logged in. Use 'login' to log in.");
+                if (outputFormat === "json") {
+                    console.log({error:"Not logged in. Use 'login' to log in.", status: 401});
+                } else {
+                    console.warn("Not logged in. Use 'login' to log in.");
+                }
             } else if (msg.response.data) {
                 if (msg.response.status === 404 && !msg.response.data.message) {
-                    console.warn("Node-RED Admin API not found. Use 'target' to set API location");
+                    if (outputFormat === "json") {
+                        console.log({error:"Node-RED Admin API not found. Use 'target' to set API location", status: 404});
+                    } else {
+                        console.warn("Node-RED Admin API not found. Use 'target' to set API location");
+                    }
                 } else {
-                    console.warn(msg.response.status+": "+msg.response.data.message);
+                    if (outputFormat === "json") {
+                        console.log({error:msg.response.data.message, status: msg.response.status});
+                    } else {
+                        console.warn(msg.response.status+": "+msg.response.data.message);
+                    }
                 }
             } else {
-                console.warn(msg.response.status+": "+msg.toString());
+                if (outputFormat === "json") {
+                    console.log({error:msg.toString(), status: msg.response.status});
+                } else {
+                    console.warn(msg.response.status+": "+msg.toString());
+                }
             }
         } else {
-            console.warn(msg.toString());
+            if (outputFormat === "json") {
+                console.log({error:msg.toString()});
+            } else {
+                console.warn(msg.toString());
+            }
         }
     },
     help:function(command) {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red-admin",
-    "version": "0.2.3",
+    "version": "0.2.4",
     "description": "The Node-RED admin command line interface",
     "homepage": "http://nodered.org",
     "bugs": {