sauce 3.0.0.beta.2 → 3.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MWU4Y2I5MTU4YTZmNGYyODc2OTFjZjFjM2U5NTI4M2VlZjgxZTlmMw==
+    NTM3Y2Y1ZDY0MjBjZWUxYjU4YWExNTBjNDI3M2NjNjA5OWVmNjJlZA==
   data.tar.gz: !binary |-
-    ZDExNzRjOWJhZTIzZDczYjdiZDg4ZTc3YzZkZmVhZDQ1OGZkMWU5Yw==
+    Yzg4ZmE2NjcyYTcyYTdmMGRlYTViYzk0YjRkMjY1ZjQ4MzZjMzMxMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzQ0OWE1MTYyZjQzMThlMTBhMjAxZjBiZDNmYzI3Zjc3MDY3NDAxNTAwMGJm
-    MGYwN2RkMmYyN2RiOTRlOWMzMzI1NTBkYTAzNjBkYjY4YWVlOTkzMzdhNGYw
-    NzBmN2JhNWZhYWYxNjFlNTA2MDlmNWYwNzgwNzgyM2NmMTQxOGY=
+    YjZhNGY0MzA3NTU2MjI3NWFjMDMxYjBhY2ZjOWMxNDQ3M2ViNDAzZjI5YTc3
+    ZTNmNDJmNTg4OWQ5NWI4OTUwNGU0MTZkZmNkYjIzNDFkNzExYjVkMWQyZWFk
+    N2Y3NDVlNzdjOWI2NTMyMzdjNTMxNzUwOWRhNDEwMzNlZWM4NDg=
   data.tar.gz: !binary |-
-    Njk2NWFhNmJmYzA2ZDRkNWNhMTg2MDUzMGI1NzM5MjBkODBjMDg3NzRiZjA0
-    OTQxM2FiMGYyNTE4MTUxNWZhMzc2MzU4NTM4ZjhiZTRjMmQ3OTAyYzUyOGI2
-    N2VhY2U4Y2UxYTAzNTQ3OWEyNGJmNWQxNzQwZGY1ODdlNjkxYzU=
+    MmY4MDVmODIwNDBhZjU3MzQxY2ZhODU1M2IwNDY0ZmNhZjg2MTBjZTBkZTU0
+    M2RlMjRlMTRjMjZjMWM1NWNiNWQ5NGE4NmNhM2I1NzdmZWQ2MmI2MGE5ZGVm
+    NjQ1YjA0NDdiNjIxYzlkZmU4ZTAwOWFlYWQxZDM4MWIzMzcwZTE=

data/lib/parallel_tests/saucecucumber/runner.rb

@@ -0,0 +1,44 @@
+require "parallel_tests/cucumber/runner"
+
+module ParallelTests
+  module Saucecucumber
+    class Runner < ParallelTests::Cucumber::Runner
+
+      def self.run_tests(test_files, process_number, num_processes, options)
+        options = options.dup
+        sanitized_test_files = test_files.map { |val| Shellwords.escape(val) }
+        env = Sauce::TestBroker.next_environment(test_files)
+        env.merge!({"AUTOTEST" => "1"}) if $stdout.tty? # display color when we are in a terminal
+        options.merge!({:env => env})
+        runtime_logging = " --format ParallelTests::Cucumber::RuntimeLogger --out #{runtime_log}"
+        cmd = [
+            executable,
+            (runtime_logging if File.directory?(File.dirname(runtime_log))),
+            cucumber_opts(options[:test_options]),
+            *sanitized_test_files
+        ].compact.join(" ")
+        execute_command(cmd, process_number, num_processes, options)
+      end
+
+      def self.tests_in_groups(tests, num_groups, options={})
+        originals = (options[:group_by] == :steps) ? Grouper.by_steps(find_tests(tests, options), num_groups, options) : super
+        all_tests = originals.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/parallel_tests/saucerspec/runner.rb

@@ -6,13 +6,14 @@ module ParallelTests
     class Runner < ParallelTests::RSpec::Runner
 
       def self.run_tests(test_files, process_number, num_processes, options)
+        our_options = options.dup
         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(" ")
+        cmd = [exe, our_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)
+        our_options.merge!(:env => env)
+        execute_command(cmd, process_number, num_processes, our_options)
       end
 
 

data/lib/sauce.rb

@@ -7,6 +7,7 @@ require 'sauce/selenium'
 require 'sauce/integrations'
 require 'tasks/parallel_testing'
 require 'parallel_tests/saucerspec/runner'
+require 'parallel_tests/saucecucumber/runner'
 
 # Ruby before 1.9.3-p382 does not handle exit codes correctly when nested
 if RUBY_VERSION == "1.9.3" && RUBY_PATCHLEVEL < 392

data/lib/sauce/capybara.rb

@@ -9,24 +9,6 @@ $sauce_tunnel = nil
 
 module Sauce
   module Capybara
-    def connect_tunnel(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
-
     class Driver < ::Capybara::Selenium::Driver
       RETRY_ON = [::Selenium::WebDriver::Error::UnhandledError,
                   ::Selenium::WebDriver::Error::UnknownError]
@@ -99,11 +81,9 @@ module Sauce
           unless @browser
 
             @browser = Sauce::Selenium2.new
-            # This at_exit call is causing failed rspec tests to exit(0).
-            # Should remain disabled until it's fixed.
-            # at_exit do
-            #   finish!
-            # end
+            at_exit do
+              finish!
+            end
           end
         end
         @browser

data/lib/sauce/config.rb

@@ -74,6 +74,10 @@ module Sauce
       @opts[key] = value
     end
 
+    def has_key?(key)
+      @opts.has_key? key
+    end
+
     def silence_warnings
       false
     end
@@ -130,6 +134,16 @@ module Sauce
       return [[os, browser, browser_version]]
     end
 
+    def browsers_for_file(file)
+      if @opts[:perfile_browsers]
+        @opts[:perfile_browsers][file].map do |h|
+          [h['os'], h['browser'], h['version']]
+        end
+      else
+        browsers
+      end
+    end
+
     def browser
       if @undefaulted_opts[:browser]
         return @undefaulted_opts[:browser]
@@ -264,39 +278,38 @@ module Sauce
 
     def extract_options_from_hash(env)
       opts = {}
-      opts[:host] = env['SAUCE_HOST']
-      opts[:port] = env['SAUCE_PORT']
-      opts[:browser_url] = env['SAUCE_BROWSER_URL']
 
-      opts[:username] = env['SAUCE_USERNAME'] || env['SAUCE_USER_NAME']
-      opts[:access_key] = env['SAUCE_ACCESS_KEY'] || env['SAUCE_API_KEY']
+      on_demand = env.delete "SAUCE_ONDEMAND_BROWSERS"
+      env_browsers = env.delete "SAUCE_BROWSERS"
 
-      opts[:os] = env['SAUCE_OS']
-      opts[:browser] = env['SAUCE_BROWSER']
-      opts[:browser_version] = env['SAUCE_BROWSER_VERSION']
+      env.select {|k,v| k.start_with? "SAUCE_"}.each do |k,v|
+        opts[k.downcase.sub("sauce_", "").to_sym] = v
+      end
 
       opts[:job_name] = env['SAUCE_JOB_NAME'] || env['JOB_NAME']
-      opts[:build] = (env['BUILD_NUMBER'] ||
+      opts[:build] = (env['BUILD_TAG'] ||
+                      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']
-
       if env.include? 'URL'
         opts['SAUCE_BROWSER_URL'] = "http://#{env['URL']}/"
       end
 
-      if env.include? 'SAUCE_ONDEMAND_BROWSERS'
-        browsers = JSON.parse(env['SAUCE_ONDEMAND_BROWSERS'])
+      if on_demand
+        browsers = JSON.parse(on_demand)
         opts[:browsers] = browsers.map { |x| [x['os'], x['browser'], x['browser-version']] }
       end
 
-      if env.include? 'SAUCE_BROWSERS'
-        browsers = JSON.parse(env['SAUCE_BROWSERS'])
+      if env_browsers
+        browsers = JSON.parse(env_browsers)
         opts[:browsers] = browsers.map { |x| [x['os'], x['browser'], x['version']] }
       end
 
+      if env.include? 'SAUCE_PERFILE_BROWSERS'
+        opts[:perfile_browsers] = JSON.parse(env['SAUCE_PERFILE_BROWSERS'])
+      end
+
       return opts.delete_if {|key, value| value.nil?}
     end
   end

data/lib/sauce/integrations.rb

@@ -19,9 +19,7 @@ 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.connect
-              @@tunnel.wait_until_ready
+              Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80)
             end
             if config[:start_local_application] &&
               Sauce::Utilities::RailsServer.is_rails_app?
@@ -32,7 +30,7 @@ begin
         end
 
         after :suite do
-          @@tunnel.disconnect if defined? @@tunnel
+          Sauce::Utilities::Connect.close
           @@server.stop if defined? @@server
         end
 
@@ -75,7 +73,8 @@ begin
           othermod.around do |the_test|
             config = Sauce::Config.new
             description = the_test.metadata[:full_description]
-            config.browsers.each do |os, browser, version|
+            file = the_test.metadata[:file_path]
+            config.browsers_for_file(file).each do |os, browser, version|
               @selenium = Sauce::Selenium2.new({:os => os,
                                                 :browser => browser,
                                                 :browser_version => version,
@@ -102,9 +101,7 @@ begin
 
           config = Sauce::Config.new
           if config[:application_host]
-            @@tunnel ||= Sauce::Connect.new(:host => config[:application_host], :port => config[:application_port] || 80)
-            @@tunnel.connect
-            @@tunnel.wait_until_ready
+            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80)
           end
 
           if config[:start_local_application] &&
@@ -127,9 +124,7 @@ begin
           end
 
           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
+            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80)
           end
 
           if config[:start_local_application] &&
@@ -142,7 +137,7 @@ begin
           end
         end
         ::RSpec.configuration.after :suite do
-          @@tunnel.disconnect if defined? @@tunnel
+          Sauce::Utilities::Connect.close
           @@server.stop if defined? @@server
         end
       end

data/lib/sauce/parallel/test_broker.rb

@@ -2,16 +2,34 @@ require "rest-client"
 require "json"
 require "yaml"
 require "sauce/parallel/test_group"
+require "thread"
 
 module Sauce
   class TestBroker
-   
-    def self.next_environment(group)
-      unless test_groups.has_key? group
-        test_groups[group] = TestGroup.new(self.test_platforms)
+
+    def self.reset
+      if defined? @@platforms
+        remove_class_variable(:@@platforms)
       end
+      @groups = {}
+    end
 
-      test_groups[group].next_platform
+    def self.environment_mutex
+      @@m ||= Mutex.new
+    end
+
+    def self.next_environment(group)
+      environment_mutex.synchronize do
+        browsers = {}
+        group.each do |file|
+          file = "./" + file
+          test_groups[file] ||= TestGroup.new(self.test_platforms)
+          browsers[file] ||= []
+          browsers[file] << test_groups[file].next_platform
+        end
+
+        return {:SAUCE_PERFILE_BROWSERS => "'" + JSON.generate(browsers) + "'"}
+      end
     end
 
     def self.test_groups
@@ -37,8 +55,7 @@ module Sauce
     def self.test_platforms
       unless defined? @@platforms
         load_sauce_config
-        brokers = Sauce.get_config
-        @@platforms ||= brokers[:browsers]
+        @@platforms ||= Sauce.get_config[:browsers]
       end
       @@platforms
     end
@@ -53,11 +70,25 @@ module Sauce
     end
 
     def self.load_sauce_config
-      if File.exists? "./spec/sauce_helper.rb"
-        require "./spec/sauce_helper"
-      else
-        require "./spec/spec_helper"
+      begin
+        if File.exists? "./spec/sauce_helper.rb"
+          require "./spec/sauce_helper"
+        else
+          require "./spec/spec_helper"
+        end
+      rescue LoadError => e
+        # Gross, but maybe theyre using Cuke
+        begin
+          if File.exists? "./features/support/sauce_helper.rb"
+            require "./features/support/sauce_helper"
+          else
+            raise LoadError "Can't find sauce_helper, please add it in ./features/support/sauce_helper.rb"
+          end
+        rescue LoadError => e
+          #WHO KNOWS
+        end
       end
+
     end
 
     SAUCE_USERNAME = ENV["SAUCE_USERNAME"]

data/lib/sauce/parallel/test_group.rb

@@ -7,12 +7,12 @@ module Sauce
 
     def next_platform
       platform = @platforms[@index]
+      @index += 1
       begin
-        @index = @index + 1
         {
-          :SAUCE_OS => "'#{platform[0]}'",
-          :SAUCE_BROWSER => "'#{platform[1]}'",
-          :SAUCE_BROWSER_VERSION => "'#{platform[2]}'"
+          'os' => platform[0],
+          'browser' => platform[1],
+          'version' => platform[2]
         }
       rescue NoMethodError => e
         puts "I don't have any config"

data/lib/sauce/utilities.rb

@@ -3,6 +3,7 @@ require 'socket'
 require 'childprocess'
 require 'net/http'
 require 'childprocess/process'
+require 'sauce/parallel'
 
 module Sauce
   module Utilities
@@ -31,6 +32,40 @@ module Sauce
       end
     end
 
+    class Connect
+      def self.start(options={})
+        begin
+          require "sauce/connect"
+        rescue LoadError => e
+          STDERR.puts 'Please install the `sauce-connect` gem if you intend on using Sauce Connect with your tests!'
+          exit(1)
+        end
+
+        if ParallelTests.first_process?
+          unless @tunnel
+            @tunnel = Sauce::Connect.new options
+            @tunnel.connect
+            @tunnel.wait_until_ready
+          end
+            @tunnel
+        else
+          while not File.exist? "sauce_connect.ready"
+            sleep 0.5
+          end
+        end
+      end
+
+      def self.close
+        if @tunnel
+          if ParallelTests.first_process?
+            ParallelTests.wait_for_other_processes_to_finish
+            @tunnel.disconnect
+            @tunnel = nil
+          end
+        end
+      end
+    end
+
     class RailsServer
       include Sauce::Utilities
 

data/lib/sauce/version.rb

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

data/lib/tasks/parallel_testing.rb

@@ -4,59 +4,85 @@ require "parallel_tests/tasks"
 require "parallel_tests/cli_patch"
 
 namespace :sauce do
-  task :spec, :arg1 do |t, args|
-
+  task :spec, :files, :concurrencies do |t, args|
     ::RSpec::Core::Runner.disable_autorun!
 
-    args.with_defaults(:arg1 => [Sauce::TestBroker.concurrencies, 20].min)
-    concurrency = args[:arg1]
+    args.with_defaults({
+      :concurrencies => [Sauce::TestBroker.concurrencies, 20].min,
+      :files => "spec"
+    })
     ParallelTests::CLI.new.run(["--type", "saucerspec",
-                                "-n", "#{concurrency}",
-                                "spec"])
+                                "-n", "#{args[:concurrencies]}",
+                                "#{args[:files]}"])
   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"
+  task :features, :files, :concurrency  do |t, args|
+    args.with_defaults({
+      :concurrency => [Sauce::TestBroker.concurrencies, 20].min,
+      :files => "features"
+    })
+    ParallelTests::CLI.new.run(["--type", "saucecucumber", args[:files],
+                                  "-n", args[:concurrency].to_s])
+  end
+
+  namespace :install do
+    task :features do
+      Rake::Task["sauce:install:create_helper"].execute(:helper_type => :features)
+      puts <<-ENDLINE
+  The Sauce gem is now installed!
+
+  Next steps:
+
+  1.  Edit features/support/sauce_helper.rb with your required platforms
+  2.  Set the SAUCE_USERNAME and SAUCE_ACCESS_KEY environment variables
+  3.  Run your tests with 'rake sauce:features'
+
+      ENDLINE
     end
-    puts <<-ENDLINE
-The Sauce gem is now installed!
+    task :spec do
+      Rake::Task["sauce:install:create_helper"].execute(:helper_type => :spec)
+      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:
+  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'
+  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
+      ENDLINE
+    end
+
+    task :create_helper, [:helper_type] do |t, args|
+      path = args[:helper_type].to_sym == :features ? "features/support/sauce_helper.rb" : "spec/sauce_helper.rb"
+      unless File.exists? path
+        File.open(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"
 
-  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
-        )
+  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
-    else
-      STDERR.puts "WARNING - sauce_helper has already been created."
     end
   end
-end
+end

data/spec/integration/rspec/spec/selenium/selenium_directory_spec.rb

@@ -26,7 +26,7 @@ describe "Specs in the Selenium Directory" do
   end
 
   it "should be using Sauce Connect" do
-    Sauce::RSpec::SeleniumExampleGroup.class_variable_defined?(:@@tunnel).should be_true
+    Sauce::Utilities::Connect.instance_variable_get(:@tunnel).should_not be_nil
   end
 end
 

data/spec/integration/rspec/spec/tagging/selenium_tagging_spec.rb

@@ -25,7 +25,7 @@ describe "Specs with the @sauce tag", :sauce => true do
   end
 
   it "should be using Sauce Connect" do
-    Sauce::RSpec::SeleniumExampleGroup.class_variable_defined?(:@@tunnel).should be_true
+    Sauce::Utilities::Connect.instance_variable_get(:@tunnel).should_not be_nil
   end
 end
 

data/spec/sauce/capybara_spec.rb

@@ -3,38 +3,9 @@ require 'sauce/capybara'
 require 'sauce/connect'
 
 describe Sauce::Capybara do
-  describe '#connect_tunnel' do
-    before :each do
-      $sauce_tunnel = nil
-    end
-
-    let(:connector) do
-      connector = double()
-      connector.should_receive(:connect)
-      connector.should_receive(:wait_until_ready)
-      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).and_return(connector)
 
-      Sauce::Capybara.connect_tunnel
-    end
-
-    it 'should pass the quiet option to Sauce::Connect' do
-      Sauce::Connect.should_receive(:new).with(
-                    hash_including(:quiet => true)).and_return(connector)
-      Sauce::Capybara.connect_tunnel(:quiet => true)
-    end
-
-    after :each do
-      $sauce_tunnel = nil
-    end
+  after :each do
+    Sauce::Utilities::Connect.instance_variable_set(:@tunnel, false)
   end
 
   describe Sauce::Capybara::Driver do

data/spec/sauce/{config_spec.rb → config/config_spec.rb}

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require 'sauce/config'
 
 describe Sauce::Config do
@@ -92,7 +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'
+      ENV['BUILD_TAG'] = 'test env build'
 
       config = Sauce::Config.new
       browser_data = JSON.parse(config.to_browser_string)
@@ -112,7 +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'
+      ENV['BUILD_TAG'] = 'test env build'
 
       config = Sauce::Config.new
       browser_data = JSON.parse(config.to_browser_string)

data/spec/sauce/config/environment_config_spec.rb

@@ -0,0 +1,83 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'sauce/config'
+
+describe "Sauce::Config" do
+  describe "#extract_options_from_hash" do
+    let(:test_options) {
+      {
+        "SAUCE_USERNAME" => "user",
+        "SAUCE_ACCESS_KEY" => "ac",
+        "SAUCE_APPLICATION_HOST" => "application_host"
+      }
+    }
+
+    let(:test_config) {Sauce::Config.new}
+
+    it "should set any options starting with SAUCE" do
+      test_config
+      opts = test_config.send(:extract_options_from_hash, test_options)
+
+      opts[:username].should eq "user"
+      opts[:application_host].should eq "application_host"
+    end
+
+    context "when passed build numbers" do
+      it "should accept BUILD_NUMBER" do
+        opts = test_config.send(:extract_options_from_hash, {"BUILD_NUMBER" => "build"})
+        opts[:build].should eq "build"
+      end
+
+      it "should accept TRAVIS_BUILD_NUMBER" do
+        opts = test_config.send(:extract_options_from_hash, {"TRAVIS_BUILD_NUMBER" => "build"})
+        opts[:build].should eq "build"
+      end
+
+      it "should accept CIRCLE_BUILD_NUM" do
+        opts = test_config.send(:extract_options_from_hash, {"CIRCLE_BUILD_NUM" => "build"})
+        opts[:build].should eq "build"
+      end
+    end
+
+    context "when passed browsers in a json array keyed to SAUCE_ONDEMAND_BROWSERS" do
+      let(:browsers) {
+        { "SAUCE_ONDEMAND_BROWSERS" => [
+            {:os => "os1", :browser => "ie1", "browser-version" => "version1"},
+            {:os => "os2", :browser => "ie2", "browser-version" => "version2"}
+          ].to_json,
+          "SAUCE_BROWSER" => "not_browser",
+          "SAUCE_BROWSER_VERSION" => "not_version",
+          "SAUCE_OS" => "not_os"
+        }
+      }
+
+      it "should extract the browsers" do
+        opts = test_config.send(:extract_options_from_hash, browsers)
+        opts[:browsers].should eq([
+          ["os1", "ie1", "version1"],
+          ["os2", "ie2", "version2"]
+        ])
+      end
+    end
+
+    context "when passed browsers in a json array keyed to SAUCE_BROWSERS" do
+      let(:browsers) {
+        { "SAUCE_BROWSERS" => [
+            {:os => "os1", :browser => "ie1", "version" => "version1"},
+            {:os => "os2", :browser => "ie2", "version" => "version2"}
+        ].to_json,
+          "SAUCE_BROWSER" => "not_browser",
+          "SAUCE_BROWSER_VERSION" => "not_version",
+          "SAUCE_OS" => "not_os"
+        }
+      }
+
+      it "should extract the browsers" do
+        opts = test_config.send(:extract_options_from_hash, browsers)
+        opts[:browsers].should eq([
+          ["os1", "ie1", "version1"],
+          ["os2", "ie2", "version2"]
+        ])
+      end
+    end
+  end
+end

data/spec/sauce/cucumber_spec.rb

@@ -9,6 +9,10 @@ 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
@@ -66,6 +70,7 @@ module Sauce::Capybara
         # Need to create our nice mocked Capybara driver
         Capybara.stub_chain(:current_session, :driver).and_return(driver)
         Sauce::Job.stub(:new).and_return(nil)
+        Sauce::Selenium2.stub(:new).with(anything).and_return Object.new
       end
 
       context 'with a scenario outline' do
@@ -109,6 +114,53 @@ 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).with(anything).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/parallel/test_broker_spec.rb

@@ -1,3 +1,4 @@
+require "json"
 require "rspec"
 require "sauce/parallel/test_broker"
 
@@ -5,32 +6,65 @@ 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
+    before :each do
+      Sauce::TestBroker.reset
     end
 
-    it "returns the first environment for new entries" do
-      first_environment = Sauce::TestBroker.next_environment "spec/a_spec"
+    it "returns the first browser 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'"
+        :SAUCE_PERFILE_BROWSERS => (
+          "'" +
+          JSON.generate({"./spec/a_spec" => [{"os" => "Windows 7",
+                                              "browser" => "Opera",
+                                              "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"
+    it "only returns a browser once for a given file" do
+      Sauce::TestBroker.next_environment ["spec/a_spec"]
+      second_environment = Sauce::TestBroker.next_environment ["spec/a_spec"]
 
       second_environment.should eq({
-          :SAUCE_OS => "'Linux'",
-          :SAUCE_BROWSER => "'Firefox'",
-          :SAUCE_BROWSER_VERSION => "'19'"
+        :SAUCE_PERFILE_BROWSERS => (
+          "'" +
+          JSON.generate({"./spec/a_spec" => [{"os" => "Linux",
+                                              "browser" => "Firefox",
+                                              "version" => "19"}]}) +
+          "'")
+      })
+    end
+
+    it "returns multiple browsers for files given multiple times" do
+      first_environment = Sauce::TestBroker.next_environment ["spec/a_spec",
+                                                              "spec/a_spec"]
+      first_environment.should eq({
+        :SAUCE_PERFILE_BROWSERS => (
+          "'" +
+          JSON.generate({"./spec/a_spec" => [{"os" => "Windows 7",
+                                              "browser" => "Opera",
+                                              "version" => "10"},
+                                             {"os" => "Linux",
+                                              "browser" => "Firefox",
+                                              "version" => "19"}]}) +
+          "'")
+      })
+    end
+
+    it "uses the first browser for each of multiple files" do
+      first_environment = Sauce::TestBroker.next_environment ["spec/a_spec",
+                                                              "spec/b_spec"]
+      first_environment.should eq({
+        :SAUCE_PERFILE_BROWSERS => (
+          "'" +
+          JSON.generate({"./spec/a_spec" => [{"os" => "Windows 7",
+                                              "browser" => "Opera",
+                                              "version" => "10"}],
+                         "./spec/b_spec" => [{"os" => "Windows 7",
+                                              "browser" => "Opera",
+                                              "version" => "10"}]}) +
+          "'")
       })
     end
   end
@@ -40,4 +74,4 @@ describe Sauce::TestBroker do
       Sauce::TestBroker.test_platforms.should eq Sauce.get_config.browsers
     end
   end
-end
+end

data/spec/sauce/utilities_spec.rb

@@ -0,0 +1,87 @@
+require "spec_helper"
+require "sauce/connect"
+
+Sauce.config do |c|
+  c[:start_tunnel] = false
+end
+
+describe "Sauce::Utilities::Connect" do
+
+  before :each do
+    @mock_tunnel = double()
+  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

data/spec/sauce_helper.rb

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

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+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: 3.0.0.beta.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-02 00:00:00.000000000 Z
+date: 2013-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -29,6 +29,20 @@ 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
@@ -194,6 +208,7 @@ files:
 - lib/childprocess/process.rb
 - lib/generators/sauce/install/install_generator.rb
 - lib/parallel_tests/cli_patch.rb
+- lib/parallel_tests/saucecucumber/runner.rb
 - lib/parallel_tests/saucerspec/runner.rb
 - lib/sauce/capybara.rb
 - lib/sauce/client.rb
@@ -224,12 +239,14 @@ files:
 - 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/config/config_spec.rb
+- spec/sauce/config/environment_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/utilities_spec.rb
 - spec/sauce_helper.rb
 - spec/spec_helper.rb
 - bin/sauce
@@ -247,9 +264,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3
@@ -270,11 +287,13 @@ test_files:
 - 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/config/config_spec.rb
+- spec/sauce/config/environment_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/utilities_spec.rb
 - spec/sauce_helper.rb
 - spec/spec_helper.rb