sauce 2.5.2 → 3.0.0.beta.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjE4ZWNmYmY5YTI3NDNjM2IzYTg3M2EwYWVmOGEwM2EzZmFiMTA3Nw==
+    MWU4Y2I5MTU4YTZmNGYyODc2OTFjZjFjM2U5NTI4M2VlZjgxZTlmMw==
   data.tar.gz: !binary |-
-    NmZiN2M0NWZkYzE2NjAxMmYxZDY0NDgyYzYzNzM3OGI0YjcwNmQyMA==
+    ZDExNzRjOWJhZTIzZDczYjdiZDg4ZTc3YzZkZmVhZDQ1OGZkMWU5Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmRiZDYxZWE0ZTIxNTg1ZTFiNTZiYWRlMDYxZTA0Yjg2MTBhN2U5ZTdlMjVh
-    NDY3ZThkMzhlZWI4ZjNiOTdlMDBmMGM1ZTYyZTg0YTIyYjViNjRhYTZiYmYw
-    MzQyMjVjNjZlY2FkYzhiOWZlNDE5Y2I1M2ZlZjM5Mzg0ZmQ3MTg=
+    YzQ0OWE1MTYyZjQzMThlMTBhMjAxZjBiZDNmYzI3Zjc3MDY3NDAxNTAwMGJm
+    MGYwN2RkMmYyN2RiOTRlOWMzMzI1NTBkYTAzNjBkYjY4YWVlOTkzMzdhNGYw
+    NzBmN2JhNWZhYWYxNjFlNTA2MDlmNWYwNzgwNzgyM2NmMTQxOGY=
   data.tar.gz: !binary |-
-    MjExNmMxMDQxMDA0NDA5NDM0ZjhiMWI2YmUzOGVkZmE1OTY0ZWFkYTcwYWUz
-    ODFjY2ZlMzNmY2M0YzRiNzcyMDYyOGRhY2Q0MmRhZTE4YmRiNDdjODg5YjVj
-    ZGM5OTA4N2MzNWVlZDEzZDA2YjgyYTRkYjZkZTMzOTYwYTMwYzg=
+    Njk2NWFhNmJmYzA2ZDRkNWNhMTg2MDUzMGI1NzM5MjBkODBjMDg3NzRiZjA0
+    OTQxM2FiMGYyNTE4MTUxNWZhMzc2MzU4NTM4ZjhiZTRjMmQ3OTAyYzUyOGI2
+    N2VhY2U4Y2UxYTAzNTQ3OWEyNGJmNWQxNzQwZGY1ODdlNjkxYzU=

data/lib/parallel_tests/cli_patch.rb

@@ -0,0 +1,19 @@
+module ParallelTests
+  class CLI
+    def run_tests_in_parallel(num_processes, options)
+      test_results = nil
+
+      report_time_taken do
+        groups = @runner.tests_in_groups(options[:files], num_processes, options)
+        Sauce::TestBroker.test_groups = groups
+        report_number_of_tests(groups)
+
+        test_results = execute_in_parallel(groups, groups.size, options) do |group|
+          run_tests(group, Sauce::TestBroker.group_index(group), num_processes, options)
+        end
+
+        report_results(test_results)
+      end
+    end
+  end
+end

data/lib/parallel_tests/saucerspec/runner.rb

@@ -0,0 +1,39 @@
+require "yaml"
+require "parallel_tests/rspec/runner"
+
+module ParallelTests
+  module Saucerspec
+    class Runner < ParallelTests::RSpec::Runner
+
+      def self.run_tests(test_files, process_number, num_processes, options)
+        exe = executable # expensive, so we cache
+        version = (exe =~ /\brspec\b/ ? 2 : 1)
+        cmd = [exe, options[:test_options], (rspec_2_color if version == 2), spec_opts, *test_files].compact.join(" ")
+        env = Sauce::TestBroker.next_environment(test_files)
+        env << " #{rspec_1_color}" if version == 1
+        options = options.merge(:env => env)
+        execute_command(cmd, process_number, num_processes, options)
+      end
+
+
+      def self.tests_in_groups(tests, num_groups, options={})
+        all_tests = super.flatten * Sauce::TestBroker.test_platforms.length
+        base_group_size = all_tests.length / num_groups
+        num_full_groups = all_tests.length - (base_group_size * num_groups)
+
+        curpos = 0
+        groups = []
+        num_groups.times do |i|
+          group_size = base_group_size
+          if i < num_full_groups
+            group_size += 1
+          end
+          groups << all_tests.slice(curpos, group_size)
+          curpos += group_size
+        end
+
+        groups
+      end
+    end
+  end
+end

data/lib/sauce.rb

@@ -5,6 +5,8 @@ require 'sauce/client'
 require 'sauce/config'
 require 'sauce/selenium'
 require 'sauce/integrations'
+require 'tasks/parallel_testing'
+require 'parallel_tests/saucerspec/runner'
 
 # Ruby before 1.9.3-p382 does not handle exit codes correctly when nested
 if RUBY_VERSION == "1.9.3" && RUBY_PATCHLEVEL < 392
@@ -18,4 +20,4 @@ if RUBY_VERSION == "1.9.3" && RUBY_PATCHLEVEL < 392
       end
     end
   end
-end
+end

data/lib/sauce/capybara.rb

@@ -4,15 +4,26 @@ require 'sauce/config'
 require 'sauce/selenium'
 require 'sauce/version'
 
-require 'sauce/utilities'
-
 
 $sauce_tunnel = nil
 
 module Sauce
   module Capybara
     def connect_tunnel(options={})
-      Sauce::Utilities::Connect.start(options)
+      begin
+        require 'sauce/connect'
+      rescue LoadError
+        puts 'Please install the `sauce-connect` gem if you intend on using Sauce Connect with your tests!'
+        raise
+      end
+
+      unless $sauce_tunnel.nil?
+        return $sauce_tunnel
+      end
+      $sauce_tunnel = Sauce::Connect.new(options)
+      $sauce_tunnel.connect
+      $sauce_tunnel.wait_until_ready
+      $sauce_tunnel
     end
     module_function :connect_tunnel
 
@@ -84,15 +95,15 @@ module Sauce
 
       def browser
         unless existing_browser?
-          unless @browser = rspec_browser
-            if Sauce.get_config[:start_tunnel]
-              Sauce::Capybara.connect_tunnel(:quiet => true)
-            end
+          @browser = rspec_browser
+          unless @browser
 
             @browser = Sauce::Selenium2.new
-            at_exit do
-              finish!
-            end
+            # This at_exit call is causing failed rspec tests to exit(0).
+            # Should remain disabled until it's fixed.
+            # at_exit do
+            #   finish!
+            # end
           end
         end
         @browser
@@ -118,13 +129,12 @@ module Sauce
       def finish!
         @browser.quit if existing_browser?
         @browser = nil
-        Sauce::Utilities::Connect.close
       end
 
       def render(path)
         browser.save_screenshot path
       end
-        
+
     end
   end
 end

data/lib/sauce/config.rb

@@ -28,7 +28,8 @@ module Sauce
         :job_name => "Unnamed Ruby job",
         :local_application_port => "3001",
         :capture_traffic => false,
-        :start_tunnel => true
+        :start_tunnel => true,
+        :start_local_application => true
     }
 
     ENVIRONMENT_VARIABLES = %w{SAUCE_HOST SAUCE_PORT SAUCE_BROWSER_URL SAUCE_USERNAME
@@ -119,6 +120,12 @@ module Sauce
     end
 
     def browsers
+      if @undefaulted_opts[:browser]
+        # If a specific browser was requested, ignore :browsers and
+        # use that one. This allows a setup with :browsers to launch
+        # sub-processes pointed just at each browser in the list.
+        return [[os, browser, browser_version]]
+      end
       return @opts[:browsers] if @opts.include? :browsers
       return [[os, browser, browser_version]]
     end
@@ -127,7 +134,7 @@ module Sauce
       if @undefaulted_opts[:browser]
         return @undefaulted_opts[:browser]
       end
-      if @opts[:browsers]
+      if !ENV["TEST_ENV_NUMBER"] && @opts[:browsers]
         @opts[:browsers][0][1]
       else
         @opts[:browser]
@@ -138,7 +145,7 @@ module Sauce
       if @undefaulted_opts[:os]
         return @undefaulted_opts[:os]
       end
-      if @opts[:browsers]
+      if !ENV["TEST_ENV_NUMBER"] && @opts[:browsers]
         @opts[:browsers][0][0]
       else
         @opts[:os]
@@ -149,7 +156,7 @@ module Sauce
       if @undefaulted_opts[:browser_version]
         return @undefaulted_opts[:browser_version]
       end
-      if @opts[:browsers]
+      if !ENV["TEST_ENV_NUMBER"] && @opts[:browsers]
         @opts[:browsers][0][2]
       else
         @opts[:browser_version]
@@ -267,7 +274,11 @@ module Sauce
       opts[:os] = env['SAUCE_OS']
       opts[:browser] = env['SAUCE_BROWSER']
       opts[:browser_version] = env['SAUCE_BROWSER_VERSION']
+
       opts[:job_name] = env['SAUCE_JOB_NAME'] || env['JOB_NAME']
+      opts[:build] = (env['BUILD_NUMBER'] ||
+                      env['TRAVIS_BUILD_NUMBER'] ||
+                      env['CIRCLE_BUILD_NUM'])
 
       opts[:firefox_profile_url] = env['SAUCE_FIREFOX_PROFILE_URL']
       opts[:user_extensions_url] = env['SAUCE_USER_EXTENSIONS_URL']

data/lib/sauce/integrations.rb

@@ -19,11 +19,12 @@ begin
           config = Sauce::Config.new
           if @@need_tunnel
             if config[:application_host]
-              @@tunnel = Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
+              @@tunnel = Sauce::Connect.new(:host => config[:application_host], :port => config[:application_port] || 80)
               @@tunnel.connect
               @@tunnel.wait_until_ready
             end
-            if Sauce::Utilities::RailsServer.is_rails_app?
+            if config[:start_local_application] &&
+              Sauce::Utilities::RailsServer.is_rails_app?
               @@server = Sauce::Utilities::RailsServer.new
               @@server.start
             end
@@ -101,14 +102,18 @@ begin
 
           config = Sauce::Config.new
           if config[:application_host]
-            @@tunnel ||= Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
+            @@tunnel ||= Sauce::Connect.new(:host => config[:application_host], :port => config[:application_port] || 80)
             @@tunnel.connect
             @@tunnel.wait_until_ready
           end
 
-          if Sauce::Utilities::RailsServer.is_rails_app?
-            @@server = Sauce::Utilities::RailsServer.new
-            @@server.start
+          if config[:start_local_application] &&
+            Sauce::Utilities::RailsServer.is_rails_app?
+            # Start the app before the tests if this is a parallel run
+            if ENV["TEST_ENV_NUMBER"].nil?
+              @@server = Sauce::Utilities::RailsServer.new
+              @@server.start
+            end
           end
         end
 
@@ -120,14 +125,18 @@ begin
           if config[:application_host]
             need_tunnel = files_to_run.any? {|file| file =~ /spec\/selenium\//}
           end
-          if need_tunnel
-            @@tunnel ||= Sauce::Connect.new(:host => config.application_host, :port => config.application_port || 80)
+
+          if need_tunnel || config[:start_tunnel]
+            @@tunnel ||= Sauce::Connect.new(:host => config[:application_host], :port => config[:application_port] || 80)
             @@tunnel.connect
             @@tunnel.wait_until_ready
           end
 
-          if files_to_run.any? {|file| file =~ /spec\/selenium\//} &&
+          if config[:start_local_application] &&
+            files_to_run.any? {|file| file =~ /spec\/selenium\//} &&
             Sauce::Utilities::RailsServer.is_rails_app?
+            ## Only open the tunnel once.
+            ## TODO:  Why is this here?  It's above, also
             @@server = Sauce::Utilities::RailsServer.new
             @@server.start
           end
@@ -163,13 +172,14 @@ module Sauce
         config = Sauce::Config.new
         if config[:application_host]
           unless ENV['TEST_ENV_NUMBER'].to_i > 1
-            Sauce::Connect.ensure_connected(:host => config.application_host, :port => config.application_port || 80)
+            Sauce::Connect.ensure_connected(:host => config[:application_host], :port => config[:application_port] || 80)
           end
         end
 
         unless defined?(@@server)
           unless ENV['TEST_ENV_NUMBER'].to_i > 1
-            if Sauce::Utilities::RailsServer.is_rails_app?
+            if config[:start_local_application] &&
+              Sauce::Utilities::RailsServer.is_rails_app?
               @@server = Sauce::Utilities::RailsServer.new
               @@server.start
               at_exit do

data/lib/sauce/parallel/test_broker.rb

@@ -0,0 +1,67 @@
+require "rest-client"
+require "json"
+require "yaml"
+require "sauce/parallel/test_group"
+
+module Sauce
+  class TestBroker
+   
+    def self.next_environment(group)
+      unless test_groups.has_key? group
+        test_groups[group] = TestGroup.new(self.test_platforms)
+      end
+
+      test_groups[group].next_platform
+    end
+
+    def self.test_groups
+      @groups ||= {}
+    end
+
+    def self.test_groups=(groups)
+      @groups = groups.reduce({}) do |hash, g|
+        hash[g] = TestGroup.new(self.test_platforms)
+        hash
+      end
+
+      @group_indexes = groups.uniq.reduce({}) do |rh, g|
+        rh[g] =(groups.each_index.select {|i| groups[i] == g})
+        rh
+      end
+    end
+
+    def self.group_index(group)
+      @group_indexes[group].shift
+    end
+
+    def self.test_platforms
+      unless defined? @@platforms
+        load_sauce_config
+        brokers = Sauce.get_config
+        @@platforms ||= brokers[:browsers]
+      end
+      @@platforms
+    end
+
+    def self.concurrencies
+      response = RestClient.get "#{rest_jobs_url}/#{SAUCE_USERNAME}/limits"
+      res = JSON.parse(response)["concurrency"]
+    end
+
+    def self.rest_jobs_url
+      "https://#{AUTH_DETAILS}@saucelabs.com/rest/v1"
+    end
+
+    def self.load_sauce_config
+      if File.exists? "./spec/sauce_helper.rb"
+        require "./spec/sauce_helper"
+      else
+        require "./spec/spec_helper"
+      end
+    end
+
+    SAUCE_USERNAME = ENV["SAUCE_USERNAME"]
+    SAUCE_ACCESS_KEY = ENV["SAUCE_ACCESS_KEY"]
+    AUTH_DETAILS = "#{SAUCE_USERNAME}:#{SAUCE_ACCESS_KEY}"
+  end
+end

data/lib/sauce/parallel/test_group.rb

@@ -0,0 +1,22 @@
+module Sauce
+  class TestGroup
+    def initialize(platforms)
+      @platforms = platforms
+      @index = 0
+    end
+
+    def next_platform
+      platform = @platforms[@index]
+      begin
+        @index = @index + 1
+        {
+          :SAUCE_OS => "'#{platform[0]}'",
+          :SAUCE_BROWSER => "'#{platform[1]}'",
+          :SAUCE_BROWSER_VERSION => "'#{platform[2]}'"
+        }
+      rescue NoMethodError => e
+        puts "I don't have any config"
+      end
+    end
+  end
+end

data/lib/sauce/utilities.rb

@@ -31,39 +31,6 @@ module Sauce
       end
     end
 
-    class Connect
-
-      def self.start(options={})
-        begin
-          require "sauce/connect"
-        rescue LoadError => e
-          STDERR.puts <<-ERROR
-Please install the `sauce-connect` gem if you intend on using Sauce Connect with your tests!
-
-If you don't wish to use Sauce Connect, set [:start_tunnel] to false:
-  Sauce.config do |config|
-    config[:start_tunnel] = false
-  end
-          ERROR
-          exit(1)
-        end
-
-        unless @tunnel
-          @tunnel = Sauce::Connect.new options
-          @tunnel.connect
-          @tunnel.wait_until_ready
-        end
-          @tunnel
-      end
-
-      def self.close
-        if @tunnel
-          @tunnel.disconnect
-          @tunnel = nil
-        end
-      end
-    end
-
     class RailsServer
       include Sauce::Utilities
 
@@ -72,16 +39,32 @@ If you don't wish to use Sauce Connect, set [:start_tunnel] to false:
       end
 
       def start
-        STDERR.puts "Starting Rails server on port 3001..."
+        port = 3001
+
+        if ENV["TEST_ENV_NUMBER"]
+          @test_env = ENV["TEST_ENV_NUMBER"].to_i
+          port = port + @test_env
+        end
+
+        STDERR.puts "Starting Rails server on port #{port}..."
+
         if File.exists?('script/server')
-          @server = ChildProcess.build("ruby", "script/server", "-e", "test", "--port", "3001")
+          @process_args = ["ruby", "script/server", "-e", "test", "--port", "#{port}"]
+          #@server = ChildProcess.build("ruby", "script/server", "-e", "test", "--port", "#{port}")
         elsif File.exists?('script/rails')
-          @server = ChildProcess.build("bundle", "exec", "rails", "server", "-e", "test", "--port", "3001")
+          @process_args = ["bundle", "exec", "rails", "server", "-e", "test", "--port", "#{port}"]
+          #@server = ChildProcess.build("bundle", "exec", "rails", "server", "-e", "test", "--port", "#{port}")
         end
+
+        if @test_env
+          @process_args.push *["--pid", "#{Dir.pwd}/tmp/pids/server-#{@test_env}"]
+        end
+
+        @server = ChildProcess.build *@process_args
         @server.io.inherit!
         @server.start
 
-        wait_for_server_on_port(3001)
+        wait_for_server_on_port(port)
 
         at_exit do
           @server.stop(3, "INT")

data/lib/sauce/version.rb

@@ -1,6 +1,6 @@
 module Sauce
-  MAJOR_VERSION = '2.5'
-  PATCH_VERSION = '2'
+  MAJOR_VERSION = '3.0'
+  PATCH_VERSION = '0.beta.2'
 
   def version
     "#{MAJOR_VERSION}.#{PATCH_VERSION}"

data/lib/tasks/parallel_testing.rb

@@ -0,0 +1,62 @@
+require "sauce/parallel/test_broker"
+require "parallel_tests"
+require "parallel_tests/tasks"
+require "parallel_tests/cli_patch"
+
+namespace :sauce do
+  task :spec, :arg1 do |t, args|
+
+    ::RSpec::Core::Runner.disable_autorun!
+
+    args.with_defaults(:arg1 => [Sauce::TestBroker.concurrencies, 20].min)
+    concurrency = args[:arg1]
+    ParallelTests::CLI.new.run(["--type", "saucerspec",
+                                "-n", "#{concurrency}",
+                                "spec"])
+  end
+
+  task :install => :create_helper do
+    spec_helper_path = "spec/spec_helper.rb"
+    unless File.open(spec_helper_path) { |f| f.read.match "require \"sauce_helper\""}
+      File.open("spec/spec_helper.rb", "a") do |f|
+        f.write "require \"sauce_helper\""
+      end
+    else
+      puts "WARNING - The Sauce gem is already integrated into your rspec setup"
+    end
+    puts <<-ENDLINE
+The Sauce gem is now installed!
+
+Next steps:
+
+1.  Edit spec/sauce_helper.rb with your required platforms
+2.  Make sure we've not mangled your spec/spec_helper.rb requiring sauce_helper
+3.  Set the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables
+3.  Run your tests with 'rake sauce:spec'
+
+    ENDLINE
+  end
+
+  task :create_helper do
+    sauce_helper_path = "spec/sauce_helper.rb"
+    unless File.exists? sauce_helper_path
+      File.open(sauce_helper_path, "w") do |f|
+        f.write (<<-ENDFILE
+# You should edit this file with the browsers you wish to use
+# For options, check out http://saucelabs.com/platforms
+require "sauce"
+
+Sauce.config do |config|
+  config[:browsers] = [
+    ["OS", "BROWSER", "VERSION"],
+    ["OS", "BROWSER", "VERSION"]
+  ]
+end
+ENDFILE
+        )
+      end
+    else
+      STDERR.puts "WARNING - sauce_helper has already been created."
+    end
+  end
+end

data/spec/integration/connect/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+require "sauce"
+require "sauce/connect"
+
+Sauce.config do |c|
+  c[:start_tunnel] = true
+end

data/spec/integration/connect/spec/start_tunnel_spec.rb

@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "Sauce::Config" do
+  it "should start Connect when start_tunnel is set" do
+    Sauce::RSpec::SeleniumExampleGroup.class_variable_defined?(:@@tunnel).should be_true
+  end
+end

data/spec/parallel_tests/sauce_rspec_runner_spec.rb

@@ -0,0 +1,23 @@
+require "rspec"
+require "sauce"
+require "parallel_tests"
+
+describe "Sauce Rspec Runner" do
+  describe "#self.tests_in_groups" do
+    it "should return a group for every environment" do
+      Sauce.config do |c|
+        c.browsers = [
+            ["Windows 7", "Opera", "10"],
+            ["Linux", "Firefox", "19"],
+            ["Windows 8", "Chrome", ""]
+        ]
+      end
+
+      ParallelTests::Test::Runner.stub(:tests_in_groups).with(anything, anything, anything) {
+        ["spec/one_spec", "spec/two_spec"]
+      }
+      test_groups = ParallelTests::Saucerspec::Runner.tests_in_groups ["spec/one_spec.rb"], "3"
+      test_groups.length.should eq 6
+    end
+  end
+end

data/spec/sauce/capybara_spec.rb

@@ -3,12 +3,11 @@ require 'sauce/capybara'
 require 'sauce/connect'
 
 describe Sauce::Capybara do
-
-  after :each do
-    Sauce::Utilities::Connect.instance_variable_set(:@tunnel, false)
-  end
-
   describe '#connect_tunnel' do
+    before :each do
+      $sauce_tunnel = nil
+    end
+
     let(:connector) do
       connector = double()
       connector.should_receive(:connect)
@@ -16,8 +15,13 @@ describe Sauce::Capybara do
       connector
     end
 
+    it 'should not do anything if the sauce tunnel exists' do
+      $sauce_tunnel = 1337
+      Sauce::Capybara.connect_tunnel.should == 1337
+    end
+
     it 'should connect if the tunnel is not connected' do
-      Sauce::Connect.should_receive(:new).with(anything).and_return(connector)
+      Sauce::Connect.should_receive(:new).and_return(connector)
 
       Sauce::Capybara.connect_tunnel
     end
@@ -27,6 +31,10 @@ describe Sauce::Capybara do
                     hash_including(:quiet => true)).and_return(connector)
       Sauce::Capybara.connect_tunnel(:quiet => true)
     end
+
+    after :each do
+      $sauce_tunnel = nil
+    end
   end
 
   describe Sauce::Capybara::Driver do

data/spec/sauce/config_spec.rb

@@ -92,6 +92,7 @@ describe Sauce::Config do
       ENV['SAUCE_OS'] = "Linux"
       ENV['SAUCE_BROWSER'] = "firefox"
       ENV['SAUCE_BROWSER_VERSION'] = "3."
+      ENV['BUILD_NUMBER'] = 'test env build'
 
       config = Sauce::Config.new
       browser_data = JSON.parse(config.to_browser_string)
@@ -100,7 +101,8 @@ describe Sauce::Config do
                               'os' => 'Linux',
                               'username' => 'test_user',
                               'browser-version' => '3.',
-                              'browser' => 'firefox'}
+                              'browser' => 'firefox',
+                              'build' => 'test env build'}
     end
 
     it 'should create a browser string from the environment set by the jenkins plugin' do
@@ -110,6 +112,7 @@ describe Sauce::Config do
       ENV['SAUCE_BROWSER'] = 'firefox'
       ENV['SAUCE_BROWSER_VERSION'] = '3.'
       ENV['SAUCE_JOB_NAME'] = 'Named Ruby Job'
+      ENV['BUILD_NUMBER'] = 'test env build'
 
       config = Sauce::Config.new
       browser_data = JSON.parse(config.to_browser_string)
@@ -118,7 +121,8 @@ describe Sauce::Config do
                               'os' => 'Linux',
                               'username' => 'test_user',
                               'browser-version' => '3.',
-                              'browser' => 'firefox'}
+                              'browser' => 'firefox',
+                              'build' => 'test env build'}
 
     end
 
@@ -127,7 +131,8 @@ describe Sauce::Config do
                                  :access_key => 'test_access',
                                  :os => 'Linux',
                                  :browser => 'firefox',
-                                 :browser_version => '3.')
+                                 :browser_version => '3.',
+                                 :build => 'test param build')
 
       browser_data = JSON.parse(config.to_browser_string)
       browser_data.should == {'name' => 'Unnamed Ruby job',
@@ -135,12 +140,14 @@ describe Sauce::Config do
                               'os' => 'Linux',
                               'username' => 'test_user',
                               'browser-version' => '3.',
-                              'browser' => 'firefox'}
+                              'browser' => 'firefox',
+                              'build' => 'test param build'}
     end
 
     it 'should create a browser string with optional parameters' do
       config = Sauce::Config.new(:username => "test_user", :access_key => "test_access",
                                 :os => "Linux", :browser => "firefox", :browser_version => "3.",
+                                :build => "test opt build",
                                 :"user-extensions-url" => "testing")
       browser_data = JSON.parse(config.to_browser_string)
       browser_data.should == {'name' => 'Unnamed Ruby job',
@@ -149,12 +156,15 @@ describe Sauce::Config do
                               'username' => 'test_user',
                               'browser-version' => '3.',
                               'browser' => 'firefox',
-                              'user-extensions-url' => 'testing'}
+                              'build' => 'test opt build',
+                              'user-extensions-url' => 'testing',
+      }
     end
 
     it 'should create a browser string with optional parameters as underscored symbols' do
       config = Sauce::Config.new(:username => "test_user", :access_key => "test_access",
                                 :os => "Linux", :browser => "firefox", :browser_version => "3.",
+                                :build => "test opt build",
                                 :user_extensions_url => "testing")
       browser_data = JSON.parse(config.to_browser_string)
       browser_data.should == {'name' => 'Unnamed Ruby job',
@@ -163,6 +173,7 @@ describe Sauce::Config do
                               'username' => 'test_user',
                               'browser-version' => '3.',
                               'browser' => 'firefox',
+                              'build' => 'test opt build',
                               'user-extensions-url' => 'testing'}
     end
 

data/spec/sauce/cucumber_spec.rb

@@ -9,10 +9,6 @@ module Sauce::Capybara
     include Sauce::Capybara::Cucumber
     include Sauce::Cucumber::SpecHelper
 
-    before :each do
-      Sauce::Utilities::Connect.stub!(:start) {}
-    end
-
     describe '#use_sauce_driver' do
       before :each do
         ::Capybara.current_driver = :test
@@ -113,53 +109,6 @@ module Sauce::Capybara
 
       end
 
-      context "when using sauce/connect" do
-        let(:feature) do
-          """
-          Feature: A dummy feature
-            @selenium
-            Scenario: A dummy scenario
-              Given a scenario
-              When I raise no exceptions
-          """
-        end
-
-        before :each do
-          Sauce::Utilities::Connect.rspec_reset
-
-          Sauce.config do |c|
-            c[:start_tunnel] = true
-          end
-          $ran_scenario = nil
-        end
-
-        after :all do
-          Sauce::Utilities::Connect.stub!(:start) {}
-        end
-
-        it 'should have set up a tunnel' do
-          define_steps do
-            Given /^a scenario$/ do
-            end
-            When /^I raise no exceptions$/ do
-              $ran_scenario = true
-            end
-            # Set up and invoke our defined Around hook
-            Around('@selenium') do |scenario, block|
-              # We need to fully reference the module function here due to a
-              # change in scoping that will happen to this block courtesy of
-              # define_steps
-              Sauce::Capybara::Cucumber.around_hook(scenario, block)
-            end
-          end
-
-          # Make sure we actually configure ourselves
-          Sauce::Utilities::Connect.should_receive(:start).and_return {true}
-          run_defined_feature feature
-          $ran_scenario.should be true
-        end
-      end
-
       context 'with a correct scenario' do
         let(:feature) do
           """

data/spec/sauce/jasmine_spec.rb

@@ -13,7 +13,7 @@ describe Sauce::Jasmine::Driver do
     end
 
     it 'should initialize a Sauce driver' do
-      Sauce::Selenium2.should_receive(:new).with(hash_including(:browser => browser)).and_return(true)
+      Sauce::Selenium2.should_receive(:new).with(anything).and_return(true)
       d = Sauce::Jasmine::Driver.new(browser, address)
       d.should_not be_nil
     end

data/spec/sauce/parallel/test_broker_spec.rb

@@ -0,0 +1,43 @@
+require "rspec"
+require "sauce/parallel/test_broker"
+
+describe Sauce::TestBroker do
+
+  describe "#next_environment" do
+
+    before :all do
+      Sauce.config do |c|
+        c.browsers = [
+            ["Windows 7", "Opera", "10"],
+            ["Linux", "Firefox", "19"]
+        ]
+      end
+    end
+
+    it "returns the first environment for new entries" do
+      first_environment = Sauce::TestBroker.next_environment "spec/a_spec"
+      first_environment.should eq({
+        :SAUCE_OS => "'Windows 7'",
+        :SAUCE_BROWSER => "'Opera'",
+        :SAUCE_BROWSER_VERSION => "'10'"
+      })
+    end
+
+    it "should only return an environment once" do
+      Sauce::TestBroker.next_environment "spec/b_spec"
+      second_environment = Sauce::TestBroker.next_environment "spec/b_spec"
+
+      second_environment.should eq({
+          :SAUCE_OS => "'Linux'",
+          :SAUCE_BROWSER => "'Firefox'",
+          :SAUCE_BROWSER_VERSION => "'19'"
+      })
+    end
+  end
+
+  describe "#test_platforms" do
+    it "should report the same groups as configured in Sauce.config" do
+      Sauce::TestBroker.test_platforms.should eq Sauce.get_config.browsers
+    end
+  end
+end

data/spec/sauce_helper.rb

@@ -0,0 +1,8 @@
+require "sauce"
+
+Sauce.config do |c|
+  c[:browsers] = [
+      ["Windows 7", "Opera", 10],
+      ["Linux", "Firefox", 19]
+  ]
+end

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-require "rspec"
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
 ['sauce-jasmine', 'sauce-cucumber', 'sauce-connect'].each do |gem|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 3.0.0.beta.2
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -29,20 +29,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +155,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.12.4
 - !ruby/object:Gem::Dependency
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
@@ -193,6 +193,8 @@ extra_rdoc_files: []
 files:
 - lib/childprocess/process.rb
 - lib/generators/sauce/install/install_generator.rb
+- lib/parallel_tests/cli_patch.rb
+- lib/parallel_tests/saucerspec/runner.rb
 - lib/sauce/capybara.rb
 - lib/sauce/client.rb
 - lib/sauce/config.rb
@@ -200,13 +202,18 @@ files:
 - lib/sauce/heroku.rb
 - lib/sauce/integrations.rb
 - lib/sauce/job.rb
+- lib/sauce/parallel/test_broker.rb
+- lib/sauce/parallel/test_group.rb
 - lib/sauce/parallel.rb
 - lib/sauce/raketasks.rb
 - lib/sauce/selenium.rb
 - lib/sauce/utilities.rb
 - lib/sauce/version.rb
 - lib/sauce.rb
+- lib/tasks/parallel_testing.rb
 - spec/cucumber_helper.rb
+- spec/integration/connect/spec/spec_helper.rb
+- spec/integration/connect/spec/start_tunnel_spec.rb
 - spec/integration/connect_integration_spec.rb
 - spec/integration/rspec/spec/integration_spec.rb
 - spec/integration/rspec/spec/selenium/selenium_directory_spec.rb
@@ -215,14 +222,15 @@ files:
 - spec/integration/rspec/spec/tagging/selenium_tagging_spec.rb
 - spec/integration/testunit/test/capybara_integration_test.rb
 - spec/integration/testunit/test/integration_test.rb
+- spec/parallel_tests/sauce_rspec_runner_spec.rb
 - spec/sauce/capybara_spec.rb
 - spec/sauce/config_spec.rb
 - spec/sauce/cucumber_spec.rb
 - spec/sauce/driver_pool_spec.rb
 - spec/sauce/jasmine_spec.rb
+- spec/sauce/parallel/test_broker_spec.rb
 - spec/sauce/selenium_spec.rb
-- spec/sauce/test_unit_spec.rb
-- spec/sauce/utilities_spec.rb
+- spec/sauce_helper.rb
 - spec/spec_helper.rb
 - bin/sauce
 homepage: http://github.com/sauce-labs/sauce_ruby
@@ -239,9 +247,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -250,6 +258,8 @@ specification_version: 4
 summary: A Ruby helper for running tests in Sauce Labs
 test_files:
 - spec/cucumber_helper.rb
+- spec/integration/connect/spec/spec_helper.rb
+- spec/integration/connect/spec/start_tunnel_spec.rb
 - spec/integration/connect_integration_spec.rb
 - spec/integration/rspec/spec/integration_spec.rb
 - spec/integration/rspec/spec/selenium/selenium_directory_spec.rb
@@ -258,12 +268,13 @@ test_files:
 - spec/integration/rspec/spec/tagging/selenium_tagging_spec.rb
 - spec/integration/testunit/test/capybara_integration_test.rb
 - spec/integration/testunit/test/integration_test.rb
+- spec/parallel_tests/sauce_rspec_runner_spec.rb
 - spec/sauce/capybara_spec.rb
 - spec/sauce/config_spec.rb
 - spec/sauce/cucumber_spec.rb
 - spec/sauce/driver_pool_spec.rb
 - spec/sauce/jasmine_spec.rb
+- spec/sauce/parallel/test_broker_spec.rb
 - spec/sauce/selenium_spec.rb
-- spec/sauce/test_unit_spec.rb
-- spec/sauce/utilities_spec.rb
+- spec/sauce_helper.rb
 - spec/spec_helper.rb

data/spec/sauce/test_unit_spec.rb

@@ -1,8 +0,0 @@
-require "spec_helper"
-
-describe "Sauce::Test::Unit" do
-
-  it "should add a driver to the pool" do
-
-  end
-end

data/spec/sauce/utilities_spec.rb

@@ -1,82 +0,0 @@
-require "spec_helper"
-
-describe "Sauce::Utilities::Connect" do
-
-  before :each do
-    @mock_tunnel = double(Sauce::Connect.new)
-  end
-
-  after :each do
-    Sauce::Utilities::Connect.instance_variable_set(:@tunnel, nil)
-  end
-  describe "##start" do
-    it "should call Sauce Connect when included" do
-      @mock_tunnel.stub(:connect).and_return true
-      @mock_tunnel.stub(:wait_until_ready).and_return true
-      Sauce::Connect.should_receive(:new).with(anything) {@mock_tunnel}
-      Sauce::Utilities::Connect.start
-    end
-
-    it "should throw an exception when Sauce Connect is not included" do
-      Object.should_receive(:require).with("sauce/connect").and_raise LoadError
-
-      lambda {Sauce::Utilities::Connect.start}.should raise_error SystemExit
-    end
-
-    it "should connect the new tunnel" do
-      Sauce::Connect.rspec_reset
-      @mock_tunnel.should_receive(:connect).with().and_return(true)
-      @mock_tunnel.should_receive(:wait_until_ready).and_return(true)
-
-      Sauce::Connect.stub!(:new).with(anything).and_return @mock_tunnel
-
-      Sauce::Utilities::Connect.start
-    end
-
-    it "should return the tunnel when done" do
-      @mock_tunnel.stub(:connect).and_return true
-      @mock_tunnel.stub(:wait_until_ready).and_return true
-      Sauce::Connect.should_receive(:new).with(anything) {@mock_tunnel}
-      tunnel = Sauce::Utilities::Connect.start
-      tunnel.should be @mock_tunnel
-    end
-
-    it "only opens one tunnel" do
-      @mock_tunnel.stub(:connect).and_return true
-      @mock_tunnel.stub(:wait_until_ready).and_return true
-      Sauce::Connect.should_receive(:new).with(anything) {@mock_tunnel}
-      tunnel = Sauce::Utilities::Connect.start
-
-      tunnel_2 = Sauce::Utilities::Connect.start
-
-      tunnel.should be tunnel_2
-    end
-  end
-
-  describe "#close" do
-    it "makes the tunnel nil when terminated" do
-      @mock_tunnel.stub(:connect).and_return true
-      @mock_tunnel.stub(:wait_until_ready).and_return true
-      @mock_tunnel.should_receive(:disconnect).and_return true
-      Sauce::Connect.stub(:new).with(anything) {@mock_tunnel}
-      Sauce::Utilities::Connect.start
-
-      Sauce::Utilities::Connect.close
-      Sauce::Utilities::Connect.instance_variable_get(:@tunnel).should be nil
-    end
-
-    it "calls disconnect" do
-      @mock_tunnel.stub(:connect).and_return true
-      @mock_tunnel.stub(:wait_until_ready).and_return true
-      @mock_tunnel.should_receive(:disconnect).and_return true
-      Sauce::Connect.stub(:new).with(anything) {@mock_tunnel}
-      tunnel = Sauce::Utilities::Connect.start
-
-      Sauce::Utilities::Connect.close
-    end
-
-    it "does not error if no tunnel exists" do
-      Sauce::Utilities::Connect.close
-    end
-  end
-end