Merge pull request #5 from w33ble/server-config

Server config

src/server/lib/appHeaders.js

@@ -1,11 +1,6 @@
-var path = require('path');
-var pkgPath = path.resolve(__dirname, '..', '..', '..', 'package.json');
-var pkg = require(pkgPath);
-
 module.exports = function () {
   return function (req, res, next) {
     res.header('X-App-Name', 'kibana');
-    res.header('X-App-Version', pkg.version);
     next();
   };
 };

tasks/config/mocha.js

@@ -1,3 +1,6 @@
+var config = require('../utils/server-config');
+var unitTestUrl = require('util').format('http://localhost:%d/test/unit/', config.kibana.port);
+
 module.exports = {
   options: {
     log: true,
@@ -6,9 +9,7 @@ module.exports = {
   },
   unit: {
     options: {
-      urls: [
-        'http://localhost:5601/test/unit/'
-      ]
+      urls: [ unitTestUrl ]
     }
   }
 };

tasks/config/run.js

@@ -1,7 +1,4 @@
 module.exports = function (grunt) {
-  var jrubyPath = grunt.config.get('jrubyPath');
-  var jruby = jrubyPath + '/bin/jruby';
-  var cmd =  grunt.config.get('src') + '/server/bin/initialize';
   var os = require('os');
   var arch = os.arch();
   var platform = os.platform();
@@ -22,16 +19,6 @@ module.exports = function (grunt) {
   var args = ['-H', '127.0.0.1'];
 
   var config = {
-    mri_server: {
-      options: options,
-      cmd: cmd,
-      args: args
-    },
-    jruby_server: {
-      options: options,
-      cmd: jruby,
-      args: [cmd].concat(args)
-    },
     built_kibana: {
       options: {
         wait: false,

tasks/config/saucelabs-mocha.js

@@ -1,3 +1,5 @@
+var config = require('../utils/server-config');
+var unitTestUrl = require('util').format('http://localhost:%d/test/unit/?saucelabs=true', config.kibana.port);
 var buildId = 'test build';
 if (process.env.TRAVIS_BUILD_ID) {
   buildId = 'travis build #' + process.env.TRAVIS_BUILD_ID;
@@ -8,7 +10,7 @@ module.exports = {
     options: {
       username: 'kibana',
       key: process.env.SAUCE_ACCESS_KEY,
-      urls: ['http://localhost:8000/test/unit/?saucelabs=true'],
+      urls: [ unitTestUrl ],
       testname: 'Kibana Browser Tests',
       build: buildId,
       concurrency: 10,

tasks/maybe_start_kibana.js

@@ -1,5 +1,5 @@
 module.exports = function (grunt) {
-  var config = require('../src/server/config');
+  var config = require('./utils/server-config');
 
   var maybeStartServer = function (options) {
     return function () {

tasks/run_build.js

@@ -1,4 +1,6 @@
 var os = require('os');
+var config = require('./utils/server-config');
+
 module.exports = function (grunt) {
   grunt.registerTask('run_build', [
     'build',
@@ -25,6 +27,6 @@ module.exports = function (grunt) {
   });
 
   grunt.registerTask('_open_built_kibana', function () {
-    require('opn')('http://localhost:5601');
+    require('opn')('http://localhost:' + config.kibana.port);
   });
 };

tasks/utils/server-config.js

@@ -0,0 +1 @@
+module.exports = require('../../src/server/config');