berkshelf-api-client 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 972d666efa5532ebbe7196b2a11c8c9ea27e3f10
-  data.tar.gz: 5453edd6aa9bf491a493e222d06d905d6bf2a02d
+  metadata.gz: 7a9e44541db4ab5a688b5aeb1b2f16d186244c45
+  data.tar.gz: d9e9a8730a412cda88e63c2336d2135672bb1732
 SHA512:
-  metadata.gz: 7b7daeef0775e166bd06209454a800550eb4e4585a4b0a835eff3a4d0c675680f5b82e63af9a6c88c35df084c222338ffe3b7f6b0e7ee7bf654ba526d8641362
-  data.tar.gz: fb25d5c05ecb4b6a0f0eb4a6dd4b09bcf62b05d28abd1c60a90656ecb0e975320d2aa517d48c1367ed9aa8558ba44548216fe623307e2be99c9282ab8f9d1d4d
+  metadata.gz: 0ac8b62846c5374b4b9fb445652c76dac8c6c6f906afedeac0a29d445577fa7899a64f4d9b219ce58f4237edb0868e58e6b5162b6252bbf9698cb32b075abfdc
+  data.tar.gz: 48803e66e5a488d593d602cd82acf551e070b04b17bfa5354151395fe9f54855396402b960c524f631bc409d0a2d9797d86505587fbe5800c7861d5bd45bc0d5

data/Gemfile

@@ -8,7 +8,6 @@ group :guard do
   gem 'guard-cucumber'
   gem 'guard-rspec'
   gem 'guard-spork'
-  gem 'guard-yard'
 
   require 'rbconfig'
 

data/Guardfile

@@ -3,10 +3,6 @@ guard 'spork' do
   watch('spec/spec_helper.rb')  { :rspec }
 end
 
-guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
-  watch(%r{lib/.+\.rb})
-end
-
 guard 'rspec', cli: '--color --drb --format Fuubar', all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})          { |m| "spec/unit/#{m[1]}_spec.rb" }

data/lib/berkshelf/api_client/connection.rb

@@ -29,10 +29,10 @@ module Berkshelf::APIClient
       options         = options.reverse_merge(retries: 3, retry_interval: 0.5,
         open_timeout: 3, timeout: 30)
       @url            = url
-      @retries        = options[:retries]
-      @retry_interval = options[:retry_interval]
+      @retries        = options.delete(:retries)
+      @retry_interval = options.delete(:retry_interval)
 
-      options[:builder] ||= Faraday::Builder.new do |b|
+      options[:builder] ||= Faraday::RackBuilder.new do |b|
         b.response :parse_json
         b.response :gzip
         b.request :retry,
@@ -46,9 +46,11 @@ module Berkshelf::APIClient
         b.adapter :net_http
       end
 
+      open_timeout = options.delete(:open_timeout)
+      timeout      = options.delete(:timeout)
       super(self.url, options)
-      @options[:open_timeout] = options[:open_timeout]
-      @options[:timeout]      = options[:timeout]
+      @options[:open_timeout] = open_timeout
+      @options[:timeout]      = timeout
     end
 
     # Retrieves the entire universe of known cookbooks from the API source

data/lib/berkshelf/api_client/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module APIClient
-    VERSION = "1.2.0.rc1"
+    VERSION = "1.2.0.rc2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api-client
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Jamie Winsor