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

Commit 6796651

Browse files
sambonfiresambonfire
authored
Merge branch 'master' into master
2 parents afec12d + 9ead2b1 commit 6796651

File tree

69 files changed

+2075
-614
lines changed

Some content is hidden

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

69 files changed

+2075
-614
lines changed

‎GitHub.Unity.sln‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityTests", "src\UnityExte
3737
EndProject
3838
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExtensionLoader", "src\UnityExtension\Assets\Editor\GitHub.Unity\ExtensionLoader\ExtensionLoader.csproj", "{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}"
3939
EndProject
40+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnityShim", "src\UnityShim\UnityShim.csproj", "{F94F8AE1-C171-4A83-89E8-6557CA91A188}"
41+
EndProject
4042
Global
4143
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4244
Debug|Any CPU = Debug|Any CPU
@@ -161,6 +163,14 @@ Global
161163
{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.dev|Any CPU.Build.0 = dev|Any CPU
162164
{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Release|Any CPU.ActiveCfg = Release|Any CPU
163165
{6B0EAB30-511A-44C1-87FE-D9AB7E34D115}.Release|Any CPU.Build.0 = Release|Any CPU
166+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
167+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Debug|Any CPU.Build.0 = Debug|Any CPU
168+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.DebugNoUnity|Any CPU.ActiveCfg = Debug|Any CPU
169+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.DebugNoUnity|Any CPU.Build.0 = Debug|Any CPU
170+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.dev|Any CPU.ActiveCfg = dev|Any CPU
171+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.dev|Any CPU.Build.0 = dev|Any CPU
172+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Release|Any CPU.ActiveCfg = Release|Any CPU
173+
{F94F8AE1-C171-4A83-89E8-6557CA91A188}.Release|Any CPU.Build.0 = Release|Any CPU
164174
EndGlobalSection
165175
GlobalSection(SolutionProperties) = preSolution
166176
HideSolutionNode = FALSE

‎create-unitypackage.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#!/bin/sh -eu
2+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
3+
4+
version=$(sed -En 's,.*Version = "(.*)".*,\1,p' common/SolutionInfo.cs)
5+
commitcount=$(git rev-list --count HEAD)
6+
commit=$(git log -n1 --pretty=format:%h)
7+
version="${version}.${commitcount}-${commit}"
8+
9+
$DIR/submodules/packaging/unitypackage/run.sh --path $DIR/unity/PackageProject --out $DIR --file github-for-unity-$version

‎octorun/bin/octorun-meta‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env node
2+
3+
require('../src/bin/app-meta.js');

‎octorun/bin/octorun-token‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#!/usr/bin/env node
2+
3+
require('../src/bin/app-token.js');

‎octorun/src/api.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var config = require("./configuration");
22
var octokitWrapper = require("./octokit");
33

4-
function ApiWrapper() {
4+
function ApiWrapper(host) {
55
if (!config.appName) {
66
throw "appName missing";
77
}
@@ -10,7 +10,7 @@ function ApiWrapper() {
1010
throw "token missing";
1111
}
1212

13-
this.octokit = octokitWrapper.createOctokit(config.appName);
13+
this.octokit = octokitWrapper.createOctokit(config.appName, host);
1414

1515
this.octokit.authenticate({
1616
type: "oauth",

‎octorun/src/authentication.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var twoFactorRegex = new RegExp("must specify two-factor authentication otp code
55

66
var scopes = ["user", "repo"];
77

8-
var handleAuthentication = function (username, password, onSuccess, onFailure, twoFactor) {
8+
var handleAuthentication = function (username, password, onSuccess, onFailure, twoFactor, host) {
99
if (!config.clientId || !config.clientSecret) {
1010
throw "clientId and/or clientSecret missing";
1111
}
@@ -14,7 +14,7 @@ var handleAuthentication = function (username, password, onSuccess, onFailure, t
1414
throw "appName missing";
1515
}
1616

17-
var octokit = octokitWrapper.createOctokit(config.appName);
17+
var octokit = octokitWrapper.createOctokit(config.appName, host);
1818

1919
octokit.authenticate({
2020
type: "basic",

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ var output = require('../output');
66
commander
77
.version(package.version)
88
.option('-t, --twoFactor')
9+
.option('-h, --host <host>')
910
.parse(process.argv);
1011

1112
var handleAuthentication = function (username, password, twoFactor) {
@@ -18,7 +19,7 @@ var handleAuthentication = function (username, password, twoFactor) {
1819
}
1920
}, function (error) {
2021
output.error(error);
21-
}, twoFactor);
22+
}, twoFactor, commander.host);
2223
}
2324

2425
var encoding = 'utf-8';

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

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
var commander = require('commander');
2+
var package = require('../../package.json');
3+
var output = require('../output');
4+
5+
commander
6+
.version(package.version)
7+
.option('-h, --host <host>')
8+
.parse(process.argv);
9+
10+
var host = commander.host;
11+
var port = 443;
12+
var scheme = 'https';
13+
14+
if (host) {
15+
var https = require(scheme);
16+
var options = {
17+
protocol: scheme + ':',
18+
hostname: host,
19+
port: port,
20+
path: '/api/v3/meta',
21+
method: 'GET',
22+
headers: {
23+
'Content-Type': 'application/json'
24+
}
25+
};
26+
27+
var req = https.request(options, function (res) {
28+
var success = res.statusCode == 200;
29+
30+
if(!success) {
31+
output.error(res.statusCode);
32+
} else {
33+
res.on('data', function (d) {
34+
output.custom("success", d, true);
35+
});
36+
37+
res.on('end', function (d) {
38+
process.exit();
39+
});
40+
}
41+
});
42+
43+
req.on('error', function (error) {
44+
output.error(error);
45+
});
46+
47+
req.end();
48+
}
49+
else {
50+
commander.help();
51+
process.exit(-1);
52+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ var output = require('../output');
55

66
commander
77
.version(package.version)
8+
.option('-h, --host <host>')
89
.parse(process.argv);
910

1011
try {
11-
12-
var apiWrapper = new ApiWrapper();
12+
var apiWrapper = new ApiWrapper(commander.host);
1313
apiWrapper.getOrgs(function (error, result) {
1414
if (error) {
1515
output.error(error);

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ commander
99
.option('-d, --description <description>')
1010
.option('-o, --organization <organization>')
1111
.option('-p, --private')
12+
.option('-h, --host <host>')
1213
.parse(process.argv);
1314

1415
if(!commander.repository)
@@ -23,7 +24,7 @@ if (commander.private) {
2324
}
2425

2526
try {
26-
var apiWrapper = new ApiWrapper();
27+
var apiWrapper = new ApiWrapper(commander.host);
2728

2829
apiWrapper.publish(commander.repository, commander.description, private, commander.organization,
2930
function (error, result) {

0 commit comments

Comments
 (0)