berkshelf 7.0.5 → 7.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4fbbe4a556c48c3ed25b98b1cf0dd3088d942f2a7e1d559b55fbadc73ddfa33
-  data.tar.gz: 293fc6d34c5802174f8643fa814c65870654cf224f5fe26b3b21ca014d8d3937
+  metadata.gz: 547a8faa0841fb8dbd0c8f534bcc47d765dd0a36ac9414248a0d60e5cb55bb0f
+  data.tar.gz: cc0b2093ad106ce83f9ff8903e78783d01aab14f71cb00983ef050ddf37c5252
 SHA512:
-  metadata.gz: 6a426d00f6b0dbeff9b8120fe7a857736ffe2381dbc41b8df90572174661786fbb058000935e7355208c00ff7bfad8d962e29e5bbe978f0219154b284579123b
-  data.tar.gz: e2e7723963c41c211360ef3dab9b210e0078c6e3fc0ca2480010dc3a818c7454c7d2560ab98d88f5e1f6703d1f4ea09de4e63896a624b744769aa6dd902bd3c4
+  metadata.gz: 4feca3fb0ac9ad3f92dc8e97cc3ffd1b265d70e8d6bacbc381cf9dddf183f3529c464923d7d24f69344a20fcaf623e72093900bd2f5adccb141e769a8e538e71
+  data.tar.gz: dac1553f7c1b03774847482c4adeee183deb874b9b2565ff71022bd4f88f38894f559ad01434f398d86e6ae98a1e4857e0aa12017e1aeb11b757c4600f78ce69

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [v7.0.5](https://github.com/berkshelf/berkshelf/tree/v7.0.5) (2018-08-06)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.3.3...v7.0.5)
+
+**Merged pull requests:**
+
+- Add a Chef::CookbookManifestVersions to RidleyCompat [\#1789](https://github.com/berkshelf/berkshelf/pull/1789) ([ryancragun](https://github.com/ryancragun))
+
+## [v6.3.3](https://github.com/berkshelf/berkshelf/tree/v6.3.3) (2018-08-03)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v7.0.4...v6.3.3)
+
+**Merged pull requests:**
+
+- \[SHACK-295\] Missing require for ChefDK 2.x patch release [\#1788](https://github.com/berkshelf/berkshelf/pull/1788) ([tyler-ball](https://github.com/tyler-ball))
+- Additional generator removal cleanup [\#1786](https://github.com/berkshelf/berkshelf/pull/1786) ([lamont-granquist](https://github.com/lamont-granquist))
+- fixes for latest chefstyle updates [\#1784](https://github.com/berkshelf/berkshelf/pull/1784) ([lamont-granquist](https://github.com/lamont-granquist))
+- remove hashrockets syntax [\#1783](https://github.com/berkshelf/berkshelf/pull/1783) ([lamont-granquist](https://github.com/lamont-granquist))
+
 ## [v7.0.4](https://github.com/berkshelf/berkshelf/tree/v7.0.4) (2018-06-08)
 [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v7.0.3...v7.0.4)
 
@@ -70,7 +87,6 @@
 
 **Merged pull requests:**
 
-- Prepare 6.3.0 Release [\#1725](https://github.com/berkshelf/berkshelf/pull/1725) ([jaym](https://github.com/jaym))
 - Remove stale comment [\#1724](https://github.com/berkshelf/berkshelf/pull/1724) ([jaym](https://github.com/jaym))
 - Fix up Dir.glob for windows [\#1722](https://github.com/berkshelf/berkshelf/pull/1722) ([jaym](https://github.com/jaym))
 - bump the gemfile.lock [\#1721](https://github.com/berkshelf/berkshelf/pull/1721) ([lamont-granquist](https://github.com/lamont-granquist))

data/Gemfile.lock

@@ -1,12 +1,12 @@
 GIT
   remote: https://github.com/chef/chef
-  revision: 975395a2812c20d326a9f83d5510b848dabc79ef
+  revision: 111bb019fed2eea16f43acd52635607f3a33373e
   branch: master
   specs:
-    chef (14.4.22)
+    chef (14.4.23)
       addressable
       bundler (>= 1.10)
-      chef-config (= 14.4.22)
+      chef-config (= 14.4.23)
       chef-zero (>= 13.0)
       diff-lcs (~> 1.2, >= 1.2.4)
       erubis (~> 2.7)
@@ -34,7 +34,7 @@ GIT
       specinfra (~> 2.10)
       syslog-logger (~> 1.6)
       uuidtools (~> 2.1.5)
-    chef-config (14.4.22)
+    chef-config (14.4.23)
       addressable
       fuzzyurl
       mixlib-config (>= 2.2.12, < 3.0)
@@ -43,7 +43,7 @@ GIT
 
 GIT
   remote: https://github.com/chef/chefstyle.git
-  revision: 121db02686d148ad2c60ac68d2fb7a5ab8e95edb
+  revision: 4a885da4a201b55f2a5568bc0ea054860ccbf3c3
   branch: master
   specs:
     chefstyle (0.10.0)
@@ -52,7 +52,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (7.0.5)
+    berkshelf (7.0.6)
       chef (>= 13.6.52)
       chef-config
       cleanroom (~> 1.0)
@@ -130,7 +130,7 @@ GEM
     ffi (1.9.25)
     ffi-yajl (2.3.1)
       libyajl2 (~> 1.2)
-    fuubar (2.3.1)
+    fuubar (2.3.2)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
@@ -201,7 +201,7 @@ GEM
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
     parallel (1.12.1)
-    parser (2.5.1.0)
+    parser (2.5.1.2)
       ast (~> 2.4.0)
     plist (3.4.0)
     powerpack (0.1.2)
@@ -275,7 +275,7 @@ GEM
       crack (>= 0.3.2)
       hashdiff
     wmi-lite (1.0.0)
-    yard (0.9.14)
+    yard (0.9.15)
 
 PLATFORMS
   ruby

data/lib/berkshelf/downloader.rb

@@ -109,9 +109,11 @@ module Berkshelf
           raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options.nil?
         end
 
-        github_client = Octokit::Client.new(access_token: options[:access_token],
-                                            api_endpoint: options[:api_endpoint], web_endpoint: options[:web_endpoint],
-                                            connection_options: { ssl: { verify: options[:ssl_verify].nil? ? true : options[:ssl_verify] } })
+        github_client = Octokit::Client.new(
+          access_token: options["access_token"],
+          api_endpoint: options["api_endpoint"], web_endpoint: options["web_endpoint"],
+          connection_options: { ssl: { verify: options["ssl_verify"].nil? ? true : options["ssl_verify"] } }
+        )
 
         begin
           url = URI(github_client.archive_link(cookbook_uri.path.gsub(/^\//, ""), ref: "v#{version}"))
@@ -122,7 +124,7 @@ module Berkshelf
         # We use Net::HTTP.new and then get here, because Net::HTTP.get does not support proxy settings.
         http = Net::HTTP.new(url.host, url.port)
         http.use_ssl = url.scheme == "https"
-        http.verify_mode = (options[:ssl_verify].nil? || options[:ssl_verify]) ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+        http.verify_mode = (options["ssl_verify"].nil? || options["ssl_verify"]) ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
         resp = http.get(url.request_uri)
         return nil unless resp.is_a?(Net::HTTPSuccess)
         open(archive_path, "wb") { |file| file.write(resp.body) }
@@ -169,13 +171,13 @@ module Berkshelf
           raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options.nil?
         end
 
-        connection ||= Faraday.new(url: options[:web_endpoint]) do |faraday|
+        connection ||= Faraday.new(url: options["web_endpoint"]) do |faraday|
           faraday.headers[:accept] = "application/x-tar"
           faraday.response :logger, @logger unless @logger.nil?
           faraday.adapter  Faraday.default_adapter # make requests with Net::HTTP
         end
 
-        resp = connection.get(cookbook_uri.request_uri + "&private_token=" + options[:private_token])
+        resp = connection.get(cookbook_uri.request_uri + "&private_token=" + options["private_token"])
         return nil unless resp.status == 200
         open(archive_path, "wb") { |file| file.write(resp.body) }
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.0.5".freeze
+  VERSION = "7.0.6".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 7.0.6
 platform: ruby
 authors:
 - Jamie Winsor