made express port configurable

jtescher · Feb 21, 2011 · 0473616 · 0473616
1 parent 9b0a421
commit 0473616
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/npm/lib/brunch.js b/npm/lib/brunch.js
diff --git a/npm/lib/command.js b/npm/lib/command.js
@@ -34,6 +34,7 @@
     }
     options.templateExtension = "eco";
     options.projectTemplate = "express";
+    options.expressPort = "8080";
     options = exports.loadOptionsFromArguments(opts, options);
     command = opts[0];
     if (command === "new") {
@@ -56,6 +57,9 @@
     if (opts.projectTemplate) {
       options.projectTemplate = opts.projectTemplate;
     }
+    if (opts.expressPort) {
+      options.projectTemplate = opts.expressPort;
+    }
     return options;
   };
   parseOptions = function() {

diff --git a/npm/src/brunch.coffee b/npm/src/brunch.coffee
@@ -41,7 +41,7 @@ exports.watch  = (options) ->
 
   # run node server if projectTemplate is express
   if(exports.options.projectTemplate is "express")
-    executeServer = spawn 'node', ['brunch/server/main.js']
+    executeServer = spawn 'node', ['brunch/server/main.js', exports.options.expressPort]
 
   # let's watch
   helpers.watchDirectory(path: 'brunch', callOnAdd: true, (file) ->

diff --git a/npm/src/command.coffee b/npm/src/command.coffee
@@ -43,6 +43,7 @@ exports.run = ->
   return version() if opts.version
   options.templateExtension = "eco"
   options.projectTemplate = "express"
+  options.expressPort = "8080"
   options = exports.loadOptionsFromArguments opts, options
   command = opts[0]
   if command is "new"
@@ -60,6 +61,7 @@ exports.run = ->
 exports.loadOptionsFromArguments = (opts, options) ->
   options.templateExtension = opts.templateExtension if opts.templateExtension
   options.projectTemplate = opts.projectTemplate if opts.projectTemplate
+  options.projectTemplate = opts.expressPort if opts.expressPort
   options
 
 # Run nomnom to parse the arguments

diff --git a/npm/template/express/server/main.js b/npm/template/express/server/main.js
@@ -1,3 +1,6 @@
+var util = require('util');
+var port = process.argv[2];
+
 var express = require("express");
 var app = express.createServer();
 
@@ -10,5 +13,5 @@ app.get('/', function(req, res){
   res.render('index');
 });
 
-console.log("starting server on port 8080");
-app.listen(8080);
+console.log("starting server on port " + port);
+app.listen(parseInt(port, 10));