berkshelf 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25a14291bb2c9d50f4cb89888e7c71e4d06a4bef
-  data.tar.gz: 1fae554e27d90927e4568a808a4694d520306d77
+  metadata.gz: 957ca7b1c871821c5d91be2ff270c37ad90044fa
+  data.tar.gz: 1af13dcc965672d9e31c53425150a1c6e24e9e55
 SHA512:
-  metadata.gz: 91918e3d292165f595c98a4209eb9e88ad55305eb8e799b7b0af1e33512503332dd7bd2fc15e43b5abb1eb57221d46b2e8737814c9cf33e0f302a6eec86871f3
-  data.tar.gz: 6c0bcf5fa299bfd5722432252aa91a5cde776674b13698f0c12335ec956a478ba59aca6bc08081e0c5223672f3c48fcc6dfaafc475942e7e47eb662217b0953d
+  metadata.gz: 1f1d111e55146320ac610f666ff5d27ce3e6bbaa91c7f53a4d350705698b61b3a0ae2cd2d383a9953c3e0a33ef21ee3bdfee33b5dcdc1ba5c69117e24e502d88
+  data.tar.gz: d32ad02c06048835d13552410b5764dfa79f976547ac96bac38e758327b5a138840af94f476a9db1c5dc042412bf0676ac0d5ab1daab7dc12bef381a12eeca93

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## [v6.2.1](https://github.com/berkshelf/berkshelf/tree/v6.2.1) (2017-07-18)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.2.0...v6.2.1)
+
+**Merged pull requests:**
+
+- remove berks-api dep [\#1712](https://github.com/berkshelf/berkshelf/pull/1712) ([lamont-granquist](https://github.com/lamont-granquist))
+- pull berkshelf-api-client gem into berkshelf [\#1711](https://github.com/berkshelf/berkshelf/pull/1711) ([lamont-granquist](https://github.com/lamont-granquist))
+- bump berkshelf-api-client dep to 4.0.1 [\#1710](https://github.com/berkshelf/berkshelf/pull/1710) ([lamont-granquist](https://github.com/lamont-granquist))
+
 ## [v6.2.0](https://github.com/berkshelf/berkshelf/tree/v6.2.0) (2017-06-22)
 [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.1.1...v6.2.0)
 
@@ -325,7 +334,7 @@
 **Merged pull requests:**
 
 - Correct exclusion of metadata.rb [\#1339](https://github.com/berkshelf/berkshelf/pull/1339) ([rveznaver](https://github.com/rveznaver))
-- fix chefignore for files in sub directories [\#1335](https://github.com/berkshelf/berkshelf/pull/1335) ([triccardi-systran](https://github.com/triccardi-systran))
+- fix chefignore for files in sub directories [\#1335](https://github.com/berkshelf/berkshelf/pull/1335) ([thomas-riccardi](https://github.com/thomas-riccardi))
 - Do not leak tempdirs [\#1334](https://github.com/berkshelf/berkshelf/pull/1334) ([sethvargo](https://github.com/sethvargo))
 
 ## [v3.2.0](https://github.com/berkshelf/berkshelf/tree/v3.2.0) (2014-10-29)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    berkshelf (6.2.1)
+    berkshelf (6.2.2)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
       chef (>= 12.7.2)
@@ -168,8 +168,8 @@ GEM
     mixlib-cli (1.7.0)
     mixlib-config (2.2.4)
     mixlib-log (1.7.1)
-    mixlib-shellout (2.2.7)
-    molinillo (0.5.7)
+    mixlib-shellout (2.3.2)
+    molinillo (0.6.0)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
@@ -271,7 +271,7 @@ GEM
     solve (3.1.0)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.69.0)
+    specinfra (2.70.0)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet
@@ -318,4 +318,4 @@ DEPENDENCIES
   yard (>= 0.8)
 
 BUNDLED WITH
-   1.15.1
+   1.15.3

data/README.md

@@ -66,8 +66,6 @@ Please see [Plugins page](https://github.com/berkshelf/berkshelf/blob/master/PLU
 
 ## Authors
 
-[The Berkshelf Core Team](https://github.com/berkshelf/berkshelf/wiki/Core-Team)
-
 Thank you to all of our [Contributors](https://github.com/berkshelf/berkshelf/graphs/contributors), testers, and users.
 
 If you'd like to contribute, please see our [contribution guidelines](https://github.com/berkshelf/berkshelf/blob/master/CONTRIBUTING.md) first.

data/docs/berkshelf_for_newcomers.md

@@ -47,8 +47,8 @@ The above is a trivial example.  If your cookbook has several dependencies, whic
 ## What's in the background
 
 * the cookbook's `metadata.rb` specifies the cookbook dependencies and required versions
-* the [Berksfile](http://berkshelf.com/v2.0/#the-berksfile) in your cookbook's root directory tells Berkshelf where to find cookbooks.  You can have multiple sources, or can pull individual cookbooks from specific locations, such as your own Supermarket, GitHub, or a file server.
-* `berks install` downloads cookbooks and their dependencies to the [Berkshelf](http://berkshelf.com/v2.0/#the-berkshelf), a place on your local disk.
+* the [Berksfile](https://docs.chef.io/berkshelf.html#the-berksfile) in your cookbook's root directory tells Berkshelf where to find cookbooks.  You can have multiple sources, or can pull individual cookbooks from specific locations, such as your own Supermarket, GitHub, or a file server.
+* `berks install` downloads cookbooks and their dependencies to the [Berkshelf](https://docs.chef.io/berkshelf.html#berkshelf-cli), a place on your local disk.
 * a Berksfile.lock is generated on `berks install` which specifies the exact cookbook versions that were used at that point
 
 ## Cookbook versioning
@@ -57,8 +57,7 @@ Berkshelf relies on cookbook versioning to work correctly.  A cookbook's version
 
 # Further reading
 
-* The project homepage, http://http://berkshelf.com/v2.0/
-* https://sethvargo.com/berkshelf-workflow/
+* https://docs.chef.io/berkshelf.html
 
 --
 

data/lib/berkshelf/ridley_compat.rb

@@ -2,23 +2,27 @@ require "chef/server_api"
 require "chef/http/simple_json"
 require "chef/http/simple"
 require "berkshelf/api_client/errors"
+require "chef/config"
 
 module Berkshelf
   module RidleyCompatAPI
     def initialize(**opts)
       opts = opts.dup
       opts[:ssl] ||= {}
-      chef_opts = {
-        rest_timeout: opts[:timeout], # opts[:open_timeout] is ignored on purpose
-        headers: opts[:headers],
-        client_name: opts[:client_name],
-        signing_key_filename: opts[:client_key],
-        ssl_verify_mode: opts[:verify] ? :verify_none : :verify_peer,
-        ssl_ca_path: opts[:ssl][:ca_path],
-        ssl_ca_file: opts[:ssl][:ca_file],
-        ssl_client_cert: opts[:ssl][:client_cert],
-        ssl_client_key: opts[:ssl][:client_key],
-      }
+      chef_opts = {}
+      chef_opts[:rest_timeout]         = opts[:timeout] if opts[:timeout] # opts[:open_timeout] is ignored on purpose
+      chef_opts[:headers]              = opts[:headers] if opts[:headers]
+      chef_opts[:client_name]          = opts[:client_name] if opts[:client_name]
+      chef_opts[:signing_key_filename] = opts[:client_key] if opts[:client_key]
+      chef_opts[:verify_api_cert]      = opts[:ssl][:verify] || opts[:ssl][:verify].nil?
+      chef_opts[:ssl_verify_mode]      = chef_opts[:verify_api_cert] ? :verify_peer : :verify_none
+      chef_opts[:ssl_ca_path]          = opts[:ssl][:ca_path] if opts[:ssl][:ca_path]
+      chef_opts[:ssl_ca_file]          = opts[:ssl][:ca_file] if opts[:ssl][:ca_file]
+      chef_opts[:ssl_client_cert]      = opts[:ssl][:client_cert] if opts[:ssl][:client_cert]
+      chef_opts[:ssl_client_key]       = opts[:ssl][:client_key] if opts[:ssl][:client_key]
+      # chef/http/ssl_policies.rb reads only from Chef::Config and not from the opts in the constructor
+      Chef::Config[:verify_api_cert] = chef_opts[:verify_api_cert]
+      Chef::Config[:ssl_verify_mode] = chef_opts[:ssl_verify_mode]
       super(opts[:server_url].to_s, **chef_opts)
     end
 

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "6.2.1"
+  VERSION = "6.2.2"
 end

data/spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb

@@ -56,6 +56,63 @@ describe Berkshelf::APIClient::Connection do
     end
   end
 
+  describe "disabling ssl validation on requests" do
+    let(:instance) { described_class.new("https://supermarket.getchef.com", ssl: { verify: false }) }
+
+    before do
+      body_response = %q{{"ruby":{"1.2.3":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{"CentOS":"= 6.0.0"},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+
+      stub_request(:get, "https://supermarket.getchef.com/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
+    end
+
+    subject { instance.universe }
+
+    it "correctly disables SSL validation" do
+      expect_any_instance_of(Net::HTTP).to receive(:use_ssl=).with(true).and_call_original
+      expect_any_instance_of(Net::HTTP).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_NONE).and_call_original
+      expect(subject).to be_a(Array)
+    end
+  end
+
+  describe "enabling ssl validation on requests" do
+    let(:instance) { described_class.new("https://supermarket.getchef.com", ssl: { verify: true }) }
+
+    before do
+      body_response = %q{{"ruby":{"1.2.3":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{"CentOS":"= 6.0.0"},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+
+      stub_request(:get, "https://supermarket.getchef.com/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
+    end
+
+    subject { instance.universe }
+
+    it "correctly disables SSL validation" do
+      expect_any_instance_of(Net::HTTP).to receive(:use_ssl=).with(true).and_call_original
+      expect_any_instance_of(Net::HTTP).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER).and_call_original
+      expect(subject).to be_a(Array)
+    end
+  end
+
+  describe "enabling ssl validation by default" do
+    let(:instance) { described_class.new("https://supermarket.getchef.com") }
+
+    before do
+      body_response = %q{{"ruby":{"1.2.3":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"},"2.0.0":{"endpoint_priority":0,"platforms":{},"dependencies":{"build-essential":">= 1.2.2"},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}},"elixir":{"1.0.0":{"endpoint_priority":0,"platforms":{"CentOS":"= 6.0.0"},"dependencies":{},"location_type":"supermarket","location_path":"https://supermarket.getchef.com/"}}}}
+
+      stub_request(:get, "https://supermarket.getchef.com/universe")
+        .to_return(status: 200, body: body_response, headers: { "Content-Type" => "application/json; charset=utf-8" })
+    end
+
+    subject { instance.universe }
+
+    it "correctly disables SSL validation" do
+      expect_any_instance_of(Net::HTTP).to receive(:use_ssl=).with(true).and_call_original
+      expect_any_instance_of(Net::HTTP).to receive(:verify_mode=).with(OpenSSL::SSL::VERIFY_PEER).and_call_original
+      expect(subject).to be_a(Array)
+    end
+  end
+
   describe "non-200s" do
     before do
       Chef::Config[:http_retry_delay] = 0.001

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: buff-config