sauce 1.0.1 → 1.0.2

data/README.markdown

@@ -25,7 +25,7 @@ configuration, which you can tweak inside the `Sauce.config` block if necessary.
 
 ### Example RSpec test for Rails
 
-Here's an example test for RSpec.  Drop something like this in spec/selenium/example.rb:
+Here's an example test for RSpec.  Drop something like this in spec/selenium/example.rb.  (Because of the way RSpec categorizes tests, the "spec/selenium" directory tree is required for the integration to work properly):
 
     require "spec_helper"
     
@@ -64,7 +64,7 @@ First, configure with your account info:
 
 `sauce config USERNAME ACCESS_KEY`
 
-And here's an example test:
+And here's an example test.  Drop something like this in spec/selenium/example.rb.  (Because of the way RSpec categorizes tests, the "spec/selenium" directory tree is required for the integration to work properly):
 
     #!/usr/bin/env ruby
     #

data/lib/sauce/capybara.rb

@@ -1,19 +1,23 @@
 require 'capybara'
+require 'uri'
+
+$uri = URI.parse Capybara.app_host || ""
 
 module Sauce
   module Capybara
-    class Driver < ::Capybara::Driver::Selenium
+    class Driver < ::Capybara::Selenium::Driver
       def browser
         unless @browser
           puts "[Connecting to Sauce OnDemand...]"
           config = Sauce::Config.new
           @domain = "#{rand(10000)}.test"
-          @sauce_tunnel = Sauce::Connect.new(:host => "127.0.0.1",
-                                             :port => rack_server.port,
+          @sauce_tunnel = Sauce::Connect.new(:host => $uri.host || rack_server.host,
+                                             :port => $uri.port || rack_server.port,
                                              :domain => @domain,
                                              :quiet => true)
           @sauce_tunnel.wait_until_ready
-          @browser = Sauce::Selenium2.new(:name => "Capybara", :browser_url => "http://#{@domain}")
+          @browser = Sauce::Selenium2.new(:name => "Capybara test",
+                                          :browser_url => "http://#{@domain}")
           at_exit do
             @browser.quit
             @sauce_tunnel.disconnect

data/lib/sauce/config.rb

@@ -81,8 +81,9 @@ module Sauce
         'name' => @opts[:name] || @opts[:job_name]}
 
       SAUCE_OPTIONS.each do |opt|
-        opt = opt.to_sym
-        browser_options[opt] = @opts[opt] if @opts.include? opt
+        [opt, opt.gsub("-", "_")].map(&:to_sym).each do |sym|
+          browser_options[opt] = @opts[sym] if @opts.include? sym
+        end
       end
       return browser_options.to_json
     end

data/lib/sauce/raketasks.rb

@@ -72,31 +72,33 @@ if defined?(RSpec::Core::RakeTask)
   end
 end
 
-namespace :test do
-  namespace :selenium do
-    desc "Run the Selenium acceptance tests in test/selenium using Sauce OnDemand"
-    task :sauce do
-      Rake::Task["test:selenium:runtests"].invoke
-    end
-
-    desc "Run the Selenium acceptance tests in spec/selenium using a local Selenium server"
-    task :local do
-      with_selenium_rc do
+if defined?(Rake::TestTask)
+  namespace :test do
+    namespace :selenium do
+      desc "Run the Selenium acceptance tests in test/selenium using Sauce OnDemand"
+      task :sauce do
         Rake::Task["test:selenium:runtests"].invoke
       end
-    end
 
-    Rake::TestTask.new(:runtests) do |t|
-      t.libs << "test"
-      test_glob = ENV["SAUCE_TEST_GLOB"] || "test/selenium/**/*_test.rb"
-      t.pattern = test_glob
-      t.verbose = true
+      desc "Run the Selenium acceptance tests in spec/selenium using a local Selenium server"
+      task :local do
+        with_selenium_rc do
+          Rake::Task["test:selenium:runtests"].invoke
+        end
+      end
+
+      Rake::TestTask.new(:runtests) do |t|
+        t.libs << "test"
+        test_glob = ENV["SAUCE_TEST_GLOB"] || "test/selenium/**/*_test.rb"
+        t.pattern = test_glob
+        t.verbose = true
+      end
+      # Hide it from rake -T
+      Rake::Task['test:selenium:runtests'].instance_variable_set(:@full_comment, nil)
+      Rake::Task['test:selenium:runtests'].instance_variable_set(:@comment, nil)
+      Rake::Task['test:selenium:runtests'].enhance(["db:test:prepare"])
     end
-    # Hide it from rake -T
-    Rake::Task['test:selenium:runtests'].instance_variable_set(:@full_comment, nil)
-    Rake::Task['test:selenium:runtests'].instance_variable_set(:@comment, nil)
-    Rake::Task['test:selenium:runtests'].enhance(["db:test:prepare"])
-  end
 
-  task :selenium => "selenium:sauce"
+    task :selenium => "selenium:sauce"
+  end
 end

data/sauce.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sauce}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Eric Allen", "Sean Grove", "Steven Hazel"]
-  s.date = %q{2011-04-11}
+  s.authors = ["Eric Allen", "Sean Grove", "Steven Hazel", "Santiago Suarez Ordoñez"]
+  s.date = %q{2011-07-25}
   s.default_executable = %q{sauce}
   s.description = %q{A Ruby interface to Sauce OnDemand.}
   s.email = %q{help@saucelabs.com}

data/test/test_config.rb

@@ -29,6 +29,20 @@ class TestConfig < Test::Unit::TestCase
     assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
   end
 
+  def test_generates_optional_parameters
+    # dashes need to work for backward compatibility
+    config = Sauce::Config.new(:username => "test_user", :access_key => "test_access",
+                               :os => "Linux", :browser => "firefox", :browser_version => "3.",
+                               :"user-extensions-url" => "testing")
+    assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"user-extensions-url\":\"testing\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
+
+    # underscores are more natural
+    config = Sauce::Config.new(:username => "test_user", :access_key => "test_access",
+                               :os => "Linux", :browser => "firefox", :browser_version => "3.",
+                               :user_extensions_url => "testing")
+    assert_equal "{\"name\":\"Unnamed Ruby job\",\"access-key\":\"test_access\",\"user-extensions-url\":\"testing\",\"os\":\"Linux\",\"username\":\"test_user\",\"browser-version\":\"3.\",\"browser\":\"firefox\"}", config.to_browser_string
+  end
+
   def test_convenience_accessors
     config = Sauce::Config.new
     assert_equal "ondemand.saucelabs.com", config.host

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification 
 name: sauce
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Eric Allen
 - Sean Grove
 - Steven Hazel
+- "Santiago Suarez Ordo\xC3\xB1ez"
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 -07:00
+date: 2011-07-25 00:00:00 -03:00
 default_executable: sauce
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,9 +33,9 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
+  name: rest-client
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: net-ssh
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,9 +47,9 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
+  name: net-ssh
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: net-ssh-gateway
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -61,9 +61,9 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
+  name: net-ssh-gateway
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: selenium-webdriver
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,9 +77,9 @@ dependencies:
         - 4
         version: 0.1.4
   type: :runtime
+  name: selenium-webdriver
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: childprocess
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -93,9 +93,9 @@ dependencies:
         - 6
         version: 0.1.6
   type: :runtime
+  name: childprocess
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -109,9 +109,9 @@ dependencies:
         - 0
         version: 1.2.0
   type: :runtime
+  name: json
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: cmdparse
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -125,9 +125,9 @@ dependencies:
         - 2
         version: 2.0.2
   type: :runtime
+  name: cmdparse
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: highline
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -141,6 +141,7 @@ dependencies:
         - 0
         version: 1.5.0
   type: :runtime
+  name: highline
   version_requirements: *id008
 description: A Ruby interface to Sauce OnDemand.
 email: help@saucelabs.com
@@ -221,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby access to Sauce Labs' features