berkshelf 6.2.2 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 957ca7b1c871821c5d91be2ff270c37ad90044fa
-  data.tar.gz: 1af13dcc965672d9e31c53425150a1c6e24e9e55
+  metadata.gz: 8e620a63bb67ebae68ad87fad7690fe42ef45561
+  data.tar.gz: '093db285607a11b1d6af5006b86d2053cc42a387'
 SHA512:
-  metadata.gz: 1f1d111e55146320ac610f666ff5d27ce3e6bbaa91c7f53a4d350705698b61b3a0ae2cd2d383a9953c3e0a33ef21ee3bdfee33b5dcdc1ba5c69117e24e502d88
-  data.tar.gz: d32ad02c06048835d13552410b5764dfa79f976547ac96bac38e758327b5a138840af94f476a9db1c5dc042412bf0676ac0d5ab1daab7dc12bef381a12eeca93
+  metadata.gz: c165040371c0ac425b1bfe92d45e5355c6e2ffdb62d43648d77a877379512642f7519c3ba971d602680b9fb8af1073e2e7e05232497b17e24eaa87c053533462
+  data.tar.gz: f2191da269c43f42eddc36532f9b785dbfb59fd8df1cce24ac109f9ca504088b5798a0a49f7ccb6fec98db877403cec86466b2133189a4e13ed6caf25f5fd071

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [6.3.0](https://github.com/berkshelf/berkshelf/tree/6.3.0) (2017-08-08)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.2.2...6.3.0)
+
+**Merged pull requests:**
+
+- 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))
+
+## [v6.2.2](https://github.com/berkshelf/berkshelf/tree/v6.2.2) (2017-08-02)
+[Full Changelog](https://github.com/berkshelf/berkshelf/compare/v6.2.1...v6.2.2)
+
+**Merged pull requests:**
+
+- fix verify false and add tests [\#1720](https://github.com/berkshelf/berkshelf/pull/1720) ([lamont-granquist](https://github.com/lamont-granquist))
+- Docs update [\#1715](https://github.com/berkshelf/berkshelf/pull/1715) ([iennae](https://github.com/iennae))
+
 ## [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)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    berkshelf (6.2.2)
+    berkshelf (6.3.0)
       buff-config (~> 2.0)
       buff-extensions (~> 2.0)
       chef (>= 12.7.2)
@@ -119,7 +119,7 @@ GEM
     domain_name (0.5.20170404)
       unf (>= 0.0.5, < 1.0.0)
     erubis (2.7.0)
-    faraday (0.12.1)
+    faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
@@ -142,7 +142,7 @@ GEM
     hashdiff (0.3.4)
     hashie (3.5.6)
     highline (1.7.8)
-    hitimes (1.2.5)
+    hitimes (1.2.6)
     http (2.2.2)
       addressable (~> 2.3)
       http-cookie (~> 1.0)
@@ -160,7 +160,7 @@ GEM
     json (2.1.0)
     libyajl2 (1.2.0)
     minitar (0.6.1)
-    minitest (5.10.2)
+    minitest (5.10.3)
     mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
@@ -169,7 +169,7 @@ GEM
     mixlib-config (2.2.4)
     mixlib-log (1.7.1)
     mixlib-shellout (2.3.2)
-    molinillo (0.6.0)
+    molinillo (0.6.1)
     multi_json (1.12.1)
     multi_test (0.1.2)
     multipart-post (2.0.0)
@@ -199,7 +199,7 @@ GEM
       plist (~> 3.1)
       systemu (~> 2.6.4)
       wmi-lite (~> 1.0)
-    parallel (1.11.2)
+    parallel (1.12.0)
     parser (2.4.0.0)
       ast (~> 2.2)
     plist (3.3.0)
@@ -262,16 +262,16 @@ GEM
       addressable (>= 2.3.5, < 2.6)
       faraday (~> 0.8, < 1.0)
     semverse (2.0.0)
-    serverspec (2.39.1)
+    serverspec (2.39.2)
       multi_json
       rspec (~> 3.0)
       rspec-its
       specinfra (~> 2.68)
     sfl (2.3)
-    solve (3.1.0)
+    solve (3.1.1)
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
-    specinfra (2.70.0)
+    specinfra (2.70.1)
       net-scp
       net-ssh (>= 2.7, < 5.0)
       net-telnet

data/lib/berkshelf/community_rest.rb

@@ -104,9 +104,12 @@ module Berkshelf
       if File.cookbook?(extracted)
         extracted
       else
-        Dir.glob(File.join(extracted, "*")).find do |dir|
-          File.cookbook?(dir)
+        dir = Dir.chdir(extracted) do
+          Dir.glob("*").find do |dir|
+            File.cookbook?(dir)
+          end
         end
+        File.join(extracted, dir) if dir
       end
     ensure
       archive.unlink unless archive.nil?

data/lib/berkshelf/cookbook_store.rb

@@ -48,7 +48,9 @@ module Berkshelf
 
     # Destroy the contents of the initialized storage path.
     def clean!
-      FileUtils.rm_rf(Dir.glob(File.join(storage_path, "*")))
+      Dir.chdir(storage_path) do
+        FileUtils.rm_rf(Dir.glob("*"))
+      end
     end
 
     # Import a cookbook found on the local filesystem into this instance of the cookbook store.

data/lib/berkshelf/file_syncer.rb

@@ -17,6 +17,13 @@ module Berkshelf
     # @return [Array<String>]
     #   the list of all files
     #
+    # @note
+    #   Globbing on windows is strange. Do not pass a path that contains
+    #   "symlinked" directories. Dir.glob will not see them. As an example,
+    #   'C:\Documents and Settings' is not a real directory and int recent
+    #   versions of windows points at 'C:\users'. Some users have their
+    #   temp directory still referring to 'C:\Documents and Settings'.
+    #
     def glob(pattern)
       Dir.glob(pattern, File::FNM_DOTMATCH).sort.reject do |file|
         basename = File.basename(file)
@@ -58,24 +65,18 @@ module Berkshelf
         [exclude, "#{exclude}/*"]
       end.flatten
 
-      # let glob expand the source directory in case it is an abbreviated windows
-      # user directory: C:/Users/MATTWR~1/AppData/Local/Temp
-      # so that it matches the parent of source_files
-      source = glob(source).first
-
-      source_files = glob(File.join(source, "**/*"))
-      source_files = source_files.reject do |source_file|
-        basename = relative_path_for(source_file, source)
-        excludes.any? { |exclude| File.fnmatch?(exclude, basename, File::FNM_DOTMATCH) }
+      source_files = Dir.chdir(source) do
+        glob("**/*").reject do |source_file|
+          excludes.any? { |exclude| File.fnmatch?(exclude, source_file, File::FNM_DOTMATCH) }
+        end
       end
 
       # Ensure the destination directory exists
       FileUtils.mkdir_p(destination) unless File.directory?(destination)
 
       # Copy over the filtered source files
-      source_files.each do |source_file|
-        relative_path = relative_path_for(source_file, source)
-
+      source_files.each do |relative_path|
+        source_file = File.join(source, relative_path)
         # Create the parent directory
         parent = File.join(destination, File.dirname(relative_path))
         FileUtils.mkdir_p(parent) unless File.directory?(parent)
@@ -102,20 +103,13 @@ module Berkshelf
 
       if options[:delete]
         # Remove any files in the destination that are not in the source files
-        destination_files = glob("#{destination}/**/*")
-
-        # Calculate the relative paths of files so we can compare to the
-        # source.
-        relative_source_files = source_files.map do |file|
-          relative_path_for(file, source)
-        end
-        relative_destination_files = destination_files.map do |file|
-          relative_path_for(file, destination)
+        destination_files = Dir.chdir(destination) do
+          glob("**/*")
         end
 
         # Remove any extra files that are present in the destination, but are
         # not in the source list
-        extra_files = relative_destination_files - relative_source_files
+        extra_files = destination_files - source_files
         extra_files.each do |file|
           FileUtils.rm_rf(File.join(destination, file))
         end
@@ -123,21 +117,5 @@ module Berkshelf
 
       true
     end
-
-    private
-
-      #
-      # The relative path of the given +path+ to the +parent+.
-      #
-      # @param [String] path
-      #   the path to get relative with
-      # @param [String] parent
-      #   the parent where the path is contained (hopefully)
-      #
-      # @return [String]
-      #
-    def relative_path_for(path, parent)
-      Pathname.new(path).relative_path_from(Pathname.new(parent)).to_s
-    end
   end
 end

data/lib/berkshelf/ssl_policies.rb

@@ -31,9 +31,11 @@ module Berkshelf
     end
 
     def set_custom_certs
-      ::Dir.glob("#{trusted_certs_dir}/" "{*.crt,*.pem}").each do |cert|
-        cert = OpenSSL::X509::Certificate.new(IO.read(cert))
-        add_trusted_cert(cert)
+      Dir.chdir(trusted_certs_dir) do
+        ::Dir.glob("{*.crt,*.pem}").each do |cert|
+          cert = OpenSSL::X509::Certificate.new(IO.read(cert))
+          add_trusted_cert(cert)
+        end
       end
     end
   end

data/lib/berkshelf/validator.rb

@@ -24,9 +24,12 @@ module Berkshelf
         Array(cookbooks).each do |cookbook|
           path = cookbook.path.to_s
 
-          files = Dir.glob(File.join(path, "**", "*.rb")).select do |f|
-            parent = Pathname.new(path).dirname.to_s
-            f.gsub(parent, "") =~ /[[:space:]]/
+          files = Dir.chdir(path) do
+            Dir.glob(File.join("**", "*.rb")).select do |f|
+              f = File.join(path, f)
+              parent = Pathname.new(path).dirname.to_s
+              f.gsub(parent, "") =~ /[[:space:]]/
+            end
           end
 
           raise InvalidCookbookFiles.new(cookbook, files) unless files.empty?

data/lib/berkshelf/version.rb

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

data/spec/unit/berkshelf/community_rest_spec.rb

@@ -93,6 +93,7 @@ describe Berkshelf::CommunityREST do
         .and_return("/foo/nginx")
         .once
       expect(archive).to receive(:unlink).once
+      expect(Dir).to receive(:chdir).with("/foo/nginx")
 
       subject.download("bacon", "1.0.0")
     end

data/spec/unit/berkshelf/ssl_policies_spec.rb

@@ -78,6 +78,7 @@ describe Berkshelf::SSLPolicy 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)
+          allow(Dir).to receive(:chdir).with(self_signed_crt_path_windows_forwardslashes)
         end
 
         it "replaces the backslashes in trusted_certs_dir from Berkshelf config with forwardslashes" do

data/spec/unit/berkshelf/validator_spec.rb

@@ -4,6 +4,10 @@ describe Berkshelf::Validator do
   describe "#validate_files" do
     let(:cookbook) { double("cookbook", cookbook_name: "cookbook", path: "path") }
 
+    before do
+      allow(Dir).to receive(:chdir) { |&block| block.call }
+    end
+
     it "raises an error when the cookbook has spaces in the files" do
       allow(Dir).to receive(:glob).and_return(["/there are/spaces/in this/recipes/default.rb"])
       expect do

metadata

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