suzanne.soy/shields
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mtaylor91/master'

Browse Source
This commit is contained in:
Thaddee Tyl 2015-06-11 10:55:37 +02:00
commit 012f3ff26c
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ass-stubs/server-test.js
View File

@ -1,5 +1,5 @@
// We don't require ass because we can't test a majority of the server reliably. // We don't require ass because we can't test a majority of the server reliably.
//require('ass'); //require('ass');
require('../server.js'); require('../server.js');
console.log('done'); console.log('ready');
process.on('SIGTERM', function() { process.exit(0); }); process.on('SIGTERM', function() { process.exit(0); });

2
package.json
View File

@ -23,7 +23,7 @@
"es6-promise": "~2.1.0", "es6-promise": "~2.1.0",
"request": "~2.55.0", "request": "~2.55.0",
"redis": "~0.12.1", "redis": "~0.12.1",
"camp": "~14.10.12", "camp": "~15.5.5",
"semver": "~4.3.3", "semver": "~4.3.3",
"bower": "~1.4.1", "bower": "~1.4.1",
"promise": "~7.0.0" "promise": "~7.0.0"

6
server.js
View File

@ -1,10 +1,12 @@
var serverPort = +process.env.PORT || +process.argv[2] || 80; var serverPort = +process.env.PORT || +process.argv[2] || 80;
var bindAddress = process.env.BIND_ADDRESS || process.argv[3] || '127.0.0.1';
var infoSite = process.env.INFOSITE || "http://shields.io"; var infoSite = process.env.INFOSITE || "http://shields.io";
var camp = require('camp').start({ var camp = require('camp').start({
documentRoot: __dirname, documentRoot: __dirname,
port: serverPort port: serverPort,
hostname: bindAddress
}); });
console.log('http://127.0.0.1:' + serverPort + '/try.html'); console.log('http://' + bindAddress + ':' + serverPort + '/try.html');
var https = require('https'); var https = require('https');
var domain = require('domain'); var domain = require('domain');
var request = require('request'); var request = require('request');

2
test.js
View File

@ -74,7 +74,7 @@ describe('the server', function() {
server = cproc.spawn('node', ['ass-stubs/server-test.js', port]); server = cproc.spawn('node', ['ass-stubs/server-test.js', port]);
var isDone = false; var isDone = false;
server.stdout.on('data', function(data) { server.stdout.on('data', function(data) {
if (!isDone) { done(); isDone = true; } if (data.toString().indexOf('ready') >= 0 && !isDone) { done(); isDone = true; }
}); });
server.stderr.on('data', function(data) { console.log(''+data); }); server.stderr.on('data', function(data) { console.log(''+data); });
}); });