Merge pull request #5 from browserstack/update_paths

Update paths

Author: tr4n2uil

.eslintrc.json

@@ -8,10 +8,6 @@
       2,
       "single"
     ],
-    "linebreak-style": [
-      2,
-      "unix"
-    ],
     "semi": [
       2,
       "always"

lib/Local.js

@@ -12,7 +12,7 @@ function Local(){
   this.logfile = path.join(process.cwd(), 'local.log');
   this.exitCallback;
 
-  this.errorRegex = /\*\*\* Error: [^\n]+/i;
+  this.errorRegex = /\*\*\* Error: [^\r\n]*/i;
   this.doneRegex = /Press Ctrl-C to exit/i;
 
   this.start = function(options, callback){
@@ -46,7 +46,6 @@ function Local(){
         bytesRead += bytes;
 
         var data = buffRead.toString();
-        //console.log(data);
 
         if(data.match(that.errorRegex)){
           fs.closeSync(that.stdout);

lib/LocalBinary.js

@@ -9,22 +9,23 @@ function LocalBinary(){
   this.is64bits = process.arch == 'x64';
 
   if(this.hostOS.match(/darwin|mac os/i)){
-    this.httpPath = 'https://s3.amazonaws.com/bs-automate-prod/local/BrowserStackLocal-darwin-x64';
-  } else if(this.hostOS.match(/mswin|msys|mingw|cygwin|bccwin|wince|emc/i)) {
+    this.httpPath = 'https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-darwin-x64';
+  } else if(this.hostOS.match(/mswin|msys|mingw|cygwin|bccwin|wince|emc|win32/i)) {
     this.windows = true;
-    this.httpPath = 'https://s3.amazonaws.com/bs-automate-prod/local/BrowserStackLocal-win32.exe';
+    this.httpPath = 'https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal.exe';
   } else {
     if(this.is64bits)
-      this.httpPath = 'https://s3.amazonaws.com/bs-automate-prod/local/BrowserStackLocal-linux-x64';
+      this.httpPath = 'https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-linux-x64';
     else
-      this.httpPath = 'https://s3.amazonaws.com/bs-automate-prod/local/BrowserStackLocal-linux-ia32';
+      this.httpPath = 'https://s3.amazonaws.com/browserStack/browserstack-local/BrowserStackLocal-linux-ia32';
   }
 
   this.download = function(destParentDir, callback){
     if(!this.checkPath(destParentDir))
       fs.mkdirSync(destParentDir);
 
-    var binaryPath = path.join(destParentDir, 'BrowserStackLocal');
+    var destBinaryName = (this.windows) ? 'BrowserStackLocal.exe' : 'BrowserStackLocal';
+    var binaryPath = path.join(destParentDir, destBinaryName);
     var file = fs.createWriteStream(binaryPath);
 
     https.get(this.httpPath, function (response) {
@@ -39,7 +40,8 @@ function LocalBinary(){
 
   this.binaryPath = function(callback){
     var destParentDir = this.getAvailableDirs();
-    var binaryPath = path.join(destParentDir, 'BrowserStackLocal');
+    var destBinaryName = (this.windows) ? 'BrowserStackLocal.exe' : 'BrowserStackLocal';
+    var binaryPath = path.join(destParentDir, destBinaryName);
     if(this.checkPath(binaryPath, fs.X_OK)){
       callback(binaryPath);
     } else {

package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "pretest": "./node_modules/.bin/eslint lib/* index.js",
-    "test": "NODE_ENV=testing ./node_modules/.bin/mocha"
+    "test": "./node_modules/.bin/mocha"
   },
   "keywords": [
     "BrowserStack",

test/local.js

@@ -1,5 +1,7 @@
 var expect = require('expect.js'),
     mocks = require('mocks'),
+    path = require('path'),
+    fs = require('fs'),
     browserstack = require('../index');
 
 describe('Local', function () {
@@ -29,11 +31,13 @@ describe('Local', function () {
     this.timeout(60000);
     bsLocal.start({ key: process.env.BROWSERSTACK_ACCESS_KEY }, function(){
       bsLocal_2 = new browserstack.Local();
+      var tempLogPath = path.join(process.cwd(), 'log2.log');
       try{
-        bsLocal_2.start({ key: process.env.BROWSERSTACK_ACCESS_KEY }, function(){});  
+        bsLocal_2.start({ key: process.env.BROWSERSTACK_ACCESS_KEY, logfile: tempLogPath }, function(){});
       }
       catch(err){
         expect(err.toString().trim()).to.equal('LocalError: *** Error: Either another browserstack local client is running on your machine or some server is listening on port 45691');
+        fs.unlinkSync(tempLogPath);
         done();
       }
     });
@@ -114,6 +118,7 @@ describe('Local', function () {
   });
 
   afterEach(function (done) {
+    this.timeout(60000);
     bsLocal.stop(done);
   });