From 19735884c02eb5714c1c4cc78aaa1c6b7de131c2 Mon Sep 17 00:00:00 2001
From: Iuri Matias <iuri.matias@gmail.com>
Date: Tue, 25 Oct 2016 19:33:24 -0400
Subject: [PATCH] add support for -p option in embark run to specify web server
 port

---
 lib/cmd.js      | 3 ++-
 lib/index.js    | 8 +++++---
 lib/services.js | 3 ++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/cmd.js b/lib/cmd.js
index 5d7499023..5d99ed2c7 100644
--- a/lib/cmd.js
+++ b/lib/cmd.js
@@ -62,12 +62,13 @@ Cmd.prototype.run = function() {
   var self = this;
   program
   .command('run [environment]')
+  .option('-p, --port [port]', 'port to run the dev webserver')
   .description('run dapp (default: development)')
   .action(function(env, options) {
     self.Embark.initConfig(env || 'development', {
         embarkConfig: 'embark.json'
     });
-    self.Embark.run(env || 'development');
+    self.Embark.run({env: env || 'development', serverPort: options.port});
   });
 };
 
diff --git a/lib/index.js b/lib/index.js
index 7e404e59e..dddc6554e 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -86,8 +86,9 @@ var Embark = {
     });
   },
 
-  run: function(env) {
+  run: function(options) {
     var self = this;
+    var env = options.env;
     async.waterfall([
       function startConsole(callback) {
         Embark.console = new Console();
@@ -105,7 +106,8 @@ var Embark = {
       function monitorServices(callback) {
         Embark.servicesMonitor = new ServicesMonitor({
           logger: Embark.logger,
-          config: Embark.config
+          config: Embark.config,
+          serverPort: options.serverPort
         });
         Embark.servicesMonitor.startMonitor();
         callback();
@@ -139,7 +141,7 @@ var Embark = {
       },
       function startAssetServer(callback) {
         Embark.monitor.setStatus("Starting Server");
-        var server = new Server({logger: self.logger});
+        var server = new Server({logger: self.logger, port: options.serverPort});
         server.start(callback);
       },
       function watchFilesForChanges(callback) {
diff --git a/lib/services.js b/lib/services.js
index 48f5bf3cf..ccd8ac88c 100644
--- a/lib/services.js
+++ b/lib/services.js
@@ -6,6 +6,7 @@ var ServicesMonitor = function(options) {
   this.logger = options.logger;
   this.interval = options.interval || 5000;
   this.config = options.config;
+  this.serverPort = options.serverPort || 8000;
 };
 
 ServicesMonitor.prototype.startMonitor = function() {
@@ -63,7 +64,7 @@ ServicesMonitor.prototype.check = function() {
     },
     function checkDevServer(result, callback) {
       self.logger.trace('checkDevServer');
-      result.push('dev server (http://localhost:8000)'.green);
+      result.push(('dev server (http://localhost:' + self.serverPort + ')').green);
       callback(null, result);
     }
   ], function(err, result) {