Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Commit d2a6350

Browse files
shanashana
committed
Merge master into fixes/git-save-path-failure
2 parents aa92db2 + c9443c6 commit d2a6350

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1158
-1143
lines changed

‎common/SolutionInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
namespace System
3232
{
3333
internal static class AssemblyVersionInformation {
34-
internal const string Version = "0.30.11";
34+
internal const string Version = "0.31.2";
3535
}
3636
}

‎octorun/src/api.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,24 @@ ApiWrapper.prototype.getOrgs = function (callback) {
6565
};
6666

6767
ApiWrapper.prototype.publish = function (name, desc, private, organization, callback) {
68+
var callbackHandler = function (error, result) {
69+
callback(error, (!result) ? null : [result.data.name, result.data.clone_url]);
70+
};
71+
6872
if (organization) {
6973
this.octokit.repos.createForOrg({
7074
org: organization,
7175
name: name,
7276
description: desc,
7377
private: private
74-
}, function (error, result) {
75-
callback(error, (!result) ? null : result.data.clone_url);
76-
});
78+
}, callbackHandler);
7779
}
7880
else {
7981
this.octokit.repos.create({
8082
name: name,
8183
description: desc,
8284
private: private
83-
}, function (error, result) {
84-
callback(error, (!result) ? null : result.data.clone_url);
85-
});
85+
}, callbackHandler);
8686
}
8787
};
8888

‎octorun/src/authentication.js‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@ var endOfLine = require('os').EOL;
22
var config = require("./configuration");
33
var octokitWrapper = require("./octokit");
44

5-
var lockedRegex = new RegExp("number of login attempts exceeded", "gi");
65
var twoFactorRegex = new RegExp("must specify two-factor authentication otp code", "gi");
7-
var badCredentialsRegex = new RegExp("bad credentials", "gi");
86

97
var scopes = ["user", "repo", "gist", "write:public_key"];
108

@@ -48,12 +46,6 @@ var handleAuthentication = function (username, password, onSuccess, onFailure, t
4846
else if (twoFactorRegex.test(err.message)) {
4947
onSuccess(password, "2fa");
5048
}
51-
else if (lockedRegex.test(err.message)) {
52-
onFailure("locked")
53-
}
54-
else if (badCredentialsRegex.test(err.message)) {
55-
onFailure("badcredentials")
56-
}
5749
else {
5850
onFailure(err)
5951
}

‎octorun/src/bin/app-login.js‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ var handleAuthentication = function (username, password, twoFactor) {
1313
authentication.handleAuthentication(username, password, function (token, status) {
1414
if (status) {
1515
output.custom(status, token);
16-
process.exit();
1716
}
1817
else {
1918
output.success(token);
20-
process.exit();
2119
}
2220
}, function (error) {
2321
output.error(error);
24-
process.exit();
2522
}, twoFactor);
2623
}
2724

@@ -41,7 +38,6 @@ if (commander.twoFactor) {
4138
}
4239
catch (error) {
4340
output.error(error);
44-
process.exit();
4541
}
4642
}
4743
else {
@@ -108,7 +104,6 @@ else {
108104
}
109105
catch (error) {
110106
output.error(error);
111-
process.exit();
112107
}
113108
});
114109
}

‎octorun/src/bin/app-organizations.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,18 @@ try {
1414
apiWrapper.getOrgs(function (error, result) {
1515
if (error) {
1616
output.error(error);
17-
process.exit();
1817
}
1918
else {
20-
results = [];
19+
var results = [];
2120
for (var i = 0; i < result.length; i++) {
2221
results.push(result[i].name);
2322
results.push(result[i].login);
2423
}
2524

2625
output.success(results);
27-
process.exit();
2826
}
2927
});
3028
}
3129
catch (error) {
3230
output.error(error);
33-
process.exit();
3431
}

‎octorun/src/bin/app-publish.js‎

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ var commander = require("commander");
22
var package = require('../../package.json')
33
var ApiWrapper = require('../api')
44
var endOfLine = require('os').EOL;
5+
var output = require('../output');
56

67
commander
78
.version(package.version)
@@ -13,11 +14,8 @@ commander
1314

1415
if(!commander.repository)
1516
{
16-
process.stdout.write("repository required");
17-
process.stdout.write(endOfLine);
1817
commander.help();
1918
process.exit(-1);
20-
return;
2119
}
2220

2321
var private = false;
@@ -31,46 +29,13 @@ try {
3129
apiWrapper.publish(commander.repository, commander.description, private, commander.organization,
3230
function (error, result) {
3331
if (error) {
34-
process.stdout.write("error");
35-
process.stdout.write(endOfLine);
36-
37-
process.stdout.write("");
38-
process.stdout.write(endOfLine);
39-
40-
process.stdout.write("");
41-
process.stdout.write(endOfLine);
42-
43-
if (error) {
44-
process.stdout.write(error.toString());
45-
process.stdout.write(endOfLine);
46-
}
47-
48-
process.exit();
32+
output.error(error);
4933
}
5034
else {
51-
process.stdout.write("success");
52-
process.stdout.write(endOfLine);
53-
54-
process.stdout.write(commander.repository);
55-
process.stdout.write(endOfLine);
56-
57-
process.stdout.write(result);
58-
process.stdout.write(endOfLine);
59-
process.exit();
35+
output.success(result);
6036
}
6137
});
6238
}
6339
catch (error) {
64-
process.stdout.write("error");
65-
process.stdout.write(endOfLine);
66-
67-
process.stdout.write("");
68-
process.stdout.write(endOfLine);
69-
70-
if (error) {
71-
process.stdout.write(error.toString());
72-
process.stdout.write(endOfLine);
73-
}
74-
75-
process.exit();
40+
output.error(error);
7641
}

‎octorun/src/bin/app-usage.js‎

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ var package = require('../../package.json')
33
var endOfLine = require('os').EOL;
44
var fs = require('fs');
55
var util = require('util');
6+
var output = require('../output');
67

78
commander
89
.version(package.version)
@@ -50,38 +51,20 @@ if (fileContents && host) {
5051

5152
res.on('data', function (d) {
5253
if (success) {
53-
process.stdout.write("success");
54-
process.stdout.write(endOfLine);
55-
process.stdout.write(d);
56-
process.stdout.write(endOfLine);
54+
output.custom("success", d, true);
5755
}
5856
else {
59-
process.stdout.write("error");
60-
process.stdout.write(endOfLine);
61-
62-
process.stdout.write("");
63-
process.stdout.write(endOfLine);
64-
65-
process.stdout.write(d);
66-
process.stdout.write(endOfLine);
57+
output.custom("error", "", true);
6758
}
6859
});
6960

7061
res.on('end', function (d) {
71-
process.exit(success ? 0 : -1);
62+
process.exit();
7263
});
7364
});
7465

7566
req.on('error', function (error) {
76-
process.stdout.write("Error");
77-
process.stdout.write(endOfLine);
78-
79-
if (error) {
80-
process.stdout.write(error.toString());
81-
process.stdout.write(endOfLine);
82-
}
83-
84-
process.exit(-1);
67+
output.error(error);
8568
});
8669

8770
req.write(fileContents);

‎octorun/src/output.js‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var endOfLine = require('os').EOL;
22

3-
var outputResult = function (status, results, errors) {
3+
var outputResult = function (status, results, errors, preventExit) {
44
process.stdout.write(status);
55
process.stdout.write(endOfLine);
66

@@ -24,8 +24,9 @@ var outputResult = function (status, results, errors) {
2424
process.stdout.write(endOfLine);
2525
}
2626
}
27-
28-
throw "Unsupported result output";
27+
else {
28+
throw "Unsupported result output";
29+
}
2930
}
3031

3132
if (errors) {
@@ -37,26 +38,34 @@ var outputResult = function (status, results, errors) {
3738
for (var errorIndex = 0; errorIndex < errors.length; errorIndex++) {
3839
var error = errors[errorIndex];
3940
if (typeof error !== 'string') {
40-
throw "Unsupported result output";
41+
throw "Unsupported error output";
4142
}
4243

4344
process.stdout.write(error);
4445
process.stdout.write(endOfLine);
4546
}
4647
}
48+
else if (errors.toString) {
49+
process.stdout.write(errors.toString());
50+
process.stdout.write(endOfLine);
51+
}
4752
else {
4853
process.stdout.write(errors);
4954
process.stdout.write(endOfLine);
5055
}
5156
}
57+
58+
if (!preventExit) {
59+
process.exit();
60+
}
5261
}
5362

5463
var outputSuccess = function (results) {
5564
outputResult("success", results);
5665
}
5766

58-
var outputCustom = function (status, results) {
59-
outputResult(status, results);
67+
var outputCustom = function (status, results, preventExit) {
68+
outputResult(status, results, undefined, preventExit);
6069
}
6170

6271
var outputError = function (errors) {

‎octorun/version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b91b7b60
1+
46811135

0 commit comments

Comments
 (0)