sauce 0.15.1 → 0.16.1

data/README.markdown

@@ -164,6 +164,31 @@ Note on Patches/Pull Requests
 *   Commit, do not mess with rakefile, version, or history. (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 *   Send me a pull request. Bonus points for topic branches.
 
+Testing the Gem
+---------------
+
+The tests in test/ need a bit of setup to get running:
+
+if you're on Ubuntu:
+
+* sudo aptitude install expect libsqlite3-dev
+
+For all platforms:
+
+* Install RVM: bash < <( curl http://rvm.beginrescueend.com/releases/rvm-install-head )
+* If you're in a headless environment, set SAUCE_TEST_NO_LOCAL=y in your environment
+* Set SAUCE_USERNAME and SAUCE_ACCESS_KEY in your environment to valid Sauce OnDemand credentials
+* bundle install
+* rake test
+
+If you want tests to go a bit faster, globally install the gems with native extensions:
+
+* rvm use 1.8.7@global
+* gem install ffi sqlite3 json
+* rvm use 1.9.2@global
+* gem install ffi sqlite3 json
+* rvm use default
+
 Plans
 -----
 

data/lib/sauce/config.rb

@@ -30,6 +30,15 @@ module Sauce
         SAUCE_ACCESS_KEY SAUCE_OS SAUCE_BROWSER SAUCE_BROWSER_VERSION SAUCE_JOB_NAME
         SAUCE_FIREFOX_PROFILE_URL SAUCE_USER_EXTENSIONS_URL}
 
+    PLATFORMS = {
+      "Windows 2003" => "WINDOWS",
+      "Linux" => "LINUX"
+    }
+
+    BROWSERS = {
+      "iexplore" => "internet explorer"
+    }
+
     def initialize(opts={})
       @opts = {}
       if opts != false
@@ -57,18 +66,51 @@ module Sauce
       browser_options = {
         'username' => @opts[:username],
         'access-key' => @opts[:access_key],
-        'os' => @opts[:os],
-        'browser' => @opts[:browser],
-        'browser-version' => @opts[:browser_version],
+        'os' => os,
+        'browser' => browser,
+        'browser-version' => browser_version,
         'name' => @opts[:job_name]}
       return browser_options.to_json
     end
 
+    def to_desired_capabilities
+      {
+        :browserName => BROWSERS[browser] || browser,
+        :browserVersion => browser_version,
+        :platform => PLATFORMS[os] || os,
+        :name => @opts[:job_name]
+      }.update(@opts.reject {|k, v| [:browser, :browser_version, :os, :job_name].include? k})
+    end
+
     def browsers
       return @opts[:browsers] if @opts.include? :browsers
       return [[os, browser, browser_version]]
     end
 
+    def browser
+      if @opts[:browsers]
+        @opts[:browsers][0][1]
+      else
+        @opts[:browser]
+      end
+    end
+
+    def os
+      if @opts[:browsers]
+        @opts[:browsers][0][0]
+      else
+        @opts[:os]
+      end
+    end
+
+    def browser_version
+      if @opts[:browsers]
+        @opts[:browsers][0][2]
+      else
+        @opts[:browser_version]
+      end
+    end
+
     def domain
       return @opts[:domain] if @opts.include? :domain
       return URI.parse(@opts[:browser_url]).host

data/lib/sauce/selenium.rb

@@ -1,4 +1,5 @@
 require "selenium/client"
+require "selenium/webdriver"
 
 module Sauce
   class Selenium < Selenium::Client::Driver
@@ -8,4 +9,19 @@ module Sauce
            :browser => @config.to_browser_string, :url => @config.browser_url}))
     end
   end
+
+  class Selenium2
+    def initialize(opts={})
+      @config = Sauce::Config.new(opts)
+      @driver = ::Selenium::WebDriver.for(:remote, :url => "http://#{@config.username}:#{@config.access_key}@#{@config.host}:#{@config.port}/wd/hub", :desired_capabilities => @config.to_desired_capabilities)
+    end
+
+    def method_missing(meth, *args)
+      @driver.send(meth, *args)
+    end
+
+    def stop
+      @driver.quit
+    end
+  end
 end

data/sauce.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sauce}
-  s.version = "0.15.1"
+  s.version = "0.16.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Grove", "Eric Allen", "Steven Hazel"]
-  s.date = %q{2011-01-31}
+  s.date = %q{2011-02-04}
   s.default_executable = %q{sauce}
   s.description = %q{A Ruby interface to Sauce Labs' services. Start/stop tunnels, retrieve Selenium logs, access video replays, etc.}
   s.email = %q{help@saucelabs.com}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  hash: 33
+  hash: 93
   prerelease: 
   segments: 
   - 0
-  - 15
+  - 16
   - 1
-  version: 0.15.1
+  version: 0.16.1
 platform: ruby
 authors: 
 - Sean Grove
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 -08:00
+date: 2011-02-04 00:00:00 -08:00
 default_executable: sauce
 dependencies: 
 - !ruby/object:Gem::Dependency