Merge pull request #25 from ekryski/discovery-refactoring

Finalize refactoring

README.md

@@ -34,7 +34,10 @@ Local launchers look up all currently installed browsers and allow you to start
 
     // Launch a local browser
     launch.local(function(err, local) {
-      local.browsers // -> List of all browsers found locally
+      launcher.browsers(function(error, browsers) {
+        // -> List of all browsers found locally with version
+      });
+      
       local.firefox('http://url', function(err, instance) {
         // An instance is an event emitter
         instance.on('stop', function() {
@@ -53,7 +56,10 @@ Launchpad allows you to start BrowserStack workers through its API like this:
         password : 'password'
       },
       function(err, browserstack) {
-        browserstack.browsers // -> List of all browsers
+        launcher.browsers(function(error, browsers) {
+          // -> List of all Browserstack browsers
+        });
+        
         browserstack.ie('http://url', function(err, instance) {
           // Shut the instance down after 5 seconds
           setTimeout(function() {
@@ -94,7 +100,10 @@ the given host:
       username : 'launcher',
       password : 'testing'
     }, function(err, api) {
-      api.browsers // -> List of browsers found on ie7machine
+      launcher.browsers(function(error, browsers) {
+        // -> List of all browsers found on ie7machine
+      });
+      
       api('http://github.com', {
         browser : 'safari',
         version : 'latest'

examples/local.js

@@ -3,7 +3,7 @@ var launch = require('../lib');
 launch.local(function(err, launcher) {
 	// User the launcher api
 	launcher('http://github.com/ekryski', {
-		browser : 'chrome'
+		browser: 'safari'
 	}, function(error, worker) {
 		if(error) {
 			console.log('Error:', error);

lib/local/browser.js

@@ -18,7 +18,9 @@ module.exports = function (browser) {
       }
 
       // Run the pathQuery to see if we can find it somewhere else
-      return Q.nfcall(exec, current.pathQuery).then(function (stdout) {
+      return Q.nfcall(exec, current.pathQuery, {
+        cwd: current.cwd || '.'
+      }).then(function (stdout) {
         var path = utils.getStdout(stdout);
 
         if (!path) {

lib/local/index.js

@@ -30,11 +30,11 @@ module.exports = function (settings, callback) {
 	}
 
   var api = function(url, options, callback) {
-    var name = options.name;
+    var name = options.browser;
 
     getBrowser(_.extend({ name: name }, platform[name])).then(function(browser) {
       if(browser === null) {
-        return Q.reject(new Error('Browser ' + options.name + ' not available.'));
+        return Q.reject(new Error('Browser ' + name + ' not available.'));
       }
 
       var args = browser.args || [];
@@ -63,7 +63,7 @@ module.exports = function (settings, callback) {
         options = {};
       }
 
-      options.name = name;
+      options.browser = name;
 
       return api(url, options, callback);
     }

lib/local/instance.js

@@ -1,11 +1,11 @@
+var path = require('path');
 var spawn = require("child_process").spawn;
 var exec = require("child_process").exec;
 var EventEmitter = require('events').EventEmitter;
 
 var getProcessId = function (name, callback) {
 
   var commands = {
-    win32: 'tasklist /fi "Windowtitle eq ' + name + '" /fi "STATUS eq running"', //Not sure if this is right. reference: http://technet.microsoft.com/en-us/library/bb491010.aspx
     darwin: "ps -clx | grep '" + name + "$' | awk '{print $2}' | head -1",
     linux: "ps -ax | grep '" + name + "$' | awk '{print $2}' | head -1",
     freebsd: "ps -clx | grep '" + name + "$' | awk '{print $2}' | head -1",
@@ -44,6 +44,8 @@ var Instance = function (cmd, args, settings, options) {
   this.stderr = childProcess.stderr;
   this.id = childProcess.pid;
   this.process = childProcess;
+  this.cmd = cmd;
+  this.args = args;
 };
 
 Instance.prototype = new EventEmitter();
@@ -66,16 +68,12 @@ Instance.prototype.stop = function (callback) {
 
   if (this.options.command === 'open') {
     exec('osascript -e \'tell application "' + self.options.process + '" to quit\'');
-  }
-  else if (process.platform === 'win32') {
-    this.getPid(function (err, pid) {
-      if (err) {
-        callback(err);
-      }
-      spawn('taskkill', ['/PID', pid]);
-    });
-  }
-  else {
+  } else if (process.platform === 'win32') {
+    exec('taskkill /IM ' + (this.options.imageName || path.basename(this.cmd)))
+      .once('exit', function(data) {
+        self.emit('stop', data);
+      });
+  } else {
     this.process.kill();
   }
 };
@@ -96,7 +94,9 @@ exports.start = function (cmd, args, settings, options, callback) {
     return new Instance(cmd, args, settings, options);
   };
 
-  if (options.process) {
+  // Check if the process is already running but only if it's a browser we
+  // can only launch once
+  if (options.process && !options.multi) {
     getProcessId(options.process, function (err, pid) {
       if (!err) {
         return callback(new Error(options.process + ' seems already running with process id ' + pid));

lib/local/platform/macos.js

@@ -58,6 +58,7 @@ module.exports = {
     pathQuery: 'which phantomjs',
     process: 'phantomjs',
     args: [path.join(__dirname, '..', '..', '..', 'resources/phantom.js')],
-    defaultLocation: '/usr/local/bin/phantomjs'
+    defaultLocation: '/usr/local/bin/phantomjs',
+    multi: true
   }
 }

lib/local/platform/unix.js

@@ -16,6 +16,7 @@ module.exports = {
   phantom: {
     pathQuery: 'which phantomjs',
     process: 'phantomjs',
-    args: [path.join(__dirname, '..', '..', '..', 'resources/phantom.js')]
+    args: [path.join(__dirname, '..', '..', '..', 'resources/phantom.js')],
+    multi: true
   }
 };

lib/local/platform/windows.js

@@ -1,6 +1,7 @@
 var os = require('os');
 var path = require('path');
 var programFiles = os.arch() === "x64" ? process.env["ProgramFiles(x86)"] : process.env.ProgramFiles;
+var cwd = path.dirname(programFiles);
 
 function getPath() {
   return path.join.apply(path, arguments);
@@ -9,28 +10,35 @@ function getPath() {
 module.exports = {
   chrome: {
     defaultLocation: getPath(process.env.LOCALAPPDATA, 'Google', 'Chrome', 'Application', 'chrome.exe') ,
-    pathQuery: 'dir /s /b chrome.exe'
+    pathQuery: 'dir /s /b chrome.exe',
+    cwd: cwd
   },
   canary: {
     defaultLocation: getPath(process.env.LOCALAPPDATA, 'Google', 'Chrome SxS', 'Application', 'chrome.exe')
   },
   firefox: {
     defaultLocation: getPath(programFiles, 'Mozilla Firefox', 'firefox.exe'),
-    pathQuery: 'dir /s /b firefox.exe'
+    pathQuery: 'dir /s /b firefox.exe',
+    cwd: cwd
   },
   aurora: {
     defaultLocation: getPath(programFiles, 'Aurora', 'firefox.exe')
   },
   opera: {
     defaultLocation: getPath(programFiles, 'Opera', 'launcher.exe'),
-    pathQuery: 'dir /s /b opera.exe'
+    pathQuery: 'dir /s /b opera.exe',
+    cwd: cwd,
+    imageName: 'opera.exe'
   },
   ie: {
     defaultLocation: getPath(programFiles, 'Internet Explorer', 'iexplore.exe'),
-    pathQuery: 'dir /s /b iexplore.exe'
+    pathQuery: 'dir /s /b iexplore.exe',
+    cwd: cwd
   },
   phantomjs: {
-    search: 'phantomjs.exe',
-    args: path.join(__dirname, '..', '..', '..', 'resources/phantom.js')
+    pathQuery: 'dir /s /b phantomjs.exe',
+    args: [path.join(__dirname, '..', '..', '..', 'resources/phantom.js')],
+    multi: true,
+    cwd: cwd
   }
 }

lib/remote/server.js

@@ -1,7 +1,6 @@
 var restify = require('restify');
 var _ = require('underscore');
 var EventEmitter = require('events').EventEmitter;
-var logger = require('winston');
 
 var localLauncher = require('../local');
 var pkg = require('../../package.json');

package.json

@@ -22,7 +22,7 @@
   ],
   "main": "lib/index.js",
   "engines": {
-    "node": "~0.8"
+    "node": "~0.10"
   },
   "scripts": {
     "test": "grunt test"
@@ -41,8 +41,7 @@
     "plist": "~0.4.0",
     "q": "^1.0.1",
     "restify": "~1.4.4",
-    "underscore": "~1.4.0",
-    "winston": "~0.6.2"
+    "underscore": "~1.4.0"
   },
   "keywords": [
     "browsers",