sauce 3.4.1 → 3.4.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGMxNjkzMzRmZDEyYmNmZTZkZWYxMWIwYzIxNjkzYjA4MzE1NmM0MQ==
+    ZDU5ODZiYzVmMjMxMWFhMDUyOWIyNDEyMGU1OTIzMmRjNDE5MmIyMw==
   data.tar.gz: !binary |-
-    YzU3NmRmMWNjNTE2ZjhlZmYyYzQ0MGJkYzFmZjQ1MzA0ODM3ZWMyZg==
+    YjA1OTMzZjg1NzFlNjI4MzM1MWQ0MmVjNjhiMTM5NTJiZmM2MGNlZQ==
 SHA512:
   metadata.gz: !binary |-
-    M2JjMmJiNDFhYmE5NGM4OWM5NDM0ZTI0NzExMzUwNTNjZDIxY2Y0YzdiNWU4
-    Y2M4OGM3Y2FhNGFhMjYyMTRmNjYzZmI1YmFkNDllNmM5ZjIzZTJhNDU5MWU5
-    OWQxNDJlZWQ5OGM3NmFjNzJjNTJhYjBmNTM2OTdiMTVhYWJjODE=
+    YjUxZDJkMDI4Nzk0ZDRmZTZiN2M2OWM2NzYyYThhMzFhYzdiZDk2ZmUyOWZl
+    YTU2MGNjMjNhNTA0ZDAxY2YxNDcxZDJlYzM3OWNlM2Q1ODg1ZjM5NzQwNDA1
+    YzYyODkzYWEyMmRkYTA0YTM2MjAwMTA0ZDcxZThjZTFhMGY2NGM=
   data.tar.gz: !binary |-
-    MzI0NGVkYjg4ODJiMDljZWI0YmZkZTM3YjU2ZDlkZDFmNzQ4N2QwOGJjYjgz
-    YTI0MTM4ODNjYzM2MzFiNWY1YTI2MDUyNDJkZmZiNDZhNDhkMDdhZWMyY2U5
-    MmI4NzI4M2U5NDg1MzU1MjkxZTM1YzVkZmI4MmFiZTFjNmU1YzE=
+    NWM2ZWU3YjViNDZlNzMxN2I4MzcyYzkzNmM1YjlhMTg4MzEwMDU5OGYxYTNk
+    YmYwMDUxYTdjODJlZGJhMWUyYjM1MTk2OTBlMjczYjBiNGNkYjk3ZWJlZTVl
+    YjA3Zjk0NjhmOTcxMmEyODQ5MDU2MjJmMjM3NzhlMGI3YTY1YjE=

data/lib/sauce.rb

@@ -1,3 +1,9 @@
+if defined?(Rails)
+  require "sauce/railtie"
+else
+  require 'tasks/parallel_testing'
+end
+
 require 'sauce/version'
 require 'sauce/utilities'
 require 'sauce/utilities/rake'
@@ -7,10 +13,10 @@ require 'sauce/config'
 require 'sauce/selenium'
 require 'sauce/rspec'
 require 'sauce/test_unit'
-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
   module Kernel

data/lib/sauce/config.rb

@@ -344,23 +344,24 @@ module Sauce
     end
 
     def extract_options_from_hash(env)
+      hash = Hash[env]
       opts = {}
 
-      on_demand = env.delete "SAUCE_ONDEMAND_BROWSERS"
-      env_browsers = env.delete "SAUCE_BROWSERS"
+      on_demand = hash.delete "SAUCE_ONDEMAND_BROWSERS"
+      env_browsers = hash.delete "SAUCE_BROWSERS"
 
-      env.select {|k,v| k.start_with? "SAUCE_"}.each do |k,v|
+      hash.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_TAG'] ||
-                      env['BUILD_NUMBER'] ||
-                      env['TRAVIS_BUILD_NUMBER'] ||
-                      env['CIRCLE_BUILD_NUM'])
+      opts[:job_name] = hash['SAUCE_JOB_NAME'] || hash['JOB_NAME']
+      opts[:build] = (hash['BUILD_TAG'] ||
+                      hash['BUILD_NUMBER'] ||
+                      hash['TRAVIS_BUILD_NUMBER'] ||
+                      hash['CIRCLE_BUILD_NUM'])
 
-      if env.include? 'URL'
-        opts['SAUCE_BROWSER_URL'] = "http://#{env['URL']}/"
+      if hash.include? 'URL'
+        opts['SAUCE_BROWSER_URL'] = "http://#{hash['URL']}/"
       end
 
       if on_demand
@@ -373,8 +374,8 @@ module Sauce
         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'])
+      if hash.include? 'SAUCE_PERFILE_BROWSERS'
+        opts[:perfile_browsers] = JSON.parse(hash['SAUCE_PERFILE_BROWSERS'])
       end
 
       return opts.delete_if {|key, value| value.nil?}

data/lib/sauce/railtie.rb

@@ -0,0 +1,11 @@
+require 'sauce'
+require 'rails'
+module Sauce
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      require 'sauce/version'
+      require 'sauce/utilities/rake'
+      require 'tasks/parallel_testing'
+    end
+  end
+end

data/lib/sauce/version.rb

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

data/lib/tasks/parallel_testing.rb

@@ -1,20 +1,22 @@
- require "sauce/parallel/test_broker"
+require "sauce/parallel/test_broker"
 require "parallel_tests"
 require "parallel_tests/tasks"
 require "parallel_tests/cli_patch"
 
-
 namespace :sauce do
+  desc "Run specs in parallel on Sauce Labs"
   task :spec, :files, :concurrency, :test_options, :parallel_options do |t, args|
     ::RSpec::Core::Runner.disable_autorun!
     run_parallel_tests(t, args, :rspec)
   end
 
+  desc "Run features in parallel on Sauce Labs"
   task :features, :files, :concurrency, :test_options, :parallel_options do |t, args|
     run_parallel_tests(t, args, :cucumber)
   end
 
   namespace :install do
+    desc "Set up your Cucumber features to run in parallel on Sauce Labs"
     task :features do
       Rake::Task["sauce:install:create_helper"].execute(:helper_type => :features)
       puts <<-ENDLINE
@@ -29,6 +31,8 @@ namespace :sauce do
   -----------------------------------------------------------------------
       ENDLINE
     end
+
+    desc "Set up your specs to run in parallel on Sauce Labs"
     task :spec do
       Rake::Task["sauce:install:create_helper"].execute(:helper_type => :spec)
       spec_helper_path = "spec/spec_helper.rb"

data/spec/sauce/capybara_spec.rb

@@ -330,7 +330,7 @@ describe Sauce::Capybara do
       Sauce::Config::POTENTIAL_PORTS.should include used_port 
     end
 
-    describe "when start_local_application is false" do
+    describe "with start_local_application set false", :capybara_version => ["2.0.0", "2.9.9"] do
       before do
         @start_local_application = Sauce::Config.new[:start_local_application]
       end
@@ -340,7 +340,7 @@ describe Sauce::Capybara do
           c[:start_local_application] = @start_local_application
         end
       end
-      it "should not use Sauce Connect ports if start_local_application is true" do
+      it "should not use Sauce Connect ports" do
         Sauce.config { |c| c[:start_local_application] = false }
         reset_capybara(2.0)
         Capybara.server_port.should eq nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.4.2
 platform: ruby
 authors:
 - Dylan Lacey
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -264,6 +264,7 @@ files:
 - lib/sauce/parallel.rb
 - lib/sauce/parallel/test_broker.rb
 - lib/sauce/parallel/test_group.rb
+- lib/sauce/railtie.rb
 - lib/sauce/raketasks.rb
 - lib/sauce/rspec.rb
 - lib/sauce/selenium.rb