Merge pull request mllrsohn#29 from rogierschouten/requireresolve

Use require.resolve() instead of manual search for protractor .bin dir

Author: steffenmllr

index.js

@@ -6,31 +6,19 @@ var async = require('async');
 var PluginError = require('gulp-util').PluginError;
 var winExt = /^win/.test(process.platform)?".cmd":"";
 
-
 // optimization: cache for protractor binaries directory
 var protractorDir = null;
 
 function getProtractorDir() {
 	if (protractorDir) {
 		return protractorDir;
 	}
-	
-	// how deep are we wrt filesystem root?
-	var cwd = path.resolve(".");
-	var depth = /^win/.test(process.platform) ? cwd.match(/\\/g).length :  cwd.match(/\//g).length;
-	depth = depth - 1;
-	
-	var result = __dirname + "/node_modules";
-	var count = 0;
-	while (count <= depth)
-	{
-		if (fs.existsSync(path.resolve(result + "/.bin/protractor")))
-		{
-			protractorDir = result + "/.bin";
-			return path.normalize(protractorDir);
-		}
-		result = "../" + result;
-		count++;
+	var result = require.resolve("protractor");
+	if (result) {
+		// result is now something like 
+		// c:\\Source\\gulp-protractor\\node_modules\\protractor\\lib\\protractor.js
+		protractorDir = path.resolve(path.join(path.dirname(result), "..", "..", ".bin"));
+		return protractorDir;
 	}
 	throw new Error("No protractor installation found.");	
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "gulp-protractor",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "A helper for protactor and gulp",
   "keywords": [
     "gulpfriendly",