sauce 3.5.4 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 060e2f66bba9e22cf9a6cb260095dee8607d0f88
-  data.tar.gz: 31d86392cc10aa84f5bd150f5245453cd89c92d6
+  metadata.gz: 9ccdcf05d39b1b2832e33e233c2af31544d560b2
+  data.tar.gz: 5a7959d17255cd42f605fa390f4798a0a5c503cc
 SHA512:
-  metadata.gz: 6c4214b22a08f7fd8a8db56b99a5e5d9fc005f6991420ecaea7d94a949f53f47a59cc35f12bba2247cd8a158331ba4063c7becde05bce9f2ebd96a0a8b831034
-  data.tar.gz: 79c81c8915e5567672b4d4564153c7047263403d4bfec824b536117833a9fd76f771d29d470da44c31cdff93d48324f974dfd1986f6b1f057bc84d9b81e1dd15
+  metadata.gz: 623eb3e19e6c62d2b8c93b4e036b270912b3127a2110f29038efd14dc352031c4b3741be60ca322fdf383ed0ef0448e1c7e8fdb77889916a56d1145376e20a2d
+  data.tar.gz: 4e1494f627edf4daa47da2ce9bc0000f34c14b94250dad306bd6c04bdffd39204b5bd25bbf7dbab6e13295891ffaeded2291b6046092fbcede32c9dc14cbb9d5

data/lib/sauce.rb

@@ -12,7 +12,7 @@ require 'sauce/client'
 require 'sauce/config'
 require 'sauce/selenium'
 require 'sauce/test_base'
-require 'sauce/rspec'
+require 'sauce/rspec/rspec'
 require 'sauce/test_unit'
 require 'parallel_tests/saucerspec/runner'
 require 'parallel_tests/saucecucumber/runner'

data/lib/sauce/config.rb

@@ -427,7 +427,7 @@ It seems you're trying to run your tests in parallel, but haven't configured you
 
 To fix this, add :sauce => true to your specs or make your tests subclasses of Sauce::TestCase or Sauce::RailsTestCase.
 
-For more details check the gem readme at https://github.com/DylanLacey/sauce_ruby/blob/master/README.markdown
+For more details check the gem readme at https://github.com/saucelabs/sauce_ruby/blob/master/README.markdown
       MESSAGE
     end
   end

data/lib/sauce/{rspec.rb → rspec/rspec.rb}

@@ -1,69 +1,7 @@
 require 'sauce/utilities'
-require "sauce_whisk"
-
-begin
-  require 'spec'
-  module Sauce
-    module RSpec
-      class SeleniumExampleGroup < Spec::Example::ExampleGroup
-        attr_reader :selenium
-        @@need_tunnel = false
-
-        def self.inherited(subclass)
-          # only setup tunnel if somebody needs it
-          @@need_tunnel = true
-          super(subclass)
-        end
-
-        before :suite do
-          config = Sauce::Config.new
-          if @@need_tunnel
-            if config[:application_host]
-              Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port])
-            end
-            if config[:start_local_application] &&
-              Sauce::Utilities::RailsServer.is_rails_app?
-              @@server = Sauce::Utilities::RailsServer.new
-              @@server.start
-            end
-          end
-        end
-
-        after :suite do
-          Sauce::Utilities::Connect.close
-          @@server.stop if defined? @@server
-        end
-
-        def execute(*args)
-          config = Sauce::Config.new
-          description = [self.class.description, self.description].join(" ")
-          config[:browsers].each do |os, browser, version|
-            @selenium = Sauce::Selenium2.new({:os => os, :browser => browser,
-                                              :browser_version => version,
-                                              :job_name => description})
-            
-            begin
-              success = super(*args)
-              SauceWhisk::Jobs.change_status @selenium.session_id, success
-            ensure
-              @selenium.stop
-            end
-          end
-        end
-
-        alias_method :page, :selenium
-        alias_method :s, :selenium
-
-        Spec::Example::ExampleGroupFactory.register(:selenium, self)
-      end
-    end
-  end
-rescue LoadError
-  # User doesn't have RSpec 1.x installed
-rescue => e
-  STDERR.puts "Exception occured: #{e.to_s}"
-  exit 1
-end
+require 'sauce_whisk'
+require 'sauce/rspec/rspec_one_support'
+require 'sauce/rspec/rspec_formatter'
 
 begin
   require 'rspec/core'
@@ -245,23 +183,4 @@ rescue LoadError, TypeError
 rescue => e
   STDERR.puts "Exception caught: #{e.to_s}"
   exit 1
-end
-
-begin
-  require 'rspec/core/formatters/base_text_formatter'
-  module RSpec
-    module Core
-      module Formatters
-        class BaseTextFormatter
-          def dump_failure(example, index)
-            output.puts "#{short_padding}#{index.next}) #{example.full_description}"
-            puts "#{short_padding}Sauce public job link: #{example.metadata[:sauce_public_link]}"
-            dump_failure_info(example)
-          end
-        end
-      end
-    end
-  end
-rescue LoadError
-  # User isn't using RSpec
-end
+end

data/lib/sauce/rspec/rspec_formatter.rb

@@ -0,0 +1,20 @@
+begin
+  require 'rspec/core/formatters/base_text_formatter'
+  module RSpec
+    module Core
+      module Formatters
+        class BaseTextFormatter
+          def dump_failure(example, index)
+            output.puts "#{short_padding}#{index.next}) #{example.full_description}"
+            puts "#{short_padding}Sauce public job link: #{example.metadata[:sauce_public_link]}"
+            dump_failure_info(example)
+          end
+        end
+      end
+    end
+  end
+rescue LoadError
+  # User isn't using RSpec
+rescue NameError
+  # User is using RSpec 3
+end

data/lib/sauce/rspec/rspec_one_support.rb

@@ -0,0 +1,66 @@
+require 'sauce/utilities'
+require "sauce_whisk"
+
+begin
+  require 'spec'
+  module Sauce
+    module RSpec
+      class SeleniumExampleGroup < Spec::Example::ExampleGroup
+        attr_reader :selenium
+        @@need_tunnel = false
+
+        def self.inherited(subclass)
+          # only setup tunnel if somebody needs it
+          @@need_tunnel = true
+          super(subclass)
+        end
+
+        before :suite do
+          config = Sauce::Config.new
+          if @@need_tunnel
+            if config[:application_host]
+              Sauce::Utilities::Connect.start(:host => config[:application_host], :port => config[:application_port])
+            end
+            if config[:start_local_application] &&
+              Sauce::Utilities::RailsServer.is_rails_app?
+              @@server = Sauce::Utilities::RailsServer.new
+              @@server.start
+            end
+          end
+        end
+
+        after :suite do
+          Sauce::Utilities::Connect.close
+          @@server.stop if defined? @@server
+        end
+
+        def execute(*args)
+          config = Sauce::Config.new
+          description = [self.class.description, self.description].join(" ")
+          config[:browsers].each do |os, browser, version|
+            @selenium = Sauce::Selenium2.new({:os => os, :browser => browser,
+                                              :browser_version => version,
+                                              :job_name => description})
+            
+            begin
+              success = super(*args)
+              SauceWhisk::Jobs.change_status @selenium.session_id, success
+            ensure
+              @selenium.stop
+            end
+          end
+        end
+
+        alias_method :page, :selenium
+        alias_method :s, :selenium
+
+        Spec::Example::ExampleGroupFactory.register(:selenium, self)
+      end
+    end
+  end
+rescue LoadError
+  # User doesn't have RSpec 1.x installed
+rescue => e
+  STDERR.puts "Exception occured: #{e.to_s}"
+  exit 1
+end

data/lib/sauce/selenium.rb

@@ -1,3 +1,4 @@
+require "forwardable"
 require "sauce/driver_pool"
 
 require "selenium/client"

data/lib/sauce/version.rb

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

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

@@ -14,6 +14,8 @@ require "sauce/capybara"
 Sauce.config do |c|
   c[:start_tunnel] = true
   c[:warn_on_skipped_integration] = false
+  c[:sauce_connect_4_executable] = ENV["SAUCE_CONNECT_4_EXECUTABLE"]
  end
-      app = proc { |env| [200, {}, ["Hello Sauce!"]]}
-      Capybara.app = app
+
+app = proc { |env| [200, {}, ["Hello Sauce!"]]}
+Capybara.app = app

data/spec/integration/rspec-capybara/spec/spec_helper.rb

@@ -25,6 +25,7 @@ Sauce.config do |c|
       ["Windows 2008", "iexplore", "9"]
   ]
 
+  c[:sauce_connect_4_executable] = ENV["SAUCE_CONNECT_4_EXECUTABLE"]
   c[:application_host] = "localhost"
 end
 

data/spec/integration/rspec/spec/spec_helper.rb

@@ -45,4 +45,8 @@ shared_examples_for "an integrated spec" do
   it "should get run on every defined browser" do
     $TAGGED_EXECUTIONS += 1
   end
+end
+
+Sauce.config do |c|
+  c[:sauce_connect_4_executable] = ENV["SAUCE_CONNECT_4_EXECUTABLE"]
 end

data/spec/integration/testunit/test/integration_test.rb

@@ -4,6 +4,7 @@ Sauce.config do |c|
   c[:browsers] = [
       ["Windows 7", "Firefox", "18"]
   ]
+  c[:sauce_connect_4_executable] = ENV["SAUCE_CONNECT_4_EXECUTABLE"]
 end
 
 class IntegrationTest < Sauce::TestCase

data/spec/sauce/config/browser_spec.rb

@@ -68,6 +68,6 @@ It seems you're trying to run your tests in parallel, but haven't configured you
 
 To fix this, add :sauce => true to your specs or make your tests subclasses of Sauce::TestCase or Sauce::RailsTestCase.
 
-For more details check the gem readme at https://github.com/DylanLacey/sauce_ruby/blob/master/README.markdown
+For more details check the gem readme at https://github.com/saucelabs/sauce_ruby/blob/master/README.markdown
   MESSAGE
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.5.5
 platform: ruby
 authors:
 - Dylan Lacey
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -216,16 +216,22 @@ dependencies:
   name: parallel_tests
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +272,9 @@ files:
 - lib/sauce/parallel/test_group.rb
 - lib/sauce/railtie.rb
 - lib/sauce/raketasks.rb
-- lib/sauce/rspec.rb
+- lib/sauce/rspec/rspec.rb
+- lib/sauce/rspec/rspec_formatter.rb
+- lib/sauce/rspec/rspec_one_support.rb
 - lib/sauce/selenium.rb
 - lib/sauce/test_base.rb
 - lib/sauce/test_unit.rb