sauce_overage 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b05667ec4e6f4f7aeeeb2ecfe4c2c6442e93bd
-  data.tar.gz: 761ba3ea9602ad07a9a949f9ff5d9597d9cda55e
+  metadata.gz: 73ee30fe101effb3c25c8a509db9a41b0a0bfdc1
+  data.tar.gz: 4e53ae919a64d2db9c693d035f45d4b4d7e1cae8
 SHA512:
-  metadata.gz: 99060f962a1fd5ab8b125a712205f8c19aeff8f6bb9a7fa90032fba99b796adf467fd28dda502fd7cf73642075950ac397889350c73ce9dc1f020e9157a53885
-  data.tar.gz: b959cf87fc6e2b19a51af43d705ebcc17f2001ca7d3e71740aeb3c567e205bbd65218711cf463a16bf137a142e5afbcf83b0c1b1ae7f6f0d699ee2ca8c0383d7
+  metadata.gz: dac69c99e7959be26a97035f4e3fe80239727617d6c061c48bd9326e646c9ddf18fc9a04f5dae7e318501a8db992d1cdb3268ceba81a1b38340c46b0df942646
+  data.tar.gz: 71a6cfbe78074c7ba00c43a8ef91470a75c100f7f8bc12d369e4fe570a72cf1133a32bb2abe3786ef901c8d2e733ab481056aed16a63af8f6f6816c11e2c7d19

data/.rubocop.yml

@@ -18,3 +18,5 @@ Style/AccessorMethodName:
   Enabled: false
 Metrics/AbcSize:
   Enabled: false
+Style/RescueModifier:
+  Enabled: false

data/lib/sauce_overage.rb

@@ -1,6 +1,6 @@
 require 'rubygems'
-require 'curb'
-require 'json'
+require 'hurley'
+require 'multi_json'
 require 'webdriver_utils'
 
 require_relative 'sauce_overage/version'

data/lib/sauce_overage/account.rb

@@ -12,20 +12,38 @@ module SauceOverage
       @key = key.strip
     end
 
+    MUTEX = Mutex.new
+
+    def hurley_client
+      MUTEX.synchronize 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
+        client.url.user                     = user
+        client.url.password                 = 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 = MultiJson.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
+
+        @hurley_client
+      end
+    end
+
     def get_user
-      get                 = Curl::Easy.new("https://saucelabs.com/rest/v1/users/#{user}")
-      get.http_auth_types = :basic
-      get.username        = user
-      get.password        = key
-      get.verbose         = true # display more info on errors
-      # Work around
-      # /.rvm/gems/ruby-2.2.2/gems/curb-0.8.8/lib/curl/easy.rb:72:in `perform': SSL connect error (Curl::Err::SSLConnectError)
-      # by retrying for two minutes
-      wait(120) { get.perform }
-
-      result = JSON.parse(get.body_str || '{}')
-      fail result['error'] if result['error']
-      result
+      wait(2 * 60) { hurley_client.get("users/#{user}").body }
     end
 
     def minutes

data/lib/sauce_overage/version.rb

@@ -1,4 +1,4 @@
 module SauceOverage
-  VERSION = '1.0.0' unless defined? ::SauceOverage::VERSION
-  DATE    = '2015-09-28' unless defined? ::SauceOverage::DATE
+  VERSION = '1.0.1' unless defined? ::SauceOverage::VERSION
+  DATE    = '2015-10-13' unless defined? ::SauceOverage::DATE
 end

data/release_notes.md

@@ -1,3 +1,9 @@
+#### v1.0.1 2015-10-13
+
+- [9bd0d57](https://github.com/bootstraponline/sauce_overage/commit/9bd0d5792b483a9d3b61b4242d0f72c31f359f04) Release 1.0.1
+- [b3a5e74](https://github.com/bootstraponline/sauce_overage/commit/b3a5e7434984dca5bd8b4447fa52d8f9c7bb0f53) Use hurley and multi_json. Remove curb and json
+
+
 #### v1.0.0 2015-09-28
 
 - [4df608e](https://github.com/bootstraponline/sauce_overage/commit/4df608e280a36d5dcc0774a8817daba445d2fcf8) Release 1.0.0

data/sauce_overage.gemspec

@@ -22,8 +22,8 @@ SUMMARY
     f.match(%r{^(test|spec|features)/})
   end
 
-  spec.add_runtime_dependency 'curb', '~> 0.8.8'
-  spec.add_runtime_dependency 'json', '~> 1.8.3'
+  spec.add_runtime_dependency 'hurley', '~> 0.2'
+  spec.add_runtime_dependency 'multi_json', '~> 1.11.2'
   spec.add_runtime_dependency 'webdriver_utils', '~> 1.0.2'
 
   spec.add_development_dependency 'webmock', '~> 1.21.0'

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: sauce_overage
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-13 00:00:00.000000000 Z
 dependencies:
 - !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: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.11.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.11.2
 - !ruby/object:Gem::Dependency
   name: webdriver_utils
   requirement: !ruby/object:Gem::Requirement