Merge remote-tracking branch 'origin/proxy_support' into testing

Author: nakula

README.md

@@ -137,6 +137,18 @@ Identifier for the current instance of the tunnel process. In `TRAVIS` setup `TR
 * `BROWSERSTACK_JSON`:
 Path to the browserstack.json file. If null, `browserstack.json` in the root directory will be used.
 
+### Proxy support for BrowserStack local
+Add the following in `browserstack.json`
+```json
+...
+"proxy": {
+    "host": "localhost",
+    "port": 3128,
+    "username": "foo",
+    "password": "bar"
+}
+...
+```
 
 ### Secure Information
 

lib/local.js

@@ -19,6 +19,7 @@ var Tunnel = function Tunnel(key, port, uniqueIdentifier, callback, err) {
     tunnelCommand += port.toString() + ',';
     tunnelCommand += '0';
     tunnelCommand += (typeof uniqueIdentifier === 'undefined') ? ' -force -onlyAutomate' : ' -tunnelIdentifier ' + uniqueIdentifier;
+    tunnelCommand += checkAndAddProxy();
 
     if (typeof callback !== 'function') {
       callback = function(){};
@@ -62,6 +63,21 @@ var Tunnel = function Tunnel(key, port, uniqueIdentifier, callback, err) {
     that.process = subProcess;
   }
 
+  function checkAndAddProxy() {
+    var proxy = config.proxy;
+    if(typeof proxy == 'undefined') {
+      return "";
+    }
+    var proxyCommand = "";
+    proxyCommand += " -proxyHost " + proxy.host;
+    proxyCommand += " -proxyPort " + proxy.port;
+    if(typeof proxy.username !== 'undefined'){
+      proxyCommand += " -proxyUser " + proxy.username;
+      proxyCommand += " -proxyPass " + proxy.password;
+    }
+    return proxyCommand;
+  }
+
   fs.exists(localBinary, function(exists) {
     if (exists) {
       tunnelLauncher();