Adjustments to the output format

Author: StanleyGoldman

octorun/src/bin/app-login.js

@@ -1,7 +1,8 @@
 var commander = require("commander");
-var package = require('../../package.json')
-var authentication = require('../authentication')
+var package = require('../../package.json');
+var authentication = require('../authentication');
 var endOfLine = require('os').EOL;
+var output = require('../output');
 
 commander
     .version(package.version)
@@ -13,22 +14,10 @@ var encoding = 'utf-8';
 if (commander.twoFactor) {
     var handleTwoFactorAuthentication = function (username, password, token) {
         authentication.handleTwoFactorAuthentication(username, password, token, function (token) {
-            process.stdout.write("success");
-            process.stdout.write(endOfLine);
-            process.stdout.write(token);
-            process.stdout.write(endOfLine);
+            output.success(token);
             process.exit();
         }, function (error) {
-            process.stdout.write("error");
-            process.stdout.write(endOfLine);
-            process.stdout.write("");
-            process.stdout.write(endOfLine);
-
-            if (error) {
-                process.stdout.write(error.toString());
-                process.stdout.write(endOfLine);
-            }
-
+            output.error(error);
             process.exit();
         });
     }
@@ -68,27 +57,13 @@ else {
     var handleBasicAuthentication = function (username, password) {
         authentication.handleBasicAuthentication(username, password,
             function (token) {
-                process.stdout.write("success");
-                process.stdout.write(endOfLine);
-                process.stdout.write(token);
-                process.stdout.write(endOfLine);
+                output.success(token);
                 process.exit();
             }, function () {
-                process.stdout.write("2fa");
-                process.stdout.write(endOfLine);
-                process.stdout.write(password);
-                process.stdout.write(endOfLine);
+                output.custom("2fa", password);
                 process.exit();
             }, function (error) {
-                process.stdout.write("error");
-                process.stdout.write(endOfLine);
-                process.stdout.write("");
-                process.stdout.write(endOfLine);
-
-                if (error) {
-                    process.stdout.write(error.toString());
-                    process.stdout.write(endOfLine);
-                }
+                output.error(error);
                 process.exit();
             });
     }

octorun/src/bin/app-organizations.js

@@ -1,7 +1,8 @@
 var commander = require("commander");
-var package = require('../../package.json')
-var ApiWrapper = require('../api')
+var package = require('../../package.json');
+var ApiWrapper = require('../api');
 var endOfLine = require('os').EOL;
+var output = require('../output');
 
 commander
     .version(package.version)
@@ -12,39 +13,22 @@ try {
     var apiWrapper = new ApiWrapper();
     apiWrapper.getOrgs(function (error, result) {
         if (error) {
-            process.stdout.write("error");
-            process.stdout.write(endOfLine);
-
-            if (error) {
-                process.stdout.write(error.toString());
-                process.stdout.write(endOfLine);
-            }
-
+            output.error(error);
             process.exit();
         }
         else {
-            process.stdout.write("success");
-            process.stdout.write(endOfLine);
-
+            let results = [];
             for (var i = 0; i < result.length; i++) {
-                process.stdout.write(result[i].name);
-                process.stdout.write(endOfLine);
-                process.stdout.write(result[i].login);
-                process.stdout.write(endOfLine);
+                results.push(result[i].name);
+                results.push(result[i].login);
             }
 
+            output.success(results);
             process.exit();
         }
     });
 }
 catch (error) {
-    process.stdout.write("Error");
-    process.stdout.write(endOfLine);
-
-    if (error) {
-        process.stdout.write(error.toString());
-        process.stdout.write(endOfLine);
-    }
-
+    output.error(error);
     process.exit();
 }

octorun/src/bin/app-validate.js

@@ -1,7 +1,8 @@
 var commander = require("commander");
-var package = require('../../package.json')
+var package = require('../../package.json');
 var endOfLine = require('os').EOL;
-var ApiWrapper = require('../api')
+var ApiWrapper = require('../api');
+var output = require('../output');
 
 commander
     .version(package.version)
@@ -12,39 +13,16 @@ try {
 
     apiWrapper.verifyUser(function (error, result) {
         if (error) {
-            process.stdout.write("error");
-            process.stdout.write(endOfLine);
-            process.stdout.write("");
-            process.stdout.write(endOfLine);
-            process.stdout.write("");
-            process.stdout.write(endOfLine);
-
-            if (error) {
-                process.stdout.write(error.toString());
-                process.stdout.write(endOfLine);
-            }
-            
+            output.error(error)
             process.exit();
         }
         else {
-            process.stdout.write("success");
-            process.stdout.write(endOfLine);
-            process.stdout.write(result.name);
-            process.stdout.write(endOfLine);
-            process.stdout.write(result.login);
-            process.stdout.write(endOfLine);
+            output.success([result.name, result.login])
             process.exit();
         }
     });
 }
 catch (error) {
-    process.stdout.write("Error");
-    process.stdout.write(endOfLine);
-
-    if (error) {
-        process.stdout.write(error.toString());
-        process.stdout.write(endOfLine);
-    }
-
+    output.error(error)
     process.exit();
 }