sauce 3.0.2 → 3.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTE4ZGI3MzRiMmI0NGU4Yzc0NmI4MWJlYWNlMmVjYjFjNzIzZDAzZQ==
+    ZjY3NGFkODI1MThlZGQyZGFiODkzZTQ3NWIzYTI2NDg1ODU4MmVhZQ==
   data.tar.gz: !binary |-
-    NmFiNDAxZDFiYTEyMzc5NDI0OWNkODk0NGExODRjM2ZkZjE1NjBjMw==
+    ZjkzM2U3NjRlMmY0MTk4ZjFmMGFmYjZlZDI4OGI0ZmE3NmJlZjc3Yw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OWUyODZjYTViY2FkODk0MWM0OWUwMWQyNzc5ZGEyMmJiNDczZjU5ODMwYzhm
-    M2UzNjcwNTNkNjIxZDBjZjkzMjExZDk1NGQxMWM1MWFjOTQ5MmQwMDIyYjgw
-    NzUzMGVjYTBiOWE5N2ZhNWVkY2VmZjgyNzFmZmMxNTc0ZTQ0NzY=
+    NjM0Mjg5YjJhMGZhOTc1Nzk1N2YzYTM5YjQ2NWJlNDg4NDA0YjA0ZDJjMDNj
+    N2FkMzYxYWY1YmZiMGZiYTljZDhiYzZjZGRhMzg3NzE0NzVmZjllYTc1NTM5
+    ZDJjMDM0NTI0MTZkZDAxYjhmZWQ2NTEyMTMyYjI4NWYwZTVlOTg=
   data.tar.gz: !binary |-
-    OWRkZWE4Y2U4MGNmZmQ4ZDczM2FhOTM3MWMwZDdmYzIzYTQ4YjMxYzBlNzNj
-    MzNmMGFhMDc2ODdkNTcxZDA0NDlhZTg5Mzg1YzVmZDFmNjQ0NDVmNDJmOGE3
-    OGU1OWFlNTIyY2IyMWVhZGIwYWMyYmIwY2ViNzg2MDMwOWNjODc=
+    MjRhOWNjY2JkYzY5N2RhZjNkYzU5YjUxOTQ0NjkzYmE3YWQ5ZGNhNWE4MTll
+    NDM2YTJiODc1OTY3ZmM0YTUwMmE2YzE3ZDczNWU0NWE0NGIzNjQ2MThkZDA4
+    Yzg5MTc1MDczNWQxOWYwNWY5NmY2NDM0YWRhNjQ0MjA3NzQxZWY=

data/lib/parallel_tests/cli_patch.rb

@@ -5,10 +5,12 @@ module ParallelTests
 
       report_time_taken do
         groups = @runner.tests_in_groups(options[:files], num_processes, options)
-        Sauce::TestBroker.test_groups = groups
-        report_number_of_tests(groups)
+        non_empty_groups = groups.reject {|group| group.empty?}
+        Sauce::TestBroker.test_groups = non_empty_groups
 
-        test_results = execute_in_parallel(groups, groups.size, options) do |group|
+        report_number_of_tests(non_empty_groups)
+
+        test_results = execute_in_parallel(non_empty_groups, non_empty_groups.size, options) do |group|
           run_tests(group, Sauce::TestBroker.group_index(group), num_processes, options)
         end
 

data/lib/sauce.rb

@@ -1,5 +1,6 @@
 require 'sauce/version'
 require 'sauce/utilities'
+require 'sauce/utilities/rake'
 require 'sauce/job'
 require 'sauce/client'
 require 'sauce/config'

data/lib/sauce/config.rb

@@ -7,8 +7,9 @@ module Sauce
     yield get_config
   end
 
-  def self.get_config
-    @cfg ||= Sauce::Config.new(false)
+  def self.get_config(default = false)
+    get_default = default == :default ? {} : false
+    @cfg ||= Sauce::Config.new(get_default)
   end
 
   def self.clear_config
@@ -22,9 +23,6 @@ module Sauce
         :host => "ondemand.saucelabs.com",
         :port => 80,
         :browser_url => "http://saucelabs.com",
-        :os => "Windows 2003",
-        :browser => "firefox",
-        :browser_version => "3.6.",
         :job_name => "Unnamed Ruby job",
         :local_application_port => "3001",
         :capture_traffic => false,
@@ -32,6 +30,15 @@ module Sauce
         :start_local_application => true
     }
 
+    DEFAULT_BROWSERS = {
+        :browsers => [
+          ["Windows 8", "Internet Explorer", "10"],
+          ["Windows 7", "Firefox", "20"],
+          ["OS X 10.8", "Safari", "6"],
+          ["Linux", "Chrome", nil]
+        ]
+    }
+
     ENVIRONMENT_VARIABLES = %w{SAUCE_HOST SAUCE_PORT SAUCE_BROWSER_URL SAUCE_USERNAME
         SAUCE_ACCESS_KEY SAUCE_OS SAUCE_BROWSER SAUCE_BROWSER_VERSION SAUCE_JOB_NAME
         SAUCE_FIREFOX_PROFILE_URL SAUCE_USER_EXTENSIONS_URL
@@ -56,6 +63,7 @@ module Sauce
       @undefaulted_opts = {}
       if opts != false
         @opts.merge! DEFAULT_OPTIONS
+        @opts.merge! DEFAULT_BROWSERS
 
         @undefaulted_opts.merge! load_options_from_yaml
         @undefaulted_opts.merge! load_options_from_environment
@@ -71,6 +79,7 @@ module Sauce
     end
 
     def []=(key, value)
+      @undefaulted_opts.merge!({key => value})
       @opts[key] = value
     end
 
@@ -134,6 +143,7 @@ module Sauce
         # 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

data/lib/sauce/integrations.rb

@@ -97,11 +97,11 @@ begin
             })
         ::RSpec.configuration.include(self, :sauce => true)
 
-        ::RSpec.configuration.before(:suite, sauce: true) do
+        ::RSpec.configuration.before(:suite, :sauce => true) do
 
           config = Sauce::Config.new
           if config[:application_host]
-            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80)
+            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80, :quiet => true)
           end
 
           if config[:start_local_application] &&
@@ -124,7 +124,7 @@ begin
           end
 
           if need_tunnel || config[:start_tunnel]
-            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80)
+            Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port] || 80, :quiet => true)
           end
 
           if config[:start_local_application] &&

data/lib/sauce/utilities.rb

@@ -115,5 +115,6 @@ module Sauce
         end
       end
     end
+
   end
 end

data/lib/sauce/utilities/rake.rb

@@ -0,0 +1,27 @@
+module Sauce
+  module Utilities
+    module Rake
+
+      def self.sauce_helper
+        helper_text = <<-ENDHEADER
+# You should edit this file with the browsers you wish to use
+# For options, check out http://saucelabs.com/docs/platforms
+require "sauce"
+        ENDHEADER
+
+        helper_text << "require \"sauce/capybara\"" if Object.const_defined? "Capybara"
+        helper_text << <<-ENDFILE
+
+Sauce.config do |config|
+  config[:browsers] = [
+    ["OS", "BROWSER", "VERSION"],
+    ["OS", "BROWSER", "VERSION"]
+  ]
+end
+        ENDFILE
+
+        return helper_text
+      end
+    end
+  end
+end

data/lib/sauce/version.rb

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

data/lib/tasks/parallel_testing.rb

@@ -66,19 +66,7 @@ namespace :sauce do
       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/docs/platforms
-  require "sauce"
-
-  Sauce.config do |config|
-    config[:browsers] = [
-      ["OS", "BROWSER", "VERSION"],
-      ["OS", "BROWSER", "VERSION"]
-    ]
-  end
-  ENDFILE
-          )
+          f.write(Sauce::Utilities::Rake.sauce_helper)
         end
       else
         STDERR.puts "WARNING - sauce_helper has already been created."

data/spec/sauce/config/config_spec.rb

@@ -280,29 +280,6 @@ describe Sauce::Config do
       c.some_option?.should be true
     end
 
-    describe 'browsers=' do
-      it 'should default the config to the first item' do
-        Sauce.config do |config|
-          config[:browsers] = [['TEST_OS', 'TEST_BROWSER', 'TEST_BROWSER_VERSION']]
-        end
-
-        c = Sauce::Config.new
-        c.os.should == 'TEST_OS'
-        c.browser.should == 'TEST_BROWSER'
-        c.browser_version == 'TEST_BROWSER_VERSION'
-      end
-    end
-
-    describe 'browsers' do
-      it 'should return an Array of the (os, browser, version)' do
-        c.os = 'A'
-        c.browser = 'B'
-        c.browser_version = 'C'
-
-        c.browsers.should == [['A', 'B', 'C']]
-      end
-    end
-
     it 'should allow overrides as constructor options' do
       Sauce.config do |config|
         config[:browsers] = [['OS1', 'BROWSER1', 'BROWSER_VERSION1']]

data/spec/sauce/config/default_browsers_spec.rb

@@ -0,0 +1,46 @@
+require "rspec"
+
+describe "Sauce::Config :browsers" do
+  before :each do
+    Sauce.clear_config
+  end
+
+  context "When unset" do
+    it "defaults to the tutorial browsers" do
+      tutorial_browsers = [
+        ["Windows 8", "Internet Explorer", "10"],
+        ["Windows 7", "Firefox", "20"],
+        ["OS X 10.8", "Safari", "6"],
+        ["Linux", "Chrome", nil]
+      ]
+
+      Sauce::Config.new[:browsers].should eq tutorial_browsers
+    end
+  end
+
+  context "When set" do
+    before :each do
+      Sauce.clear_config
+
+      Sauce.config do |config|
+        config[:browsers] = [['TEST_OS', 'TEST_BROWSER', 'TEST_BROWSER_VERSION']]
+      end
+    end
+
+    it 'should default the config to the first item' do
+      c = Sauce::Config.new
+      c.os.should == 'TEST_OS'
+      c.browser.should == 'TEST_BROWSER'
+      c.browser_version == 'TEST_BROWSER_VERSION'
+    end
+
+    it 'should return an Array of the (os, browser, version)' do
+      c = Sauce::Config.new
+      c[:os] = 'A'
+      c[:browser] = 'B'
+      c[:browser_version] = 'C'
+
+      c.browsers.should == [['A', 'B', 'C']]
+    end
+  end
+end

data/spec/sauce/config/load_defaults_spec.rb

@@ -0,0 +1,18 @@
+require "spec_helper"
+
+describe "Sauce" do
+  before :each do
+    Sauce.clear_config
+  end
+
+  describe "#get_config" do
+    it "returns an empty config by default" do
+      Sauce.get_config.opts.should eq Sauce::Config.new(false).opts
+    end
+
+    it "Can return default options" do
+      Sauce.get_config(:default).opts.should eq Sauce::Config.new().opts
+      Sauce.get_config(:default).opts.length.should_not eq 0
+    end
+  end
+end

data/spec/sauce/utilities/rake_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe Sauce::Utilities::Rake do
+
+  describe "#create_sauce_helper" do
+    after :all do
+      Object.rspec_reset
+    end
+
+    context "with Capybara" do
+      before :all do
+        Object.stub(:const_defined?).with("Capybara").and_return true
+      end
+
+      it "includes the browser block" do
+        Sauce::Utilities::Rake.sauce_helper.should include browser_block
+      end
+
+      it "includes the require for sauce" do
+        Sauce::Utilities::Rake.sauce_helper.should include "require \"sauce\""
+      end
+
+      it "does not include Capybara" do
+        Sauce::Utilities::Rake.sauce_helper.should include "require \"sauce/capybara\""
+      end
+    end
+
+    context "without Capybara" do
+      before :all do
+        Object.stub(:const_defined?).with("Capybara").and_return false
+      end
+
+      it "includes the require for sauce/capybara" do
+        Sauce::Utilities::Rake.sauce_helper.should_not include "require \"sauce/capybara\""
+      end
+    end
+  end
+
+  def browser_block
+    return <<-ENDFILE
+Sauce.config do |config|
+  config[:browsers] = [
+    ["OS", "BROWSER", "VERSION"],
+    ["OS", "BROWSER", "VERSION"]
+  ]
+end
+    ENDFILE
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.4
 platform: ruby
 authors:
 - Dylan Lacey
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2013-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -187,16 +187,16 @@ dependencies:
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.8
 description: A Ruby helper for running tests in Sauce Labs' browser testing cloud
   service
 email: help@saucelabs.com
@@ -222,6 +222,7 @@ files:
 - lib/sauce/parallel.rb
 - lib/sauce/raketasks.rb
 - lib/sauce/selenium.rb
+- lib/sauce/utilities/rake.rb
 - lib/sauce/utilities.rb
 - lib/sauce/version.rb
 - lib/sauce.rb
@@ -240,13 +241,16 @@ files:
 - spec/parallel_tests/sauce_rspec_runner_spec.rb
 - spec/sauce/capybara_spec.rb
 - spec/sauce/config/config_spec.rb
+- spec/sauce/config/default_browsers_spec.rb
 - spec/sauce/config/environment_config_spec.rb
+- spec/sauce/config/load_defaults_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/utilities/rake_spec.rb
+- spec/sauce/utilities/utilities_spec.rb
 - spec/sauce_helper.rb
 - spec/spec_helper.rb
 - bin/sauce
@@ -288,12 +292,16 @@ test_files:
 - spec/parallel_tests/sauce_rspec_runner_spec.rb
 - spec/sauce/capybara_spec.rb
 - spec/sauce/config/config_spec.rb
+- spec/sauce/config/default_browsers_spec.rb
 - spec/sauce/config/environment_config_spec.rb
+- spec/sauce/config/load_defaults_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/utilities/rake_spec.rb
+- spec/sauce/utilities/utilities_spec.rb
 - spec/sauce_helper.rb
 - spec/spec_helper.rb
+has_rdoc: