added some comments, little bit of syntax cleanup

This commit is contained in:
Joe Fleming 2014-09-16 11:19:36 -07:00
parent 420694789c
commit 962119b51a
3 changed files with 12 additions and 3 deletions

View file

@ -1,5 +1,4 @@
module.exports = function (grunt) {
// set the config once before calling load-grunt-config
// and once durring so that we have access to it via
// grunt.config.get() within the config files

View file

@ -2,12 +2,15 @@ var request = require('request');
module.exports = function (grunt) {
grunt.registerTask('ruby_server', function () {
var done = this.async();
request.get('http://localhost:5601/config', function (err, resp, body) {
request.get('http://localhost:5601/config', function (err, resp, body) {
// err is a failed response, no server is running
if (err) {
// run mri_server by default
var tasks = ['run:mri_server'];
grunt.config.set('ruby_server', 'mri_server');
// if jruby flag is set, use jruby
if (grunt.option('use-jruby')) {
tasks = [
'download_jruby',
@ -17,7 +20,10 @@ module.exports = function (grunt) {
];
grunt.config.set('ruby_server', 'jruby_server');
}
grunt.task.run(tasks);
// response means server is already running
} else {
grunt.log.error('Another ruby server is running on localhost:5601.');
}

View file

@ -3,9 +3,13 @@ module.exports = function (grunt) {
var done = this.async();
var DevServer = require('../test/utils/dev_server');
var server = new DevServer();
server.listen(8000).then(function () {
console.log('visit http://localhost:8000');
if (keepalive !== 'keepalive') done();
if (keepalive !== 'keepalive') {
done();
}
});
});
};