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

Commit 4c3e001

Browse files
StanleyGoldmanStanleyGoldman
committed
Refactor commands to use output module
- Moved the process.exit to output.js - Updated command scripts to use output module correctly - Updated version and zip
1 parent 7abc1de commit 4c3e001

File tree

8 files changed

+24
-76
lines changed

8 files changed

+24
-76
lines changed

‎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: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ try {
1414
apiWrapper.getOrgs(function (error, result) {
1515
if (error) {
1616
output.error(error);
17-
process.exit();
1817
}
1918
else {
2019
results = [];
@@ -24,11 +23,9 @@ try {
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(commander.repository);
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: 11 additions & 3 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

@@ -44,19 +44,27 @@ var outputResult = function (status, results, errors) {
4444
process.stdout.write(endOfLine);
4545
}
4646
}
47+
else if (errors.toString) {
48+
process.stdout.write(errors.toString());
49+
process.stdout.write(endOfLine);
50+
}
4751
else {
4852
process.stdout.write(errors);
4953
process.stdout.write(endOfLine);
5054
}
5155
}
56+
57+
if(!preventExit) {
58+
process.exit();
59+
}
5260
}
5361

5462
var outputSuccess = function (results) {
5563
outputResult("success", results);
5664
}
5765

58-
var outputCustom = function (status, results) {
59-
outputResult(status, results);
66+
var outputCustom = function (status, results, preventExit) {
67+
outputResult(status, results, undefined, preventExit);
6068
}
6169

6270
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+
560d8963

‎src/GitHub.Api/Installer/OctorunInstaller.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public class OctorunInstallDetails
102102
public const string DefaultZipMd5Url = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip.md5";
103103
public const string DefaultZipUrl = "https://ghfvs-installer.github.com/unity/octorun/octorun.zip";
104104

105-
public const string PackageVersion = "b91b7b60";
105+
public const string PackageVersion = "560d8963";
106106
private const string PackageName = "octorun";
107107
private const string zipFile = "octorun.zip";
108108

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:dcdf06517450ccbad14e1bea863387bef84b24d3709eec50c371f918839606e6
3-
size 212554
2+
oid sha256:30effaa61535bb2456a2bbbd1fcfa506f22446da329a0df2a3bb9b1c1a4a9b22
3+
size 211928

0 commit comments

Comments
 (0)