sauce 0.16.2 → 0.17.0

data/Rakefile

@@ -51,3 +51,11 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+task :build do
+  system "gem build sauce.gemspec"
+end
+
+task :push => :build do
+  system "gem push `ls *.gem | sort | tail -n 1`"
+end

data/lib/sauce/client.rb

@@ -7,14 +7,12 @@ module Sauce
     class BadAccessError < StandardError; end #:nodoc
     class MisconfiguredError < StandardError; end #:nodoc
 
-    attr_accessor :username, :access_key, :client
+    attr_accessor :client
     attr_accessor :protocol, :host, :port, :api_path, :api_version, :ip, :api_url
     attr_accessor :tunnels, :jobs
 
-    def initialize(options)
-      @username   = options[:username]
-      @access_key = options[:access_key]
-      @ip         = options[:ip]
+    def initialize(options={})
+      config = Sauce::Config.new
 
       @protocol   = options[:protocol] || "http"
       @host       = options[:host] || "saucelabs.com"
@@ -22,24 +20,28 @@ module Sauce
       @api_path   = options[:api_path] || "rest"
       @api_version= options[:api_version] || 1
 
-      raise MisconfiguredError if @username.nil? or @access_key.nil?
-      @api_url = "#{@protocol}://#{@username}:#{@access_key}@#{@host}:#{@port}/#{@api_path}/v#{@api_version}/#{@username}/"
+      raise MisconfiguredError if config.username.nil? or config.access_key.nil?
+      @api_url = "#{@protocol}://#{config.username}:#{config.access_key}@#{@host}:#{@port}/#{@api_path}/v#{@api_version}/#{config.username}/"
       @client = RestClient::Resource.new @api_url
 
       @tunnels = Sauce::Tunnel
       @tunnels.client = @client
       @tunnels.account = {
-        :username => @username,
-        :access_key => @access_key,
+        :username => config.username,
+        :access_key => config.access_key,
         :ip => @ip}
 
       @jobs = Sauce::Job
       @jobs.client = @client
       @jobs.account = {
-        :username => @username,
-        :access_key => @access_key,
+        :username => config.username,
+        :access_key => config.access_key,
         :ip => @ip
       }
     end
+
+    def [](url)
+      @client[url]
+    end
   end
 end

data/lib/sauce/config.rb

@@ -39,6 +39,10 @@ module Sauce
       "iexplore" => "internet explorer"
     }
 
+    SAUCE_OPTIONS = %w{record-video record-screenshots capture-html tags
+        sauce-advisor single-window user-extensions-url firefox-profile-url
+        max-duration idle-timeout build custom-data}
+
     def initialize(opts={})
       @opts = {}
       if opts != false
@@ -69,7 +73,12 @@ module Sauce
         'os' => os,
         'browser' => browser,
         'browser-version' => browser_version,
-        'name' => @opts[:job_name]}
+        'name' => @opts[:name] || @opts[:job_name]}
+
+      SAUCE_OPTIONS.each do |opt|
+        opt = opt.to_sym
+        browser_options[opt] = @opts[opt] if @opts.include? opt
+      end
       return browser_options.to_json
     end
 
@@ -128,7 +137,7 @@ module Sauce
 
     def load_options_from_heroku
       @@herkou_environment ||= begin
-        buffer = IO.popen("heroku config --shell") { |out| out.read }
+        buffer = IO.popen("heroku config --shell 2>/dev/null") { |out| out.read }
         if $?.exitstatus == 0
           env = {}
           buffer.split("\n").each do |line|

data/lib/sauce/connect.rb

@@ -63,5 +63,24 @@ module Sauce
     def self.find_sauce_connect
       File.join(File.dirname(File.dirname(File.expand_path(File.dirname(__FILE__)))), "support", "sauce_connect")
     end
+
+    # Global Sauce Connect-ness
+    @connection = nil
+
+    def self.connect!(*args)
+      @connection = self.new(*args)
+      @connection.wait_until_ready
+      at_exit do
+        @connection.disconnect
+      end
+    end
+
+    def self.ensure_connected(*args)
+      if @connection
+        @connection.wait_until_ready
+      else
+        connect!(*args)
+      end
+    end
   end
 end

data/lib/sauce/integrations.rb

@@ -122,160 +122,80 @@ rescue LoadError, TypeError
   # User doesn't have RSpec 2.x installed
 end
 
-begin
-  require 'test/unit/testcase'
-  module Sauce
-    class TestCase < Test::Unit::TestCase
-      attr_reader :selenium
-
-      alias_method :page, :selenium
-      alias_method :s, :selenium
+module Sauce
+  module SeleniumForTestUnit
+    attr_reader :browser
+
+    alias_method :page, :browser
+    alias_method :s, :browser
+    alias_method :selenium, :browser
+
+    def run(*args, &blk)
+      if self.respond_to? :name
+        my_name = self.name
+      else
+        my_name = self.__name__
+      end
+      unless my_name =~ /^default_test/
+        config = Sauce::Config.new
+        if config.application_host && !config.local?
+          Sauce::Connect.ensure_connected(:host => config.application_host, :port => config.application_port || 80)
+        end
 
-      def run(*args, &blk)
-        if self.respond_to? :name
-          my_name = self.name
-        else
-          my_name = self.__name__
+        unless defined?(@@server)
+          @@server = Sauce::Utilities::RailsServer.new
+          @@server.start
+          at_exit do
+            @@server.stop
+          end
         end
-        unless my_name =~ /^default_test/
-          config = Sauce::Config.new
-          config.browsers.each do |os, browser, version|
+
+        config.browsers.each do |os, browser, version|
+          if config.single_session?
             if config.local?
-              @selenium = ::Selenium::Client::Driver.new(:host => "127.0.0.1",
-                                                         :port => 4444,
-                                                         :browser => "*" + browser,
-                                                         :url => "http://127.0.0.1:#{config.local_application_port}/")
+              @browser = Sauce.cached_session(:host => "127.0.0.1", :port => 4444, :browser => "*" +
+                                              browser, :url => "http://127.0.0.1:#{config.local_application_port}/")
             else
-              @selenium = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
-                :job_name => "#{my_name}"})
+              @browser = Sauce.cached_session({:os => os, :browser => browser, :browser_version => version,
+                                              :job_name => "#{Rails.root.split[1].to_s} test suite"})
             end
-            @selenium.start
             super(*args, &blk)
-            @selenium.stop
+          else
+            if config.local?
+              @browser = ::Selenium::Client::Driver.new(:host => "127.0.0.1",
+                                                        :port => 4444,
+                                                        :browser => "*" + browser,
+                                                        :url => "http://127.0.0.1:#{config.local_application_port}/")
+            else
+              @browser = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
+                                             :job_name => "#{my_name}"})
+            end
+            @browser.start
+            super(*args, &blk)
+            @browser.stop
           end
         end
       end
-
-      # Placeholder so test/unit ignores test cases without any tests.
-      def default_test
-      end
     end
   end
-rescue LoadError
-  # User doesn't have Test::Unit installed
 end
 
-begin
-  require 'test/unit/autorunner'
-  if defined?(Test::Unit::AutoRunner)
-    class Test::Unit::AutoRunner
-      run_without_tunnel = self.instance_method(:run)
+if defined?(ActiveSupport::TestCase)
+  module Sauce
+    class RailsTestCase < ::ActiveSupport::TestCase
+      include SeleniumForTestUnit
 
-      define_method(:run) do |*args|
-        @suite = @collector[self]
-        need_tunnel = suite.tests.any? do |test_suite|
-          test_suite.tests.any? do |test_case|
-            test_case.class.superclass.to_s =~ /^Sauce::/
-          end
-        end
-        if need_tunnel
-          config = Sauce::Config.new
-          if config.application_host && !config.local?
-            @sauce_tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
-            @sauce_tunnel.wait_until_ready
-          end
-          @server = Sauce::Utilities::RailsServer.new
-          @server.start
-        end
-        result = run_without_tunnel.bind(self).call(*args)
-        @sauce_tunnel.disconnect if defined? @sauce_tunnel
-        @server.stop if defined? @server
-        return result
+      # Placeholder so test/unit ignores test cases without any tests.
+      def default_test
       end
     end
   end
-rescue LoadError, NameError
-  # Ruby 1.8's Test::Unit not found
 end
 
 begin
-  require 'minitest/unit'
-  module MiniTest
-    class Unit
-      run_without_tunnel = self.instance_method(:run_test_suites)
-
-      define_method(:run_test_suites) do |*args|
-        need_tunnel = TestCase.test_suites.any? do |suite|
-          suite.superclass.to_s =~ /^Sauce::/
-        end
-        if need_tunnel
-          config = Sauce::Config.new
-          if config.application_host && !config.local?
-            @sauce_tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
-            @sauce_tunnel.wait_until_ready
-          end
-
-          @server = Sauce::Utilities::RailsServer.new
-          @server.start
-        end
-        result = run_without_tunnel.bind(self).call(*args)
-        @sauce_tunnel.disconnect if defined? @sauce_tunnel
-        @server.stop if defined? @server
-        return result
-      end
-    end
-  end
-rescue LoadError
-  # User is not on Ruby 1.9
-end
-
-if defined?(ActiveSupport::TestCase)
+  require 'test/unit/testcase'
   module Sauce
-    module SeleniumForTestUnit
-      attr_reader :browser
-
-      alias_method :page, :browser
-      alias_method :s, :browser
-      alias_method :selenium, :browser
-
-      def run(*args, &blk)
-        if self.respond_to? :name
-          my_name = self.name
-        else
-          my_name = self.__name__
-        end
-        unless my_name =~ /^default_test/
-          config = Sauce::Config.new
-          config.browsers.each do |os, browser, version|
-            if config.single_session?
-              if config.local?
-                @browser = Sauce.cached_session(:host => "127.0.0.1", :port => 4444, :browser => "*" +
-                                                browser, :url => "http://127.0.0.1:#{config.local_application_port}/")
-              else
-                @browser = Sauce.cached_session({:os => os, :browser => browser, :browser_version => version,
-                  :job_name => "#{Rails.root.split[1].to_s} test suite"})
-              end
-              super(*args, &blk)
-            else
-              if config.local?
-                @browser = ::Selenium::Client::Driver.new(:host => "127.0.0.1",
-                                                           :port => 4444,
-                                                           :browser => "*" + browser,
-                                                           :url => "http://127.0.0.1:#{config.local_application_port}/")
-              else
-                @browser = Sauce::Selenium.new({:os => os, :browser => browser, :browser_version => version,
-                  :job_name => "#{my_name}"})
-              end
-              @browser.start
-              super(*args, &blk)
-              @browser.stop
-            end
-          end
-        end
-      end
-    end
-
-    class RailsTestCase < ::ActiveSupport::TestCase
+    class TestCase < Test::Unit::TestCase
       include SeleniumForTestUnit
 
       # Placeholder so test/unit ignores test cases without any tests.
@@ -283,4 +203,6 @@ if defined?(ActiveSupport::TestCase)
       end
     end
   end
+rescue LoadError
+  # User doesn't have Test::Unit installed
 end

data/lib/sauce/job.rb

@@ -66,6 +66,8 @@ module Sauce
       elsif options.class == Hash
         id = options[:id]
       end
+
+      @@client ||= Sauce::Client.new
       
       #puts "GET-URL: #{@@client.url}jobs/#{id}"
       response = @@client["jobs/#{id}"].get

data/lib/sauce/selenium.rb

@@ -20,6 +20,10 @@ module Sauce
       @driver.send(meth, *args)
     end
 
+    def session_id
+      @driver.send(:bridge).session_id
+    end
+
     def stop
       @driver.quit
     end

data/sauce.gemspec

@@ -2,21 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sauce}
-  s.version = "0.16.2"
+  s.version = "0.17.0"
 
   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-04}
+  s.date = %q{2011-02-09}
   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}
   s.executables = ["sauce"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.markdown"
-  ]
   s.files = [
-    ".document",
     "LICENSE",
     "README.markdown",
     "Rakefile",
@@ -55,6 +50,7 @@ Gem::Specification.new do |s|
     "support/simplejson/tool.py",
     "test/helper.rb",
     "test/test_config.rb",
+    "test/test_job.rb",
     "test/test_connect.rb",
     "test/test_selenium.rb",
     "test/test_selenium2.rb"
@@ -72,7 +68,9 @@ Gem::Specification.new do |s|
     "test/helper.rb",
     "test/test_config.rb",
     "test/test_connect.rb",
-    "test/test_selenium.rb"
+    "test/test_selenium.rb",
+    "test/test_job.rb",
+    "test/test_selenium2.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/test_job.rb

@@ -0,0 +1,13 @@
+require File.expand_path("../helper", __FILE__)
+
+class TestJob < Test::Unit::TestCase
+  def test_running_a_job_creates_a_reasonable_job_object
+    selenium = Sauce::Selenium.new(:name => "test_running_a_job_creates_a_job_object")
+    selenium.start
+    session_id = selenium.session_id
+    selenium.stop
+
+    job = Sauce::Job.find(session_id)
+    assert_equal "test_running_a_job_creates_a_job_object", job.name
+  end
+end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 16
-  - 2
-  version: 0.16.2
+  - 17
+  - 0
+  version: 0.17.0
 platform: ruby
 authors: 
 - Sean Grove
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-04 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: sauce
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,11 +148,9 @@ executables:
 - sauce
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
+extra_rdoc_files: []
+
 files: 
-- .document
 - LICENSE
 - README.markdown
 - Rakefile
@@ -191,6 +189,7 @@ files:
 - support/simplejson/tool.py
 - test/helper.rb
 - test/test_config.rb
+- test/test_job.rb
 - test/test_connect.rb
 - test/test_selenium.rb
 - test/test_selenium2.rb
@@ -238,3 +237,5 @@ test_files:
 - test/test_config.rb
 - test/test_connect.rb
 - test/test_selenium.rb
+- test/test_job.rb
+- test/test_selenium2.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE