minor code refactoring

Author: dhimil

bin/runner.js

@@ -2,13 +2,13 @@
 
 var BrowserStack = require('browserstack'),
     fs = require('fs'),
-    utils = require('../lib/utils');
-    Server = require('../lib/server').Server;
-    config = require('../lib/config');
-    Tunnel = require('../lib/local').Tunnel;
-    ConfigParser = require('../lib/configParser').ConfigParser;
-var serverPort = 8888;
-var tunnel;
+    utils = require('../lib/utils'),
+    Server = require('../lib/server').Server,
+    config = require('../lib/config'),
+    Tunnel = require('../lib/local').Tunnel,
+    ConfigParser = require('../lib/configParser').ConfigParser,
+    serverPort = 8888,
+    tunnel;
 
 var client = BrowserStack.createClient({
   username: config.username,

lib/configParser.js

@@ -7,6 +7,11 @@ var ConfigParser = {
 
   parse: function(client, browser_config, callback) {
     client.getBrowsers(function(error, browsers) {
+      if(error) {
+        console.log("Error getting browsers list from BrowserStack");
+        console.log(error);
+        process.exit(1);
+      }
       ConfigParser.bsBrowsers = browsers;
       for (var key in browser_config) {
         var entry = browser_config[key];
@@ -17,8 +22,8 @@ var ConfigParser = {
     return
   },
 
-  setBrowserVersion: function(browsers, browserObject, verStr) {
-    var filteredBrowsers = browsers.map(function(currentValue, index, array) {
+  setBrowserVersion: function(browserObject, verStr) {
+    var filteredBrowsers = ConfigParser.bsBrowsers.map(function(currentValue, index, array) {
       if (currentValue.browser == browserObject.browser) {
         return currentValue.browser_version; 
       }
@@ -35,12 +40,12 @@ var ConfigParser = {
     }
   },
 
-  populateOsAndOsVersion: function(browsers, browserObject) {
+  populateOsAndOsVersion: function(browserObject) {
     if (!(browserObject.os && browserObject.os_version)) {
-      var windowsFiltered = browsers.filter(function(currentValue, index, array) {
+      var windowsFiltered = ConfigParser.bsBrowsers.filter(function(currentValue, index, array) {
         return currentValue.os == 'Windows' && currentValue.browser == browserObject.browser && parseFloat(currentValue.browser_version).toPrecision(4) == parseFloat(browserObject.browser_version).toPrecision(4);
       });
-      var osxFiltered = browsers.filter(function(currentValue, index, array) {
+      var osxFiltered = ConfigParser.bsBrowsers.filter(function(currentValue, index, array) {
         return currentValue.os == 'OS X' && currentValue.browser == browserObject.browser && parseFloat(currentValue.browser_version).toPrecision(4) == parseFloat(browserObject.browser_version).toPrecision(4);
       });
       browserObject = windowsFiltered.length > 0 ? windowsFiltered[Math.floor(Math.random() * windowsFiltered.length)] : osxFiltered[Math.floor(Math.random() * osxFiltered.length)];
@@ -68,7 +73,7 @@ var ConfigParser = {
     } else {
       browserObject = entry;
     }
-    browserObject = ConfigParser.populateOsAndOsVersion(ConfigParser.bsBrowsers, browserObject);
+    browserObject = ConfigParser.populateOsAndOsVersion(browserObject);
     return browserObject;
   }
 };