berkshelf 5.4.0 → 5.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e3a4dcddb8f6d12c77772490069f719ead98156
-  data.tar.gz: dba1a0d5105358905a3c0ca3d54047e02d295ae8
+  metadata.gz: 5a3f9e9bd7d92a7838beb8793edcd04cc798c02d
+  data.tar.gz: a672c2e4b45781178d2cb349cb223ca6dffd3d0b
 SHA512:
-  metadata.gz: f933116dd5dbbe78186a8798e50cb9f15c92749e632fde5a7bdee589a74404d27ad049a020106e8dd5dbde4bba05befab68e2bd0850a388757a021bdcda08b76
-  data.tar.gz: 5d239e8b15c8a78138776a16a7e1795ea199c26a1978b506441124b23c6f54d54ee3cb5e836071103d6dd6cb919d808b8e674b71f3e6b307c1870c08d0c53e55
+  metadata.gz: 3c3144282091497c4ea2ea80e2e360b365a7731123b16184af5aac29fc430265d940c1c5464a2d5d82942055eda7243f67aa47d163bf8e157d1678016f05c7c7
+  data.tar.gz: '01729fc8d5d3f4c946cdc507e0b727a0bb808d0cda011d6455b73c0c44338dbe6d76db3bb6f568d6bd9b3ba7dafc88905815bfa2d70c6fe11a04c41311e1bb4c'

data/Gemfile.lock

@@ -34,7 +34,7 @@ GIT
 PATH
   remote: .
   specs:
-    berkshelf (5.4.0)
+    berkshelf (5.5.0)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (>= 2.0.2, < 4.0)
       buff-config (~> 2.0)
@@ -60,7 +60,8 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
     archive (0.0.6)
       ffi (~> 1.9.3)
     artifactory (2.5.1)
@@ -87,18 +88,18 @@ GEM
     buff-ruby_engine (1.0.0)
     buff-shell_out (1.1.0)
       buff-ruby_engine (~> 1.0)
-    builder (3.2.2)
+    builder (3.2.3)
     celluloid (0.16.0)
       timers (~> 4.0.0)
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.16.42)
+    chef-config (12.17.44)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
       mixlib-shellout (~> 2.0)
-    chef-zero (5.1.0)
+    chef-zero (5.1.1)
       ffi-yajl (~> 2.2)
       hashie (>= 2.0, < 4.0)
       mixlib-log (~> 1.3)
@@ -132,8 +133,8 @@ GEM
       ffi (~> 1.9)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.2.5)
-    domain_name (0.5.20161021)
+    diff-lcs (1.3)
+    domain_name (0.5.20161129)
       unf (>= 0.0.5, < 1.0.0)
     equalizer (0.0.11)
     erubis (2.7.0)
@@ -141,7 +142,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     faraday-http-cache (2.0.0)
       faraday (~> 0.8)
-    ffi (1.9.14)
+    ffi (1.9.17)
     ffi-yajl (2.3.0)
       libyajl2 (~> 1.2)
     formatador (0.2.5)
@@ -150,7 +151,7 @@ GEM
       ruby-progressbar (~> 1.4)
     fuzzyurl (0.9.0)
     gherkin (4.0.0)
-    grape (0.18.0)
+    grape (0.19.1)
       activesupport
       builder
       hashie (>= 2.1.0)
@@ -187,7 +188,7 @@ GEM
       guard (~> 2.0)
       guard-compat (~> 1.0)
       spork (>= 0.8.4)
-    hashdiff (0.3.1)
+    hashdiff (0.3.2)
     hashie (3.4.6)
     hitimes (1.2.4)
     http (2.1.0)
@@ -199,25 +200,25 @@ GEM
       domain_name (~> 0.5)
     http-form_data (1.0.1)
     http_parser.rb (0.6.0)
-    httpclient (2.8.2.4)
+    httpclient (2.8.3)
     i18n (0.7.0)
     ice_nine (0.11.2)
-    json (1.8.3)
+    json (1.8.6)
     libyajl2 (1.2.0)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.10)
+    lumberjack (1.0.11)
     method_source (0.8.2)
     minitar (0.5.4)
-    minitest (5.9.1)
-    mixlib-archive (0.2.0)
+    minitest (5.10.1)
+    mixlib-archive (0.3.0)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log
     mixlib-config (2.2.4)
-    mixlib-install (2.1.7)
+    mixlib-install (2.1.9)
       artifactory
       mixlib-shellout
       mixlib-versioning
@@ -229,7 +230,7 @@ GEM
     msgpack (1.0.2)
     multi_json (1.12.1)
     multi_test (0.1.2)
-    multi_xml (0.5.5)
+    multi_xml (0.6.0)
     multipart-post (2.0.0)
     mustermann (0.4.0)
       tool (~> 0.2)
@@ -238,10 +239,10 @@ GEM
     nenv (0.3.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
-    net-ssh (3.2.0)
+    net-ssh (4.0.1)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
-    nio4r (1.2.1)
+    nio4r (2.0.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
@@ -251,11 +252,12 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    public_suffix (2.0.5)
     rack (2.0.1)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rainbow (2.2.1)
-    rake (11.3.0)
+    rake (12.0.0)
     rb-fsevent (0.9.8)
     rb-inotify (0.9.7)
       ffi (>= 0.5.0)
@@ -311,12 +313,12 @@ GEM
       molinillo (>= 0.5)
       semverse (>= 1.1, < 3.0)
     spork (0.9.2)
-    test-kitchen (1.14.0)
+    test-kitchen (1.15.0)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
       net-scp (~> 1.1)
-      net-ssh (>= 2.9, < 4.0)
-      net-ssh-gateway (~> 1.2.0)
+      net-ssh (>= 2.9, < 5.0)
+      net-ssh-gateway (~> 1.2)
       safe_yaml (~> 1.0)
       thor (~> 0.18)
     thor (0.19.1)
@@ -339,14 +341,14 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    webmock (2.1.0)
+    webmock (2.3.2)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    websocket-driver (0.6.4)
+    websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    yard (0.9.5)
+    yard (0.9.8)
 
 PLATFORMS
   ruby
@@ -376,4 +378,4 @@ DEPENDENCIES
   yard (>= 0.8)
 
 BUNDLED WITH
-   1.13.7
+   1.14.2

data/lib/berkshelf/berksfile.rb

@@ -629,6 +629,8 @@ module Berkshelf
       Dir.mktmpdir('vendor') do |scratch|
         chefignore       = nil
         cached_cookbooks = install
+        raw_metadata_files = []
+
         return nil if cached_cookbooks.empty?
 
         cached_cookbooks.each do |cookbook|
@@ -647,10 +649,27 @@ module Berkshelf
             cookbook.compile_metadata(cookbook_destination)
           end
 
+          raw_metadata_files << File::join(cookbook.cookbook_name, 'metadata.rb')
+
           FileUtils.cp_r(files, cookbook_destination)
         end
 
-        FileSyncer.sync(scratch, destination, exclude: EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: @delete)
+        # Don't vendor the raw metadata (metadata.rb). The raw metadata is
+        # unecessary for the client, and this is required until compiled metadata
+        # (metadata.json) takes precedence over raw metadata in the Chef-Client.
+        #
+        # We can change back to including the raw metadata in the future after
+        # this has been fixed or just remove these comments. There is no
+        # circumstance that I can currently think of where raw metadata should
+        # ever be read by the client.
+        #
+        # - Jamie
+        #
+        # See the following tickets for more information:
+        #
+        #   * https://tickets.opscode.com/browse/CHEF-4811
+        #   * https://tickets.opscode.com/browse/CHEF-4810
+        FileSyncer.sync(scratch, destination, exclude: raw_metadata_files + EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: @delete)
       end
 
       destination

data/lib/berkshelf/downloader.rb

@@ -80,7 +80,7 @@ module Berkshelf
         Celluloid.logger = nil unless ENV["DEBUG_CELLULOID"]
         Ridley.open(credentials) { |r| r.cookbook.download(name, version) }
       when :github
-        Thread.exclusive { require 'octokit' unless defined?(Octokit) }
+        require 'octokit'
 
         tmp_dir      = Dir.mktmpdir
         archive_path = File.join(tmp_dir, "#{name}-#{version}.tar.gz")
@@ -124,7 +124,7 @@ module Berkshelf
 
         File.join(unpack_dir, cookbook_directory)
       when :uri
-        Thread.exclusive { require 'open-uri' unless defined?(OpenURI) }
+        require 'open-uri'
 
         tmp_dir      = Dir.mktmpdir
         archive_path = Pathname.new(tmp_dir) + "#{name}-#{version}.tar.gz"
@@ -145,8 +145,6 @@ module Berkshelf
 
         (unpack_dir + cookbook_directory).to_s
       when :gitlab
-        #Thread.exclusive { require 'octokit' unless defined?(Octokit) }
-
         tmp_dir      = Dir.mktmpdir
         archive_path = Pathname.new(tmp_dir) + "#{name}-#{version}.tar.gz"
         unpack_dir   = Pathname.new(tmp_dir) + "#{name}-#{version}"

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "5.4.0"
+  VERSION = "5.5.0"
 end

data/spec/unit/berkshelf/berksfile_spec.rb

@@ -387,9 +387,10 @@ describe Berkshelf::Berksfile do
   describe '#vendor' do
     let(:cached_cookbook)    { double(Berkshelf::CachedCookbook, cookbook_name: 'my_cookbook', path: '/my_cookbook/path', compiled_metadata?: true) }
     let(:installer)          { double(Berkshelf::Installer, run: [cached_cookbook]) }
+    let(:raw_metadata_files) { [File::join(cached_cookbook.cookbook_name, 'metadata.rb')] }
 
     let(:destination) { '/a/destination/path' }
-    let(:options)    { { :exclude => Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
+    let(:options)    { { :exclude => raw_metadata_files + Berkshelf::Berksfile::EXCLUDED_VCS_FILES_WHEN_VENDORING, delete: nil } }
 
     before do
       allow(Berkshelf::Installer).to receive(:new).and_return(installer)
@@ -401,9 +402,9 @@ describe Berkshelf::Berksfile do
       subject.vendor(destination)
     end
 
-    it 'includes the top-level metadata.rb file' do
+    it 'excludes the top-level metadata.rb file' do
       expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/recipes/metadata.rb', File::FNM_DOTMATCH) }).to be(false)
-      expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/metadata.rb', File::FNM_DOTMATCH) }).to be(false)
+      expect(options[:exclude].any? { |exclude| File.fnmatch?(exclude, 'my_cookbook/metadata.rb', File::FNM_DOTMATCH) }).to be(true)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 5.4.0
+  version: 5.5.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -478,7 +478,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: Manages a Cookbook's, or an Application's, Cookbook dependencies