Merge remote-tracking branch 'origin/master' into bug_fixes

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
 

bin/cli.js

@@ -19,13 +19,16 @@ var Log = require('../lib/logger'),
     utils = require('../lib/utils'),
     Server = require('../lib/server').Server,
     Tunnel = require('../lib/local').Tunnel,
+    tunnel = require('tunnel'),
+    http = require('http'),
     ConfigParser = require('../lib/configParser').ConfigParser,
     serverPort = 8888,
     timeout,
     activityTimeout,
     workers = {},
     workerKeys = {},
     logLevel,
+    tunnelingAgent,
     tunnel;
 
 function terminateAllWorkers(callback) {
@@ -253,6 +256,16 @@ var statusPoller = {
 };
 
 function runTests() {
+  if (config.proxy) {
+    tunnelingAgent = tunnel.httpOverHttp({
+      proxy: config.proxy
+    });
+    var oldhttpreq = http.request;
+    http.request = function (options, callback) {
+      options.agent = tunnelingAgent;
+      return oldhttpreq.call(null, options, callback);
+    };
+  }
   if (config.browsers && config.browsers.length > 0) {
     ConfigParser.parse(client, config.browsers, function(browsers){
       launchServer();

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();

package.json

@@ -1,15 +1,16 @@
 {
   "name": "browserstack-runner",
   "description": "A command line interface to run browser tests over BrowserStack",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "homepage": "https://github.com/browserstack/browserstack-runner",
   "repository": {
     "type": "git",
     "url": "https://github.com/browserstack/browserstack-runner.git"
   },
   "dependencies": {
     "browserstack": "1.0.1",
-    "chalk": "0.4.0"
+    "chalk": "0.4.0",
+    "tunnel": "0.0.3"
   },
   "licenses": [
     {