sauce 3.4.2 → 3.4.3

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZDU5ODZiYzVmMjMxMWFhMDUyOWIyNDEyMGU1OTIzMmRjNDE5MmIyMw==
-  data.tar.gz: !binary |-
-    YjA1OTMzZjg1NzFlNjI4MzM1MWQ0MmVjNjhiMTM5NTJiZmM2MGNlZQ==
+SHA1:
+  metadata.gz: 82709ffd28a9f8de7af48b684fc7daecab419853
+  data.tar.gz: a8e0bbf819adc32e8521246a3dacbded39df5cfb
 SHA512:
-  metadata.gz: !binary |-
-    YjUxZDJkMDI4Nzk0ZDRmZTZiN2M2OWM2NzYyYThhMzFhYzdiZDk2ZmUyOWZl
-    YTU2MGNjMjNhNTA0ZDAxY2YxNDcxZDJlYzM3OWNlM2Q1ODg1ZjM5NzQwNDA1
-    YzYyODkzYWEyMmRkYTA0YTM2MjAwMTA0ZDcxZThjZTFhMGY2NGM=
-  data.tar.gz: !binary |-
-    NWM2ZWU3YjViNDZlNzMxN2I4MzcyYzkzNmM1YjlhMTg4MzEwMDU5OGYxYTNk
-    YmYwMDUxYTdjODJlZGJhMWUyYjM1MTk2OTBlMjczYjBiNGNkYjk3ZWJlZTVl
-    YjA3Zjk0NjhmOTcxMmEyODQ5MDU2MjJmMjM3NzhlMGI3YTY1YjE=
+  metadata.gz: 2c8411663dd30c154871b8c408f0f16b308c3a9548800a15843a393dfd1c91b2da693a122bd5bfe41e368322a2098a438197164206821d55ed73e5cf81fd867d
+  data.tar.gz: ad1b0ae40cb57c5b2b0a17bc199a39d7d2f4acc9a2261a1caecd79f7a07ab5d17555043557b22c5634cfd26c032ca6714d73f834a305795fd1ab351fb40c3c5a

data/lib/sauce/config.rb

@@ -67,7 +67,7 @@ module Sauce
         sauce-advisor single-window user-extensions-url firefox-profile-url
         max-duration idle-timeout build custom-data tunnel-identifier
         selenium-version command-timeout prerun prerun-args screen-resolution
-        disable-popup-handler avoid-proxy public name}
+        disable-popup-handler avoid-proxy public name iedriver-version}
 
     def self.get_application_port
       port_index = ENV["TEST_ENV_NUMBER"].to_i
@@ -269,6 +269,18 @@ module Sauce
       @opts[:port]
     end
 
+    def after_job(hook, &block)
+      hooks = @opts[:after_job_hooks] || {}
+      hooks[hook] = block
+      @opts[:after_job_hooks] = hooks
+    end
+
+    def run_post_job_hooks(job_id, job_name, job_success)
+      @opts[:after_job_hooks].each do |key, hook|
+        hook.call job_id, job_name, job_success
+      end
+    end
+
     def tools
       tools = []
       tools << "Rspec" if is_defined? "RSpec"
@@ -349,6 +361,8 @@ module Sauce
 
       on_demand = hash.delete "SAUCE_ONDEMAND_BROWSERS"
       env_browsers = hash.delete "SAUCE_BROWSERS"
+      username = hash.delete("SAUCE_USERNAME") || hash.delete("SAUCE_USER_NAME")
+      access_key = hash.delete("SAUCE_ACCESS_KEY") || hash.delete("SAUCE_API_KEY")
 
       hash.select {|k,v| k.start_with? "SAUCE_"}.each do |k,v|
         opts[k.downcase.sub("sauce_", "").to_sym] = v
@@ -378,6 +392,9 @@ module Sauce
         opts[:perfile_browsers] = JSON.parse(hash['SAUCE_PERFILE_BROWSERS'])
       end
 
+      opts[:username] = username if username
+      opts[:access_key] = access_key if access_key
+
       return opts.delete_if {|key, value| value.nil?}
     end
 

data/lib/sauce/rspec.rb

@@ -86,7 +86,10 @@ begin
 
         ::RSpec.configuration.before :all do
           Sauce::RSpec.start_tools_for_selenium_directory
+          Sauce::RSpec.register_default_hook
+          Sauce::RSpec.register_jenkins_hook if ENV['JENKINS_SERVER_COOKIE']
         end
+        
         ::RSpec.configuration.after :suite do
           Sauce::RSpec.stop_tools
         end
@@ -122,6 +125,22 @@ begin
           end
         end
       end
+
+      def self.register_default_hook
+        Sauce.config do |c|
+          c.after_job :rspec do |id, name, success|
+            SauceWhisk::Jobs.change_status id, success
+          end
+        end
+      end
+
+      def self.register_jenkins_hook
+        Sauce.config do |c|
+          c.after_job :jenkins do |id, name, success|
+            puts "SauceOnDemandSessionID=#{id} job-name=#{name}"
+          end
+        end
+      end
       
       def self.stop_tools
         Sauce::Utilities::Connect.close
@@ -175,9 +194,15 @@ begin
 
               begin
                 the_test.run
-                SauceWhisk::Jobs.change_status @selenium.session_id, example.exception.nil?
+                success = example.exception.nil?
               ensure
                 @selenium.stop
+                begin
+                  config.run_post_job_hooks(@selenium.session_id, description, success)
+                rescue Exception => e
+                  STDERR.puts "Error running post job hooks"
+                  STDERR.puts e
+                end
                 Sauce.driver_pool.delete Thread.current.object_id
               end
             end

data/lib/sauce/version.rb

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

data/spec/sauce/config/config_spec.rb

@@ -201,6 +201,14 @@ describe Sauce::Config do
 
         it { should have_key :'prerun'}
       end
+
+      context 'iedriver-version' do
+        subject do
+          Sauce::Config.new('iedriver-version' => '2.30.1').to_desired_capabilities
+        end
+
+        it { should have_key :'iedriver-version' }
+      end
     end
 
     context 'with a :name set' do

data/spec/sauce/config/environment_config_spec.rb

@@ -21,6 +21,29 @@ describe "Sauce::Config" do
       opts[:application_host].should eq "application_host"
     end
 
+    context "when passed the jenkins authentication parameters" do
+      let(:jenkins_options) {
+        {
+          "SAUCE_USER_NAME" => "jenkins_user",
+          "SAUCE_API_KEY" => "jenkins_access_key"
+        }
+      }
+
+      it "should parse the SAUCE_USER_NAME value" do
+        test_config
+        opts = test_config.send(:extract_options_from_hash, jenkins_options)
+
+        opts[:username].should eq "jenkins_user"
+      end
+
+      it "should parse the SAUCE_USER_NAME value" do
+        test_config
+        opts = test_config.send(:extract_options_from_hash, jenkins_options)
+
+        opts[:access_key].should eq "jenkins_access_key"
+      end
+    end
+
     context "when passed build numbers" do
       it "should accept BUILD_NUMBER" do
         opts = test_config.send(:extract_options_from_hash, {"BUILD_NUMBER" => "build"})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sauce
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Dylan Lacey
@@ -14,202 +14,202 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-20 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: net-ssh-gateway
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: cmdparse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
@@ -230,14 +230,14 @@ dependencies:
   name: sauce_whisk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.11
 description: A Ruby helper for running tests in Sauce Labs' browser testing cloud
@@ -325,17 +325,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Ruby helper for running tests in Sauce Labs