sauce_rspec 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e57be49a029f21900caeec78e159aa2ddab0d0ea
-  data.tar.gz: 601f97a26625b0c99f21944394ff0f458d858610
+  metadata.gz: f7d1ebc7fdc156c5ea51d76d7f8526fd298e2a38
+  data.tar.gz: 9dd34789cebaf4884e7b3e02374b42e568a987d6
 SHA512:
-  metadata.gz: 8f3fc22d0792b234d46a76f679234856b94dc9a3e55791817f91b55374105ae920bc03414f85b79f94257e3bc73556b48f0c37b3ea49c68bf667dd69c0775edf
-  data.tar.gz: 6c39cfe76a888823f59dff7f93e348e5fb42b3acf65b513240857dbc5a25a2974d3ea97cd6463aebdce42ea0fa1a05f3f77719b7f83f3985489a47f68740f7af
+  metadata.gz: 5f58071d081f0afa8851721a5e4b68b7838024493b70640036d5da04d1668d4c62a35440265786d93420334e48980e428b3165fe8ab4f7aa93fe81d41c6e430a
+  data.tar.gz: 59a6c65ccd5218416238a4d61bbc1c3e2758f6ce097e400feb4794eadeabef2285f96e471a35c5d2498627c5b5a27a87807579659da074b255dab11cb42838ba

data/.rubocop.yml

@@ -12,3 +12,9 @@ Style/RescueModifier:
   Enabled: false
 Style/SpaceAroundOperators:
   Enabled: false
+Style/DoubleNegation:
+  Enabled: false
+Metrics/CyclomaticComplexity:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false

data/lib/sauce_rspec/config.rb

@@ -1,6 +1,6 @@
 module SauceRSpec
   class Config
-    attr_reader :caps
+    attr_reader :caps, :concurrency_timeout
     attr_accessor :opts, :user, :key, :host, :port
 
     public
@@ -18,6 +18,11 @@ module SauceRSpec
       "http://#{user}:#{key}@#{host}:#{port}/wd/hub"
     end
 
+    def concurrency_timeout= value
+      fail 'concurrency_timeout must be a numeric' unless value.is_a?(Numeric)
+      @concurrency_timeout = value
+    end
+
     def caps= value
       fail 'caps must be an array' unless value && value.is_a?(Array)
       @caps = value
@@ -44,7 +49,7 @@ module SauceRSpec
     # caps and opts aren't required to run on sauce because the user may
     # provide the caps outside of the SauceRSpec config.
     def sauce?
-      @user && @key && @host && @port
+      !!(@user && @key && @host && @port)
     end
 
     def to_h
@@ -65,6 +70,24 @@ module SauceRSpec
     def config &block
       return @config unless block_given?
       block.call @config
+
+      # Set test-queue-split workers to the Sauce concurrency limit by default
+      test_queue_workers = 'TEST_QUEUE_WORKERS'
+      if SauceRSpec.config.sauce? && (!ENV[test_queue_workers] || ENV[test_queue_workers].empty?)
+        user                = SauceRSpec.config.user
+        hurley_client       = SauceRSpec.hurley_client
+        concurrency_url     = "users/#{user}/concurrency"
+        concurrency_timeout = SauceRSpec.config.concurrency_timeout || 2 * 60
+
+        wait_true(concurrency_timeout) do
+          body = hurley_client.get(concurrency_url).body
+          concurrency = body['concurrency'][user]['remaining']['overall'] rescue false
+          ENV[test_queue_workers] = concurrency.to_s if concurrency
+
+          concurrency ? true : fail(body)
+        end
+      end
+
       @config
     end
   end # class << self

data/lib/sauce_rspec/{jenkins.rb → sauce_rspec.rb}

@@ -1,11 +1,13 @@
-require 'rubygems'
-require 'curb'
-require 'json'
-
 module SauceRSpec
   class << self
     attr_reader :driver
 
+    MUTEX = Mutex.new
+    # from: https://github.com/lostisland/hurley/blob/b61f4c96bcfa4fcd51c6718bc05f13e1c2ba01e6/lib/hurley.rb#L17
+    def mutex
+      MUTEX.synchronize(&Proc.new)
+    end
+
     # Fully initialized Selenium Webdriver.
     def driver= driver
       fail 'Driver must not be nil' unless driver
@@ -57,44 +59,51 @@ module SauceRSpec
       caps
     end
 
-    private
+    def hurley_client
+      mutex do
+        return @hurley_client if @hurley_client
+        client                              = @hurley_client = Hurley::Client.new 'https://saucelabs.com/rest/v1/'
+        client.header[:content_type]        = 'application/json'
+        client.request_options.timeout      = 2 * 60
+        client.request_options.open_timeout = 2 * 60
+
+        config              = SauceRSpec.config
+        client.url.user     = config.user
+        client.url.password = config.key
+
+        # Ensure body JSON string is parsed into a hash
+        # Detect errors and fail so wait_true will retry the request
+        client.after_call do |response|
+          response.body = Oj.load(response.body) rescue {}
+
+          client_server_error = %i(client_error server_error).include? response.status_type
+          body_error          = response.body['error']
+
+          if client_server_error || body_error
+            response_error = body_error || ''
+            fail(::Errno::ECONNREFUSED, response_error)
+          end
+        end
 
-    attr_reader :update_job
+        @hurley_client
+      end
+    end
+
+    private
 
     # @param timeout <Integer> timeout in seconds to wait for sauce labs response
     def update_job_status_on_sauce timeout
+      # PUT https://saucelabs.com/rest/v1/:username/jobs/:job_id
       # https://docs.saucelabs.com/reference/rest-api/#update-job
-      # https://saucelabs.com/rest/v1/:username/jobs/:job_id
-      config = SauceRSpec.config
-      user   = config.user
-      unless update_job
-        key = config.key
-
-        request                 = Curl::Easy.new('')
-        request.http_auth_types = :basic
-        request.username        = user
-        request.password        = key
-
-        @update_job = request
-      end
-
-      passed = RSpec.current_example.exception.nil?
-      passed = { passed: passed }
-      url    = "https://saucelabs.com/rest/v1/#{user}/jobs/#{driver.session_id}"
-
-      update_job.url = url
+      user           = SauceRSpec.config.user
+      passed         = RSpec.current_example.exception.nil?
+      passed         = { passed: passed }
+      passed_json    = Oj.dump(passed)
+      update_job_url = "#{user}/jobs/#{driver.session_id}"
 
       wait_true(timeout) do
-        update_job.http_put passed.to_json
-        response = JSON.parse(update_job.body_str) rescue {}
-        response_passed = response['passed']
-        response_error  = response['error'] || ''
-
-        if response_error.include? 'Not authorized'
-          fail(::Errno::ECONNREFUSED, response_error)
-        end
-
-        response_passed == passed[:passed] ? true : fail(response)
+        body = hurley_client.put(update_job_url, passed_json).body
+        body['passed'] == passed[:passed] ? true : fail(body)
       end
     end
 

data/lib/sauce_rspec/version.rb

@@ -1,4 +1,4 @@
 module SauceRSpec
-  VERSION = '1.0.1' unless defined? ::SauceRSpec::VERSION
-  DATE    = '2015-10-08' unless defined? ::SauceRSpec::DATE
+  VERSION = '1.0.2' unless defined? ::SauceRSpec::VERSION
+  DATE    = '2015-10-12' unless defined? ::SauceRSpec::DATE
 end

data/lib/sauce_rspec.rb

@@ -1,6 +1,14 @@
 require 'rubygems'
+require 'oj'
+# Ensure Hash symbols are serialized as JSON strings
+# {:passed=>true} => "{\"passed\":true}" not "{\":passed\":true}"
+Oj.default_options = { mode: :compat }
+
 require 'webdriver_utils'
+require 'addressable/uri'
+require 'hurley'
+require 'hurley/addressable'
 
 require_relative 'sauce_rspec/version'
 require_relative 'sauce_rspec/config'
-require_relative 'sauce_rspec/jenkins'
+require_relative 'sauce_rspec/sauce_rspec'

data/release_notes.md

@@ -1,3 +1,14 @@
+#### v1.0.2 2015-10-12
+
+- [21b3df0](https://github.com/bootstraponline/sauce_rspec/commit/21b3df0b6042fc93a2426522213b0bfdd4902db7) Release 1.0.2
+- [d21bd01](https://github.com/bootstraponline/sauce_rspec/commit/d21bd01bafff4cfd8a87469094ad7b53998b9130) Fix thor cop and thor spec
+- [25504d1](https://github.com/bootstraponline/sauce_rspec/commit/25504d1d13d3da96445e80c4009083ee43ae34d1) Fix Oj.dump
+- [780496e](https://github.com/bootstraponline/sauce_rspec/commit/780496e1547bad10fe55e3bdba7624cfb0f6183a) Use hurely for HTTP instead of curb
+- [3ac6a7c](https://github.com/bootstraponline/sauce_rspec/commit/3ac6a7c106bedd8669be4b9b730280c3b9e9fd77) Create a new Curl::Easy object each time
+- [03ddc81](https://github.com/bootstraponline/sauce_rspec/commit/03ddc81a6a0a1d5d3b36a61f34210e3ebfcb5d6f) Clean up Sauce API code
+- [7bc7a24](https://github.com/bootstraponline/sauce_rspec/commit/7bc7a24a06c60ee874b8f360b87598544d0fe891) Add concurrency detection. Fix 401 check
+
+
 #### v1.0.1 2015-10-08
 
 - [52bcf9f](https://github.com/bootstraponline/sauce_rspec/commit/52bcf9fd9dc970122a42fb7eb407de2a9ff37db5) Release 1.0.1

data/sauce_rspec.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'webdriver_utils', '~> 1.0.2'
   # Recommended way of doing parallel execution
   spec.add_runtime_dependency 'test-queue-split', '~> 0.3.2'
-  spec.add_runtime_dependency 'curb', '~> 0.8.8'
+  spec.add_runtime_dependency 'hurley', '~> 0.2'
+  spec.add_runtime_dependency 'addressable', '~> 2.3.8'
+  spec.add_runtime_dependency 'oj', '~> 2.12.14'
 
   spec.add_development_dependency 'webmock', '~> 1.21.0'
   spec.add_development_dependency 'appium_thor', '~> 1.0.1'
@@ -31,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.10.6'
   spec.add_development_dependency 'rake', '~> 10.4.2'
   spec.add_development_dependency 'rubocop', '~> 0.34.2'
+  spec.add_development_dependency 'trace_files', '~> 1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sauce_rspec
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-08 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,19 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
-  name: curb
+  name: hurley
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.8
+        version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.14
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.12.14
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +206,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.34.2
+- !ruby/object:Gem::Dependency
+  name: trace_files
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Sauce rspec integration.
 email:
 - code@bootstraponline.com
@@ -194,8 +236,8 @@ files:
 - Thorfile
 - lib/sauce_rspec.rb
 - lib/sauce_rspec/config.rb
-- lib/sauce_rspec/jenkins.rb
 - lib/sauce_rspec/rspec.rb
+- lib/sauce_rspec/sauce_rspec.rb
 - lib/sauce_rspec/version.rb
 - release_notes.md
 - sauce_rspec.gemspec