berkshelf-api-client 1.2.0.rc1 → 1.2.0.rc2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/Gemfile +0 -1
- data/Guardfile +0 -4
- data/lib/berkshelf/api_client/connection.rb +7 -5
- data/lib/berkshelf/api_client/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7a9e44541db4ab5a688b5aeb1b2f16d186244c45
|
|
4
|
+
data.tar.gz: d9e9a8730a412cda88e63c2336d2135672bb1732
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0ac8b62846c5374b4b9fb445652c76dac8c6c6f906afedeac0a29d445577fa7899a64f4d9b219ce58f4237edb0868e58e6b5162b6252bbf9698cb32b075abfdc
|
|
7
|
+
data.tar.gz: 48803e66e5a488d593d602cd82acf551e070b04b17bfa5354151395fe9f54855396402b960c524f631bc409d0a2d9797d86505587fbe5800c7861d5bd45bc0d5
|
data/Gemfile
CHANGED
data/Guardfile
CHANGED
|
@@ -3,10 +3,6 @@ guard 'spork' do
|
|
|
3
3
|
watch('spec/spec_helper.rb') { :rspec }
|
|
4
4
|
end
|
|
5
5
|
|
|
6
|
-
guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
|
|
7
|
-
watch(%r{lib/.+\.rb})
|
|
8
|
-
end
|
|
9
|
-
|
|
10
6
|
guard 'rspec', cli: '--color --drb --format Fuubar', all_on_start: false, all_after_pass: false do
|
|
11
7
|
watch(%r{^spec/unit/.+_spec\.rb$})
|
|
12
8
|
watch(%r{^lib/(.+)\.rb$}) { |m| "spec/unit/#{m[1]}_spec.rb" }
|
|
@@ -29,10 +29,10 @@ module Berkshelf::APIClient
|
|
|
29
29
|
options = options.reverse_merge(retries: 3, retry_interval: 0.5,
|
|
30
30
|
open_timeout: 3, timeout: 30)
|
|
31
31
|
@url = url
|
|
32
|
-
@retries = options
|
|
33
|
-
@retry_interval = options
|
|
32
|
+
@retries = options.delete(:retries)
|
|
33
|
+
@retry_interval = options.delete(:retry_interval)
|
|
34
34
|
|
|
35
|
-
options[:builder] ||= Faraday::
|
|
35
|
+
options[:builder] ||= Faraday::RackBuilder.new do |b|
|
|
36
36
|
b.response :parse_json
|
|
37
37
|
b.response :gzip
|
|
38
38
|
b.request :retry,
|
|
@@ -46,9 +46,11 @@ module Berkshelf::APIClient
|
|
|
46
46
|
b.adapter :net_http
|
|
47
47
|
end
|
|
48
48
|
|
|
49
|
+
open_timeout = options.delete(:open_timeout)
|
|
50
|
+
timeout = options.delete(:timeout)
|
|
49
51
|
super(self.url, options)
|
|
50
|
-
@options[:open_timeout] =
|
|
51
|
-
@options[:timeout] =
|
|
52
|
+
@options[:open_timeout] = open_timeout
|
|
53
|
+
@options[:timeout] = timeout
|
|
52
54
|
end
|
|
53
55
|
|
|
54
56
|
# Retrieves the entire universe of known cookbooks from the API source
|