Merge branch 'integration'

Readme.md

@@ -12,6 +12,7 @@ via npm:
 ## Authors
 
   - TJ Holowaychuk ([visionmedia](http://github.com/visionmedia))
+  - Adam Christian ([admc](http://github.com/admc))
 
 ## Running Examples
 

lib/soda/sauce.js

@@ -28,8 +28,22 @@ var Client = require('./client');
  */
 
 var SauceClient = exports = module.exports = function SauceClient(options) {
-  this.host = 'saucelabs.com';
-  this.port = 4444;
+  options = options || {};
+  this.host = process.env.SAUCE_HOST || 'saucelabs.com';
+  this.port = process.env.SAUCE_PORT || 4444;
+
+  // Check sauce env variables, and provide defaults
+  options.os = options.os || process.env.SAUCE_OS || 'Linux';
+  options.url = options.url || process.env.SAUCE_BROWSER_URL;
+  options.browser = options.browser || process.env.SAUCE_BROWSER || 'firefox';
+  options.username = options.username || process.env.SAUCE_USERNAME;
+  options['access-key'] = options['access-key'] || process.env.SAUCE_ACCESS_KEY;
+
+  // Allow users to specify an empty browser-version
+  options['browser-version'] = options['browser-version'] == undefined
+    ? (process.env.SAUCE_BROWSER_VERSION || '')
+    : (options['browser-version'] || '');
+
   this.url = options.url;
   this.username = options.username;
   this.accessKey = options['access-key'];