chore(build): use config.json for server settings

adam77 · Jan 12, 2015 · 8199339 · 8199339
1 parent 49a28ff
commit 8199339
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/config.json b/config.json
@@ -11,5 +11,9 @@
     "typeAssertionModule": "assert",
     "annotations": true,
     "sourceMaps": true
+  },
+  "server": {
+    "host": "0.0.0.0",
+    "port": 8000
   }
 }
diff --git a/gulpfile.js b/gulpfile.js
@@ -7,9 +7,10 @@ var rename = require('gulp-rename');
 
 var modulate = require('./scripts/angular-modulate');
 
-
-var TRACEUR_OPTIONS = require('./config').traceur;
-var BUILD_DIR = require('./config').build.dir;
+var CONFIG = require('./config');
+var SERVER_CONFIG = CONFIG.server;
+var TRACEUR_OPTIONS = CONFIG.traceur;
+var BUILD_DIR = CONFIG.build.dir;
 var PATH = {
   SRC: './src/**/*.ats'
 };
@@ -46,8 +47,9 @@ gulp.task('watch', function() {
 // WEB SERVER
 gulp.task('serve', function() {
   connect.server({
+    host: SERVER_CONFIG.host,
     root: [__dirname],
-    port: 8000,
+    port: SERVER_CONFIG.port,
     livereload: false
   });
 });

diff --git a/protractor.conf.js b/protractor.conf.js
@@ -1,3 +1,5 @@
+var SERVER_CONFIG = require('./config').server;
+
 exports.config = {
   allScriptsTimeout: 11000,
 
@@ -9,7 +11,7 @@ exports.config = {
     'browserName': 'chrome'
   },
 
-  baseUrl: 'http://localhost:8000/',
+  baseUrl: 'http://' + SERVER_CONFIG.host + ':' + SERVER_CONFIG.port + '/',
 
   framework: 'jasmine',