berkshelf 5.6.4 → 5.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 409c41e8dc72a361b7aad7e5afe718e6bc69ccf3
-  data.tar.gz: a824d62bdc2f419db0fd693232275b4348686c8e
+  metadata.gz: 33e876c1bf17b5d4b7f9476c516e1650ee94ec06
+  data.tar.gz: 60ec3493e1c2588b9d57a1b9955b9835e41dcc0c
 SHA512:
-  metadata.gz: ab396ce9d36abc61cc327d6ae13873b361c3c4e48aedbca92eab219b052d1d36aed49cdc3a0cde6e3e69ecb95cb7f8f341a8380b7a6c2ebc000cbaf03f9e819c
-  data.tar.gz: ad8227ce4c7117b15d051b4c24b8155cf903260026dd9595a341133149f9444be2f6b903f5d10fe807278cd061df0d8fcf9dad10159ce06e54f903dfdb188835
+  metadata.gz: 76b01e75c80bd1babc5cc47713f7d24b61853eaa64657b806ce5a5b1eb7139da9d90529d4837d570f3ae2ce56f7674ec91b0c86e464b13e7d33838b9895e8a74
+  data.tar.gz: 47b2910e768383ca4ed83d6e9bf1bfa4a539b8e4688484549c11d6f497b7ddfd63f8bdd004ec913383076c40de237d419fc4dd5e1a425e6e1ed893c3272a7c0a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [5.6.5](https://github.com/berkshelf/berkshelf/tree/5.6.4) (2017-05-04)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.4...5.6.5)
+
+**Merged pull requests:**
+
+- Handle Windows backslashes in trusted_certs path [\#1689](https://github.com/berkshelf/berkshelf/pull/1689) ([jeremymv2](https://github.com/jeremymv2))
+
 ## [5.6.4](https://github.com/berkshelf/berkshelf/tree/5.6.4) (2017-03-14)
 [Full Changelog](https://github.com/berkshelf/berkshelf/compare/v5.6.3...5.6.4)
 

data/Gemfile.lock

@@ -20,7 +20,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (5.6.4)
+    berkshelf (5.6.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -46,7 +46,7 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     archive (0.0.6)
       ffi (~> 1.9.3)
@@ -80,7 +80,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.19.33)
+    chef-config (13.0.118)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -178,7 +178,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashdiff (0.3.2)
-    hashie (3.5.4)
+    hashie (3.5.5)
     hitimes (1.2.4)
     http (2.2.0)
       addressable (~> 2.3)
@@ -237,7 +237,7 @@ GEM
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    octokit (4.6.2)
+    octokit (4.7.0)
       sawyer (~> 0.8.0, >= 0.5.3)
     pry (0.10.4)
       coderay (~> 1.1.0)

data/lib/berkshelf/ssl_policies.rb

@@ -22,7 +22,7 @@ module Berkshelf
     end
 
     def trusted_certs_dir
-      config_dir = Berkshelf.config.chef.trusted_certs_dir.to_s
+      config_dir = Berkshelf.config.chef.trusted_certs_dir.to_s.tr('\\', '/')
       if config_dir.empty? || !::File.exist?(config_dir)
         File.join(ENV["HOME"], ".chef", "trusted_certs")
       else

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.6.4"
+  VERSION = "5.6.5"
 end

data/spec/unit/berkshelf/ssl_policies_spec.rb

@@ -2,6 +2,8 @@ require "spec_helper"
 
 describe Berkshelf::SSLPolicy do
   let(:self_signed_crt_path) { File.join(BERKS_SPEC_DATA, "trusted_certs") }
+  let(:self_signed_crt_path_windows_backslashes) { "C:/users/vagrant\\.chef\\trusted_certs" }
+  let(:self_signed_crt_path_windows_forwardslashes) { "C:/users/vagrant/.chef/trusted_certs" }
 
   let(:chef_config) do
     double(Ridley::Chef::Config,
@@ -61,7 +63,7 @@ describe Berkshelf::SSLPolicy do
         end
       end
 
-      context "config is seti but does not exist" do
+      context "config is set but does not exist" do
         before { allow(chef_config).to receive_messages(trusted_certs_dir: "/fake") }
 
         it "defaults to ~/.chef/trusted_certs" do
@@ -70,6 +72,19 @@ describe Berkshelf::SSLPolicy do
           )
         end
       end
+
+      context 'config has Windows backslashes in trusted_certs_dir path' do
+        before do
+          allow(chef_config).to receive_messages(trusted_certs_dir: self_signed_crt_path_windows_backslashes)
+          allow(File).to receive(:exist?).with(self_signed_crt_path_windows_forwardslashes).and_return(true)
+        end
+
+        it 'replaces the backslashes in trusted_certs_dir from Berkshelf config with forwardslashes' do
+          expect(subject.trusted_certs_dir).to eq(
+            self_signed_crt_path_windows_forwardslashes
+          )
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.6.4
+  version: 5.6.5
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-14 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -479,7 +479,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies