Refactored Octorun output processing

octorun/src/api.js

@@ -65,24 +65,24 @@ ApiWrapper.prototype.getOrgs = function (callback) {
 };
 
 ApiWrapper.prototype.publish = function (name, desc, private, organization, callback) {
+    var callbackHandler = function (error, result) {
+        callback(error, (!result) ? null : [result.data.name, result.data.clone_url]);
+    };
+
     if (organization) {
         this.octokit.repos.createForOrg({
             org: organization,
             name: name,
             description: desc,
             private: private
-        }, function (error, result) {
-            callback(error, (!result) ? null : result.data.clone_url);
-        });
+        }, callbackHandler);
     }
     else {
         this.octokit.repos.create({
             name: name,
             description: desc,
             private: private
-        }, function (error, result) {
-            callback(error, (!result) ? null : result.data.clone_url);
-        });
+        }, callbackHandler);
     }
 };
 

octorun/src/authentication.js

@@ -2,9 +2,7 @@ var endOfLine = require('os').EOL;
 var config = require("./configuration");
 var octokitWrapper = require("./octokit");
 
-var lockedRegex = new RegExp("number of login attempts exceeded", "gi");
 var twoFactorRegex = new RegExp("must specify two-factor authentication otp code", "gi");
-var badCredentialsRegex = new RegExp("bad credentials", "gi");
 
 var scopes = ["user", "repo", "gist", "write:public_key"];
 
@@ -48,12 +46,6 @@ var handleAuthentication = function (username, password, onSuccess, onFailure, t
             else if (twoFactorRegex.test(err.message)) {
                 onSuccess(password, "2fa");
             }
-            else if (lockedRegex.test(err.message)) {
-                onFailure("locked")
-            }
-            else if (badCredentialsRegex.test(err.message)) {
-                onFailure("badcredentials")
-            }
             else {
                 onFailure(err)
             }

octorun/src/bin/app-login.js

@@ -13,15 +13,12 @@ var handleAuthentication = function (username, password, twoFactor) {
     authentication.handleAuthentication(username, password, function (token, status) {
         if (status) {
             output.custom(status, token);
-            process.exit();
         }
         else {
             output.success(token);
-            process.exit();
         }
     }, function (error) {
         output.error(error);
-        process.exit();
     }, twoFactor);
 }
 
@@ -41,7 +38,6 @@ if (commander.twoFactor) {
         }
         catch (error) {
             output.error(error);
-            process.exit();
         }
     }
     else {
@@ -108,7 +104,6 @@ else {
             }
             catch (error) {
                 output.error(error);
-                process.exit();
             }
         });
     }

octorun/src/bin/app-organizations.js

@@ -14,21 +14,18 @@ try {
     apiWrapper.getOrgs(function (error, result) {
         if (error) {
             output.error(error);
-            process.exit();
         }
         else {
-            results = [];
+            var results = [];
             for (var i = 0; i < result.length; i++) {
                 results.push(result[i].name);
                 results.push(result[i].login);
             }
 
             output.success(results);
-            process.exit();
         }
     });
 }
 catch (error) {
     output.error(error);
-    process.exit();
 }

octorun/src/bin/app-publish.js

@@ -2,6 +2,7 @@ var commander = require("commander");
 var package = require('../../package.json')
 var ApiWrapper = require('../api')
 var endOfLine = require('os').EOL;
+var output = require('../output');
 
 commander
     .version(package.version)
@@ -13,11 +14,8 @@ commander
 
 if(!commander.repository)
 {
-    process.stdout.write("repository required");
-    process.stdout.write(endOfLine);
     commander.help();
     process.exit(-1);
-    return;
 }
 
 var private = false;
@@ -31,46 +29,13 @@ try {
     apiWrapper.publish(commander.repository, commander.description, private, commander.organization,
         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);
-                }
-
-                process.exit();
+                output.error(error);
             }
             else {
-                process.stdout.write("success");
-                process.stdout.write(endOfLine);
-
-                process.stdout.write(commander.repository);
-                process.stdout.write(endOfLine);
-
-                process.stdout.write(result);
-                process.stdout.write(endOfLine);
-                process.exit();
+                output.success(result);
             }
         });
 }
 catch (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);
-    }
-
-    process.exit();
+    output.error(error);
 }

octorun/src/bin/app-usage.js

@@ -3,6 +3,7 @@ var package = require('../../package.json')
 var endOfLine = require('os').EOL;
 var fs = require('fs');
 var util = require('util');
+var output = require('../output');
 
 commander
     .version(package.version)
@@ -50,38 +51,20 @@ if (fileContents && host) {
 
         res.on('data', function (d) {
             if (success) {
-                process.stdout.write("success");
-                process.stdout.write(endOfLine);
-                process.stdout.write(d);
-                process.stdout.write(endOfLine);
+                output.custom("success", d, true);
             }
             else {
-                process.stdout.write("error");
-                process.stdout.write(endOfLine);
-
-                process.stdout.write("");
-                process.stdout.write(endOfLine);
-
-                process.stdout.write(d);
-                process.stdout.write(endOfLine);
+                output.custom("error", "", true);
             }
         });
 
         res.on('end', function (d) {
-            process.exit(success ? 0 : -1);
+            process.exit();
         });
     });
 
     req.on('error', function (error) {
-        process.stdout.write("Error");
-        process.stdout.write(endOfLine);
-
-        if (error) {
-            process.stdout.write(error.toString());
-            process.stdout.write(endOfLine);
-        }
-
-        process.exit(-1);
+        output.error(error);
     });
 
     req.write(fileContents);

octorun/src/output.js

@@ -1,6 +1,6 @@
 var endOfLine = require('os').EOL;
 
-var outputResult = function (status, results, errors) {
+var outputResult = function (status, results, errors, preventExit) {
     process.stdout.write(status);
     process.stdout.write(endOfLine);
 
@@ -24,8 +24,9 @@ var outputResult = function (status, results, errors) {
                 process.stdout.write(endOfLine);
             }
         }
-
-        throw "Unsupported result output";
+        else {
+            throw "Unsupported result output";
+        }
     }
 
     if (errors) {
@@ -37,26 +38,34 @@ var outputResult = function (status, results, errors) {
             for (var errorIndex = 0; errorIndex < errors.length; errorIndex++) {
                 var error = errors[errorIndex];
                 if (typeof error !== 'string') {
-                    throw "Unsupported result output";
+                    throw "Unsupported error output";
                 }
 
                 process.stdout.write(error);
                 process.stdout.write(endOfLine);
             }
         }
+        else if (errors.toString) {
+            process.stdout.write(errors.toString());
+            process.stdout.write(endOfLine);
+        }
         else {
             process.stdout.write(errors);
             process.stdout.write(endOfLine);
         }
     }
+
+    if (!preventExit) {
+        process.exit();
+    }
 }
 
 var outputSuccess = function (results) {
     outputResult("success", results);
 }
 
-var outputCustom = function (status, results) {
-    outputResult(status, results);
+var outputCustom = function (status, results, preventExit) {
+    outputResult(status, results, undefined, preventExit);
 }
 
 var outputError = function (errors) {

octorun/version

@@ -1 +1 @@
-b91b7b60
+46811135

src/GitHub.Api/Application/ApiClient.cs

@@ -247,12 +247,7 @@ private async Task<GitHubRepository> CreateRepositoryInternal(string repositoryN
                     };
                 }
 
-                if (ret.Output.Any())
-                {
-                    throw new ApiClientException(string.Join(Environment.NewLine, ret.Output));
-                }
-
-                throw new ApiClientException("Publish failed");
+                throw new ApiClientException(ret.GetApiErrorMessage() ?? "Publish failed");
             }
             catch (Exception ex)
             {
@@ -294,12 +289,7 @@ private async Task GetOrganizationInternal(Action<Organization[]> onSuccess, Act
                     return;
                 }
 
-                if (ret.Output.Any())
-                {
-                    throw new ApiClientException(string.Join(Environment.NewLine, ret.Output));
-                }
-
-                throw new ApiClientException("Error getting organizations");
+                throw new ApiClientException(ret.GetApiErrorMessage() ?? "Error getting organizations");
             }
             catch (Exception ex)
             {
@@ -332,12 +322,7 @@ private async Task<GitHubUser> GetCurrentUserInternal()
                     };
                 }
 
-                if (ret.Output.Any())
-                {
-                    throw new ApiClientException(string.Join(Environment.NewLine, ret.Output));
-                }
-
-                throw new ApiClientException("Error validating current user");
+                throw new ApiClientException(ret.GetApiErrorMessage() ?? "Error validating current user");
             }
             catch (KeychainEmptyException)
             {

src/GitHub.Api/Authentication/Keychain.cs

@@ -323,6 +323,6 @@ private void UpdateConnections(Connection[] conns)
         public Connection[] Connections => connections.Values.ToArray();
         public IList<UriString> Hosts => connections.Keys.ToArray();
         public bool HasKeys => connections.Any();
-        public bool NeedsLoad => HasKeys && !string.IsNullOrEmpty(FindOrCreateAdapter(connections.First().Value.Host).Credential.Token);
+        public bool NeedsLoad => HasKeys && !string.IsNullOrEmpty(FindOrCreateAdapter(connections.First().Value.Host).Credential?.Token);
     }
 }

src/GitHub.Api/Authentication/LoginManager.cs

@@ -193,22 +193,7 @@ private async Task<LoginResultData> TryLogin(
                 return new LoginResultData(resultCodes, message, host, ret.Output[0]);
             }
 
-            if (ret.IsBadCredentials)
-            {
-                return new LoginResultData(LoginResultCodes.Failed, "Bad credentials.", host, ret.Output[0]);
-            }
-
-            if (ret.IsLocked)
-            {
-                return new LoginResultData(LoginResultCodes.LockedOut, "Account locked.", host, ret.Output[0]);
-            }
-
-            if (ret.Output.Any())
-            {
-                return new LoginResultData(LoginResultCodes.Failed, "Failed.", host, ret.Output[0]);
-            }
-
-            return new LoginResultData(LoginResultCodes.Failed, "Failed.", host);
+            return new LoginResultData(LoginResultCodes.Failed, ret.GetApiErrorMessage() ?? "Failed.", host);
         }
     }
 

src/GitHub.Api/Installer/OctorunInstaller.cs

@@ -102,7 +102,7 @@ public class OctorunInstallDetails
             public const string DefaultZipMd5Url = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip.md5";
             public const string DefaultZipUrl = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip";
 
-            public const string PackageVersion = "b91b7b60";
+            public const string PackageVersion = "46811135";
             private const string PackageName = "octorun";
             private const string zipFile = "octorun.zip";
 

src/GitHub.Api/Resources/octorun.zip.md5

@@ -1 +1 @@
-7cdaa49008b8c996343e07670100bce2
+070a4561bf70031ad54ca5884f97f546