Bundle ChromeDriver into build, for Mac and Linux

docs/mobile-web.md

@@ -49,7 +49,7 @@ $ cd appium
 $ ./reset.sh --ios --real-safari
 
 # Option 2: You define the code signing identity and allow xcode to select the profile identity code (if it can).
-$ ./reset.sh --ios --real-safari --code-sign '<code signing idendity>' 
+$ ./reset.sh --ios --real-safari --code-sign '<code signing idendity>'
 
 # Option 3: You define both the code signing identity and profile identity code.
 $ ./reset.sh --ios --real-safari --code-sign '<code signing idendity>' --profile '<retrieved profile identity code>'
@@ -61,11 +61,11 @@ $ node /lib/server/main.js -U <UDID>
 #### Running your test
 To configure you test to run against safari simpley set the <b>"app"</b> to be <b>"safari"</b>.
 
-##### Java Example 
+##### Java Example
 ```java
 //setup the web driver and launch the webview app.
 DesiredCapabilities desiredCapabilities = new DesiredCapabilities();
-desiredCapabilities.setCapability("app", "safari");  
+desiredCapabilities.setCapability("app", "safari");
 URL url = new URL("http://127.0.0.1:4723/wd/hub");
 RemoteWebDriver remoteWebDriver = new RemoteWebDriver(url, desiredCapabilities);
 
@@ -84,7 +84,8 @@ remoteWebDriver.quit();
 Pre-requisites:
 
 *  Make sure Chrome (an app with the package `com.android.chrome`) is installed on your device or emulator. Getting Chrome for the x86 version of the emulator is not currently possible without building Chromium, so you may want to run an ARM emulator and then copy a Chrome APK from a real device to get Chrome on an emulator.
-*  Make sure [ChromeDriver](https://code.google.com/p/chromedriver/downloads/list), version &gt;= 2.0 is on your system and that the `chromedriver` binary is on your `$PATH`.
+*  For Windows, make sure [ChromeDriver](http://chromedriver.storage.googleapis.com/index.html), version &gt;= 2.0 is on your system and that the `chromedriver` binary is on your `$PATH`.
+*  For Mac, if downloaded from [NPM](https://www.npmjs.org/package/appium), or running from the [.app](https://github.com/appium/appium-dot-app), nothing needs to be done. If running from source, `reset.sh` will download ChromeDriver and put it in `build`. A particular version can be specified by passing the `--chromedriver-version` option (e.g., `./reset.sh --android --chromedriver-version 2.8`), otherwise the most recent one will be retrieved.
 
 Then, use desired capabilities like these to run your test in Chrome:
 

lib/devices/android/chrome.js

@@ -9,7 +9,8 @@ var Android = require('./android.js')
   , async = require('async')
   , through = require('through')
   , isWindows = require('../../helpers.js').isWindows()
-  , ADB = require('./adb.js');
+  , ADB = require('./adb.js')
+  , path = require('path');
 
 var ChromeAndroid = function (opts) {
   this.initialize(opts);
@@ -20,7 +21,7 @@ var ChromeAndroid = function (opts) {
   this.chromedriver = null;
   this.proc = null;
   this.chromedriverStarted = false;
-  this.chromedriver = "chromedriver";
+  this.chromedriver = path.resolve(__dirname, "..", "..", "..", "build", "chromedriver");
   this.adb = null;
   this.onDie = function () {};
   this.exitCb = null;
@@ -51,12 +52,16 @@ ChromeAndroid.prototype.unlock = function (cb) {
 
 ChromeAndroid.prototype.ensureChromedriverExists = function (cb) {
   logger.info("Ensuring Chromedriver exists");
-  var cmd = isWindows ? "where chromedriver.exe" : "which chromedriver";
-  exec(cmd, function (err, stdout) {
-    if (err) return cb(new Error("Could not find chromedriver, is it on PATH?"));
-    this.chromedriver = stdout.trim();
+  if (isWindows) {
+    exec("where chromedriver.exe", function (err, stdout) {
+      if (err) return cb(new Error("Could not find chromedriver, is it on PATH?"));
+      this.chromedriver = stdout.trim();
+      cb();
+    }.bind(this));
+  } else {
+    // use Appium's Chromedriver
     cb();
-  }.bind(this));
+  }
 };
 
 ChromeAndroid.prototype.killOldChromedrivers = function (cb) {

reset.sh

@@ -23,6 +23,7 @@ toggletest_reset=false
 hardcore=false
 grunt="$(npm bin)/grunt"  # might not have grunt-cli installed with -g
 verbose=false
+chromedriver_version=false
 
 while test $# != 0
 do
@@ -40,12 +41,14 @@ do
         "-v") verbose=true;;
         "--verbose") verbose=true;;
         "--hardcore") hardcore=true;;
+        "--chromedriver-version") chromedriver_version=$2;;
     esac
+
     if [[ -n "$2" ]] && [[ "$2" != --* ]]; then
-      shift
-      shift
+        shift
+        shift
     else
-      shift
+        shift
     fi
 done
 
@@ -69,6 +72,14 @@ run_cmd() {
     fi
 }
 
+run_cmd_output() {
+    if $verbose ; then
+        "$@"
+    else
+        "$@" 2> /dev/null
+    fi
+}
+
 reset_general() {
     echo "RESETTING NPM"
     set +e
@@ -307,6 +318,7 @@ reset_android() {
     fi
     echo "* Setting Android config to Appium's version"
     run_cmd "$grunt" setConfigVer:android
+    reset_chromedriver
 }
 
 require_java() {
@@ -370,6 +382,34 @@ reset_gappium() {
     fi
 }
 
+reset_chromedriver() {
+    echo "RESETTING CHROMEDRIVER"
+    if [ -f $appium_home/build/chromedriver ]; then
+        echo "* Clearing old program"
+        run_cmd rm $appium_home/build/chromedriver
+    fi
+    if [ "$chromedriver_version" == false ]; then
+        echo "* Finding latest version"
+        chromedriver_version=$(run_cmd_output curl -L http://chromedriver.storage.googleapis.com/LATEST_RELEASE)
+    fi
+    echo "* Determining platform"
+    platform=$(run_cmd_output uname -s)
+    if [ "$platform" == "Darwin" ]; then
+        platform="Mac"
+        chromedriver_file="chromedriver_mac32.zip"
+    else
+        platform="Linux"
+        chromedriver_file="chromedriver_linux32.zip"
+    fi
+    echo "* Downloading ChromeDriver version $chromedriver_version for $platform"
+    run_cmd curl -L http://chromedriver.storage.googleapis.com/$chromedriver_version/$chromedriver_file -o ./build/chromedriver.zip
+    run_cmd pushd ./build
+    echo "* Unzipping ChromeDriver"
+    run_cmd unzip chromedriver.zip
+    run_cmd rm chromedriver.zip
+    run_cmd popd
+}
+
 reset_firefoxos() {
     echo "RESETTING FIREFOXOS"
     echo "* Setting Firefox OS config to Appium's version"