sauce 0.17.6 → 0.17.7

data/generators/sauce/sauce_generator.rb

@@ -39,7 +39,7 @@ require 'sauce'
 Sauce.config do |conf|
     conf.browser_url = "http://#{rand(100000)}.test/"
     conf.browsers = [
-        ["Windows 2003", "firefox", "3."]
+        ["Windows 2003", "firefox", "3.6."]
     ]
     conf.application_host = "127.0.0.1"
     conf.application_port = "3001"

data/lib/generators/sauce/install/install_generator.rb

@@ -37,16 +37,17 @@ module Sauce
       def generate_config
         @random_id ||= rand(100000)
         return <<-CONFIG
-    require 'sauce'
-
-    Sauce.config do |conf|
-        conf.browser_url = "http://#{@random_id}.test/"
-        conf.browsers = [
-            ["Windows 2003", "firefox", "3."]
-        ]
-        conf.application_host = "127.0.0.1"
-        conf.application_port = "3001"
-    end
+
+require 'sauce'
+
+Sauce.config do |conf|
+    conf.browser_url = "http://#{@random_id}.test/"
+    conf.browsers = [
+        ["Windows 2003", "firefox", "3.6."]
+    ]
+    conf.application_host = "127.0.0.1"
+    conf.application_port = "3001"
+end
           CONFIG
       end
     end

data/lib/sauce/connect.rb

@@ -16,7 +16,8 @@ module Sauce
       options.delete(:tunnel_port)
       config = Sauce::Config.new(options)
       args = ['-u', config.username, '-k', config.access_key, '-s', host, '-p', port, '-d', config.domain, '-t', tunnel_port]
-      @pipe = IO.popen((["exec", "\"#{Sauce::Connect.find_sauce_connect}\""] + args).join(' '))
+      @pipe = IO.popen((["exec", "\"#{Sauce::Connect.find_sauce_connect}\""] + args + ["2>&1"]).join(' '))
+      @process_status = $?
       at_exit do
         Process.kill("INT", @pipe.pid)
         while @ready
@@ -34,7 +35,11 @@ module Sauce
           if line =~ /- (Problem.*)$/
             @error = $1
           end
-          puts line unless options[:quiet]
+          if line =~ /== Missing requirements ==/
+            @error = "Missing requirements"
+            options[:quiet] = false
+          end
+          $stderr.puts line unless options[:quiet]
         end
         @ready = false
       }
@@ -42,10 +47,14 @@ module Sauce
 
     def wait_until_ready
       start = Time.now
-      while !@ready and (Time.now-start) < TIMEOUT
+      while !@ready and (Time.now-start) < TIMEOUT and @error != "Missing requirements"
         sleep 0.4
       end
 
+      if @error == "Missing requirements"
+        raise "Missing requirements"
+      end
+
       if !@ready
         raise "Sauce Connect failed to connect after #{TIMEOUT} seconds"
       end

data/lib/sauce/selenium.rb

@@ -13,7 +13,10 @@ module Sauce
   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)
+      http_client = Selenium::WebDriver::Remote::Http::Default.new
+      http_client.timeout = 300 # Browser launch can take a while
+      @driver = ::Selenium::WebDriver.for(:remote, :url => "http://#{@config.username}:#{@config.access_key}@#{@config.host}:#{@config.port}/wd/hub", :desired_capabilities => @config.to_desired_capabilities, :http_client => http_client)
+      http_client.timeout = 90 # Once the browser is up, commands should time out reasonably
     end
 
     def method_missing(meth, *args)

data/sauce.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sauce}
-  s.version = "0.17.6"
+  s.version = "0.17.7"
 
   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-02-25}
+  s.date = %q{2011-03-10}
   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: 87
+  hash: 85
   prerelease: 
   segments: 
   - 0
   - 17
-  - 6
-  version: 0.17.6
+  - 7
+  version: 0.17.7
 platform: ruby
 authors: 
 - Sean Grove
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: sauce
 dependencies: 
 - !ruby/object:Gem::Dependency