berkshelf 3.1.5 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b9ee0bbcbb69dc7f55aaf3ca127f9dbd3b2dafc
-  data.tar.gz: 71e33ba4b6f966b65c8531cb01dc901e7abceeb6
+  metadata.gz: be55c4c1bb887daab19c58ef3a4f2f905af29033
+  data.tar.gz: f0d4402fa9850c728b51ba239fec76de438fef1f
 SHA512:
-  metadata.gz: cd70423af3cc72518f759619d2ed4706299a95626915cb45f312390cfadbdda46629ef0c5c106bbd2c919fd4f3369f5b82ee6a7801460d18765595951e20d287
-  data.tar.gz: c88ac3755f5f54469e2af5af73ec09b03d360045990daf7bf99a9badf2be0db3b16b914f3811a7d4fc597aa5cbf40a9aa0af3d24b679a11440315db9139bc7c0
+  metadata.gz: fe6cbe54f7acb7d5cdae6cced81df057585c0b8efba3fe532d7fd72ef7f28449f1a05a7859c977acf39f01090a0ec34da5ff3416ced45a9dd8df552aa7c126d7
+  data.tar.gz: 5d92e870bcac605248af9bfc0d7c5c8b827d63ea11014c7a95ff66177fcb6d67ec056f94d2605d22064a38f251ffa725799ecaf3ff202b7611dcaf3a15b2e955

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 > This is a high level digest of changes. For the complete CHANGELOG diff two tags in the project's [commit history](https://github.com/berkshelf/berkshelf/commits/master).
 
+# 3.2.0
+
+* Improvements
+  * Add version information to edges of generated visualization graph
+  * Bump to latest full release of Celluloid
+  * Updated some errors to include more information about what went wrong / how to make it better
+  * Lockfiles will be named after the name of the Berksfile, not always Berksfile.lock
+  * Vendoring will now sync files between two directories instead of deleting the target and it's contents
+  * Add support for downloading from Berkshelf-API file_store location
+  * Add `berks verify` command to validate Ruby syntax, ERB templates, and file names of cookbooks
+
+* Bug Fixes
+  * Fixed a number of typos and documentation errors
+  * Fix running `berks viz` when pwd has spaces in it
+  * Fix checking for graphviz on Windows
+  * Remove PaxHeader files before uploading
+  * BERKSHELF_PATH will always be fully expanded regardless of how it is configured
+
+* Deprecations
+  * vagrant.omnibus.enabled configuration option is now deprecated
+
 # 3.1.5
 
 * Bug Fixes

data/berkshelf.gemspec

@@ -35,21 +35,22 @@ Gem::Specification.new do |s|
   s.add_dependency 'buff-config',          '~> 1.0'
   s.add_dependency 'buff-extensions',      '~> 1.0'
   s.add_dependency 'buff-shell_out',       '~> 0.1'
+  s.add_dependency 'cleanroom',            '~> 1.0'
   s.add_dependency 'faraday',              '~> 0.9.0'
   s.add_dependency 'minitar',              '~> 0.5.4'
   s.add_dependency 'retryable',            '~> 1.3.3'
   s.add_dependency 'ridley',               '~> 4.0'
   s.add_dependency 'solve',                '~> 1.1'
-  s.add_dependency 'thor',                 '~> 0.18'
+  s.add_dependency 'thor',                 '~> 0.19'
   s.add_dependency 'octokit',              '~> 3.0'
-  s.add_dependency 'celluloid',            '~> 0.16.0.pre'
-  s.add_dependency 'celluloid-io',         '~> 0.16.0.pre'
+  s.add_dependency 'celluloid',            '~> 0.16.0'
+  s.add_dependency 'celluloid-io',         '~> 0.16.1'
 
-  s.add_development_dependency 'aruba',         '~> 0.5'
+  s.add_development_dependency 'aruba',         '~> 0.6'
   s.add_development_dependency 'chef-zero',     '~> 1.5.0'
   s.add_development_dependency 'fuubar',        '~> 1.1'
   s.add_development_dependency 'rake',          '~> 0.9'
-  s.add_development_dependency 'rspec',         '~> 2.13'
+  s.add_development_dependency 'rspec',         '~> 3.0'
   s.add_development_dependency 'spork',         '~> 0.9'
   s.add_development_dependency 'test-kitchen',  '~> 1.2'
   s.add_development_dependency 'webmock',       '~> 1.11'

data/features/commands/search.feature

@@ -10,7 +10,7 @@ Feature: berks search
     * I successfully run `berks search berkshelf-`
     * the output should contain:
       """
-      berkshelf-api (1.0.0)
-      berkshelf-api-server (2.0.0)
+      berkshelf-api (1.2.2)
+      berkshelf-api-server (2.1.0)
       berkshelf-cookbook-fixture (1.0.0)
       """

data/features/commands/vendor.feature

@@ -94,8 +94,12 @@ Feature: Vendoring cookbooks to a directory
       cookbook 'fake'
       """
     And a directory named "cukebooks"
-    When I run `berks vendor cukebooks`
-    And the exit status should be "VendorError"
+    And a directory named "cukebooks/fake/ponies"
+    And a directory named "cukebooks/existing_cookbook"
+    When I successfully run `berks vendor cukebooks`
+    And the directory "cukebooks/fake" should contain version "1.0.0" of the "fake" cookbook
+    And a directory named "cukebooks/fake/ponies" should not exist
+    And a directory named "cukebooks/existing_cookbook" should not exist
 
   Scenario: vendoring into a nested directory
     Given I have a Berksfile pointing at the local Berkshelf API with:

data/features/commands/verify.feature

@@ -0,0 +1,29 @@
+Feature: berks verify
+  Scenario: running verify when there is no Lockfile present
+    Given a cookbook named "sparkle_motion"
+    And I cd to "sparkle_motion"
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    And I run `berks verify`
+    Then the output should contain:
+      """
+      Lockfile not found! Run `berks install` to create the lockfile.
+      """
+    And the exit status should be "LockfileNotFound"
+
+  Scenario: running verify when there is a valid Lockfile present
+    Given a cookbook named "sparkle_motion"
+    And I cd to "sparkle_motion"
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      metadata
+      """
+    When I successfully run `berks install`
+    And I successfully run `berks verify`
+    Then the output should contain:
+      """
+      Verifying (1) cookbook(s)...
+      Verified.
+      """

data/features/config.feature

@@ -2,37 +2,8 @@ Feature: Reading a Berkshelf configuration file
   Scenario: Missing a Berkshelf configuration file
     When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.omnibus.chef_version = :latest |
-      | config.vm.box = "chef/ubuntu-14.04" |
-      | config.vm.box_url = "https://vagrantcloud.com/chef/ubuntu-14.04/version/1/provider/virtualbox.box" |
-
-  Scenario: Using a Berkshelf configuration file that disables the vagrant-omnibus plugin
-    Given I have a Berkshelf config file containing:
-    """
-    {
-      "vagrant": {
-        "omnibus": {
-          "enabled": false,
-          "version": "11.4.4"
-        },
-        "vm": {
-          "box": "my_box",
-          "box_url": "http://files.vagrantup.com/lucid64.box",
-          "forward_port": {
-            "12345": "54321"
-          }
-        }
-      }
-    }
-    """
-    When I successfully run `berks cookbook sparkle_motion`
-    Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | #config.omnibus.chef_version = :latest |
-      | config.vm.box = "my_box" |
-      | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
-      | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-      | config.vm.network :private_network, type: "dhcp" |
-    And the exit status should be 0
+      | config.omnibus.chef_version = 'latest' |
+      | config.vm.box = 'chef/ubuntu-14.04' |
 
   Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version
     Given I have a Berkshelf config file containing:
@@ -40,12 +11,10 @@ Feature: Reading a Berkshelf configuration file
     {
       "vagrant": {
         "omnibus": {
-          "enabled": true,
           "version": "11.4.4"
         },
         "vm": {
-          "box": "my_box",
-          "box_url": "http://files.vagrantup.com/lucid64.box",
+          "box": "chef/ubuntu-14.04",
           "forward_port": {
             "12345": "54321"
           }
@@ -55,11 +24,10 @@ Feature: Reading a Berkshelf configuration file
     """
     When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.omnibus.chef_version = "11.4.4" |
-      | config.vm.box = "my_box" |
-      | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
+      | config.omnibus.chef_version = '11.4.4' |
+      | config.vm.box = 'chef/ubuntu-14.04' |
       | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-      | config.vm.network :private_network, type: "dhcp" |
+      | config.vm.network :private_network, type: 'dhcp' |
     And the exit status should be 0
 
   Scenario: Using a Berkshelf configuration file that sets the vagrant-omnibus plugin chef version to latest
@@ -68,12 +36,10 @@ Feature: Reading a Berkshelf configuration file
     {
       "vagrant": {
         "omnibus": {
-          "enabled": true,
           "version": "latest"
         },
         "vm": {
-          "box": "my_box",
-          "box_url": "http://files.vagrantup.com/lucid64.box",
+          "box": "chef/ubuntu-14.04",
           "forward_port": {
             "12345": "54321"
           }
@@ -83,11 +49,10 @@ Feature: Reading a Berkshelf configuration file
     """
     When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
-      | config.omnibus.chef_version = :latest |
-      | config.vm.box = "my_box" |
-      | config.vm.box_url = "http://files.vagrantup.com/lucid64.box" |
+      | config.omnibus.chef_version = 'latest' |
+      | config.vm.box = 'chef/ubuntu-14.04' |
       | config.vm.network :forwarded_port, guest: 12345, host: 54321 |
-      | config.vm.network :private_network, type: "dhcp" |
+      | config.vm.network :private_network, type: 'dhcp' |
 
   Scenario: Using a partial Berkshelf configuration file
     Given I have a Berkshelf config file containing:
@@ -141,6 +106,6 @@ Feature: Reading a Berkshelf configuration file
     When I successfully run `berks cookbook sparkle_motion`
     Then the resulting "sparkle_motion" Vagrantfile should contain:
       | config.vm.provision :chef_client                    |
-      | chef.chef_server_url        = "localhost:4000"      |
-      | chef.validation_client_name = "my_client-validator" |
-      | chef.validation_key_path    = "/a/b/c/my_client-validator.pem" |
+      | chef.chef_server_url        = 'localhost:4000'      |
+      | chef.validation_client_name = 'my_client-validator' |
+      | chef.validation_key_path    = '/a/b/c/my_client-validator.pem' |

data/features/step_definitions/filesystem_steps.rb

@@ -266,6 +266,6 @@ end
 Then(/^the directory "(.*?)" should contain version "(.*?)" of the "(.*?)" cookbook$/) do |path, version, name|
   cookbook_path = File.join(current_dir, path)
   cookbook = Berkshelf::CachedCookbook.from_path(cookbook_path)
-  expect(cookbook.version).to eql(version)
-  expect(cookbook.cookbook_name).to eql(name)
+  expect(cookbook.version).to eq(version)
+  expect(cookbook.cookbook_name).to eq(name)
 end

data/features/step_definitions/gem_steps.rb

@@ -1,5 +1,7 @@
 Given /^the gem "(.*)" is not installed$/ do |gem_name|
-  Gem::Specification.stub(:find_by_name).with(gem_name).and_raise(Gem::LoadError)
+  allow(Gem::Specification).to receive(:find_by_name)
+    .with(gem_name)
+    .and_raise(Gem::LoadError)
 end
 
 Then /^the output should contain a warning to suggest supporting the option "(.*?)" by installing "(.*?)"$/ do |option, gem_name|

data/features/step_definitions/utility_steps.rb

@@ -1,5 +1,5 @@
-Given /^pending\s+"([^\"]+)"$/ do |msg|
-  pending
+Given /^skip\s+"([^\"]+)"$/ do |msg|
+  skip
 end
 
 Then /the output from \`(.+)\` should be the same as \`(.+)\`/ do |actual, expected|

data/generator_files/Vagrantfile.erb

@@ -2,43 +2,43 @@
 # vi: set ft=ruby :
 
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
-VAGRANTFILE_API_VERSION = "2"
+VAGRANTFILE_API_VERSION = '2'
 
-Vagrant.require_version ">= 1.5.0"
+Vagrant.require_version '>= 1.5.0'
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
   # please see the online documentation at vagrantup.com.
 
-  config.vm.hostname = "<%= "#{cookbook_name.gsub('_','-')}-berkshelf" %>"
+  config.vm.hostname = '<%= "#{cookbook_name.gsub('_','-')}-berkshelf" %>'
 
   # Set the version of chef to install using the vagrant-omnibus plugin
-<% if berkshelf_config.vagrant.omnibus.enabled -%>
-<% if berkshelf_config.vagrant.omnibus.version == "latest" -%>
-  config.omnibus.chef_version = :latest
-<% else %>
-  config.omnibus.chef_version = "<%= berkshelf_config.vagrant.omnibus.version %>"
-<% end -%>
-<% else %>
-  #config.omnibus.chef_version = :latest
-<% end -%>
+  # NOTE: You will need to install the vagrant-omnibus plugin:
+  #
+  #   $ vagrant plugin install vagrant-omnibus
+  #
+  if Vagrant.has_plugin?
+    config.omnibus.chef_version = '<%= berkshelf_config.vagrant.omnibus.version %>'
+  end
 
   # Every Vagrant virtual environment requires a box to build off of.
-  # If this value is a shorthand to a box in Vagrant Cloud then 
+  # If this value is a shorthand to a box in Vagrant Cloud then
   # config.vm.box_url doesn't need to be specified.
-  config.vm.box = "<%= berkshelf_config.vagrant.vm.box %>"
+  config.vm.box = '<%= berkshelf_config.vagrant.vm.box %>'
 
+<% unless berkshelf_config.vagrant.vm.box_url.nil? -%>
   # The url from where the 'config.vm.box' box will be fetched if it
-  # is not a Vagrant Cloud box and if it doesn't already exist on the 
+  # is not a Vagrant Cloud box and if it doesn't already exist on the
   # user's system.
-  # config.vm.box_url = "<%= berkshelf_config.vagrant.vm.box_url %>"
+  config.vm.box_url = '<%= berkshelf_config.vagrant.vm.box_url %>'
+<% end -%>
 
   # Assign this VM to a host-only network IP, allowing you to access it
   # via the IP. Host-only networks can talk to the host machine as well as
   # any other machines on the same network, but cannot be accessed (through this
   # network interface) by any external networks.
-  config.vm.network :private_network, type: "dhcp"
+  config.vm.network :private_network, type: 'dhcp'
 
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
@@ -83,20 +83,20 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # to skip installing and copying to Vagrant's shelf.
   # config.berkshelf.except = []
 
-<% if berkshelf_config.vagrant.vm.provision == "chef_client" -%>
+<% if berkshelf_config.vagrant.vm.provision == 'chef_client' -%>
   config.vm.provision :chef_client do |chef|
-    chef.chef_server_url        = "<%= berkshelf_config.chef.chef_server_url %>"
-    chef.validation_client_name = "<%= berkshelf_config.chef.validation_client_name %>"
-    chef.validation_key_path    = "<%= berkshelf_config.chef.validation_key_path %>"
+    chef.chef_server_url        = '<%= berkshelf_config.chef.chef_server_url %>'
+    chef.validation_client_name = '<%= berkshelf_config.chef.validation_client_name %>'
+    chef.validation_key_path    = '<%= berkshelf_config.chef.validation_key_path %>'
 
     chef.run_list = [
-  <% if options[:chef_minitest] -%>
-      "recipe[minitest-handler::default]",
-  <% end -%>
-      "recipe[<%= cookbook_name %>::default]"
+<% if options[:chef_minitest] %>
+      'recipe[minitest-handler::default]',
+<% end -%>
+      'recipe[<%= cookbook_name %>::default]'
     ]
   end
-<% elsif berkshelf_config.vagrant.vm.provision == "chef_solo" -%>
+<% elsif berkshelf_config.vagrant.vm.provision == 'chef_solo' -%>
   config.vm.provision :chef_solo do |chef|
     chef.json = {
       mysql: {
@@ -107,10 +107,10 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     }
 
     chef.run_list = [
-  <% if options[:chef_minitest] -%>
-      "recipe[minitest-handler::default]",
-  <% end -%>
-      "recipe[<%= cookbook_name %>::default]"
+<% if options[:chef_minitest] %>
+      'recipe[minitest-handler::default]',
+<% end -%>
+      'recipe[<%= cookbook_name %>::default]'
     ]
   end
 <% end -%>

data/generator_files/metadata.rb.erb

@@ -9,4 +9,3 @@ version          IO.read(File.join(File.dirname(__FILE__), 'VERSION'))
 <% else -%>
 version          '0.1.0'
 <% end -%>
-

data/lib/berkshelf.rb

@@ -1,4 +1,5 @@
 require 'buff/extensions'
+require 'cleanroom'
 require 'digest/md5'
 require 'forwardable'
 require 'json'
@@ -21,11 +22,11 @@ module Berkshelf
   require_relative 'berkshelf/errors'
 
   module Mixin
-    autoload :DSLEval, 'berkshelf/mixin/dsl_eval'
     autoload :Git,     'berkshelf/mixin/git'
     autoload :Logging, 'berkshelf/mixin/logging'
   end
 
+  autoload :FileSyncer, 'berkshelf/file_syncer'
   autoload :Shell,      'berkshelf/shell'
   autoload :Uploader,   'berkshelf/uploader'
   autoload :Visualizer, 'berkshelf/visualizer'
@@ -67,7 +68,8 @@ module Berkshelf
     #
     # @return [String]
     def berkshelf_path
-      @berkshelf_path || ENV['BERKSHELF_PATH'] || File.expand_path('~/.berkshelf')
+      path = @berkshelf_path || ENV['BERKSHELF_PATH'] || '~/.berkshelf'
+      File.expand_path(path)
     end
 
     # The Berkshelf configuration.
@@ -218,6 +220,7 @@ require_relative 'berkshelf/logger'
 require_relative 'berkshelf/resolver'
 require_relative 'berkshelf/source'
 require_relative 'berkshelf/source_uri'
+require_relative 'berkshelf/validator'
 
 Ridley.logger          = Berkshelf.logger
 Berkshelf.logger.level = Logger::WARN

data/lib/berkshelf/berksfile.rb

@@ -20,7 +20,7 @@ module Berkshelf
         raise BerksfileNotFound.new(file) unless File.exist?(file)
 
         begin
-          new(file, options).dsl_eval_file(file)
+          new(file, options).evaluate_file(file)
         rescue => ex
           raise BerksfileReadError.new(ex)
         end
@@ -30,17 +30,9 @@ module Berkshelf
     DEFAULT_API_URL = "https://supermarket.getchef.com".freeze
 
     include Mixin::Logging
-    include Mixin::DSLEval
+    include Cleanroom
     extend Forwardable
 
-    expose_method :source
-    expose_method :site     # @todo remove in Berkshelf 4.0
-    expose_method :chef_api # @todo remove in Berkshelf 4.0
-    expose_method :extension
-    expose_method :metadata
-    expose_method :cookbook
-    expose_method :group
-
     # @return [String]
     #   The path on disk to the file representing this instance of Berksfile
     attr_reader :filepath
@@ -93,6 +85,7 @@ module Berkshelf
       raise LoadError, "Could not load an extension by the name `#{name}'. " \
         "Please make sure it is installed."
     end
+    expose :extension
 
     # Add a cookbook dependency to the Berksfile to be retrieved and have its dependencies recursively retrieved
     # and resolved.
@@ -144,12 +137,14 @@ module Berkshelf
 
       add_dependency(name, constraint, options)
     end
+    expose :cookbook
 
     def group(*args)
       @active_group = args
       yield
       @active_group = nil
     end
+    expose :group
 
     # Use a Cookbook metadata file to determine additional cookbook dependencies to retrieve. All
     # dependencies found in the metadata will use the default locations set in the Berksfile (if any are set)
@@ -166,6 +161,7 @@ module Berkshelf
 
       add_dependency(metadata.name, nil, path: path, metadata: true)
     end
+    expose :metadata
 
     # Add a Berkshelf API source to use when building the index of known cookbooks. The indexes will be
     # searched in the order they are added. If a cookbook is found in the first source then a cookbook
@@ -184,6 +180,7 @@ module Berkshelf
     def source(api_url)
       @sources[api_url] = Source.new(api_url)
     end
+    expose :source
 
     # @return [Array<Source>]
     def sources
@@ -217,6 +214,7 @@ module Berkshelf
         " replaced by the source location. Please remove your site location and try again. For more information " +
         " visit https://github.com/berkshelf/berkshelf/wiki/deprecated-locations"
     end
+    expose :site
 
     # @todo remove in Berkshelf 4.0
     #
@@ -226,6 +224,7 @@ module Berkshelf
         " been replaced by the source location. Please remove your site location and try again. For more " +
         " information visit https://github.com/berkshelf/berkshelf/wiki/deprecated-locations"
     end
+    expose :chef_api
 
     # Add a dependency of the given name and constraint to the array of dependencies.
     #
@@ -566,8 +565,8 @@ module Berkshelf
       outdir
     end
 
-    # Install the Berksfile or Berksfile.lock and then copy the cached cookbooks into
-    # directories within the given destination matching their name.
+    # Install the Berksfile or Berksfile.lock and then sync the cached cookbooks
+    # into directories within the given destination matching their name.
     #
     # @param [String] destination
     #   filepath to vendor cookbooks to
@@ -575,16 +574,6 @@ module Berkshelf
     # @return [String, nil]
     #   the expanded path cookbooks were vendored to or nil if nothing was vendored
     def vendor(destination)
-      destination = File.expand_path(destination)
-
-      if Dir.exist?(destination)
-        raise VendorError, "destination already exists #{destination}. Delete it and try again or use a " +
-          "different filepath."
-      end
-
-      # Ensure the parent directory exists, in case a nested path was given
-      FileUtils.mkdir_p(File.expand_path(File.join(destination, '..')))
-
       scratch          = Berkshelf.mktmpdir
       chefignore       = nil
       cached_cookbooks = install
@@ -593,12 +582,12 @@ module Berkshelf
 
       cached_cookbooks.each do |cookbook|
         Berkshelf.formatter.vendor(cookbook, destination)
-        cookbook_destination = File.join(scratch, cookbook.cookbook_name, '/')
+        cookbook_destination = File.join(scratch, cookbook.cookbook_name)
         FileUtils.mkdir_p(cookbook_destination)
 
         # Dir.glob does not support backslash as a File separator
         src   = cookbook.path.to_s.gsub('\\', '/')
-        files = Dir.glob(File.join(src, '*'))
+        files = FileSyncer.glob(File.join(src, '*'))
 
         chefignore = Ridley::Chef::Chefignore.new(cookbook.path.to_s) rescue nil
         chefignore.apply!(files) if chefignore
@@ -607,30 +596,41 @@ module Berkshelf
           cookbook.compile_metadata(cookbook_destination)
         end
 
-        # 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
-        files.reject! { |file| File.basename(file) == "metadata.rb" }
-
         FileUtils.cp_r(files, cookbook_destination)
       end
 
-      FileUtils.cp(lockfile.filepath, File.join(scratch, Lockfile::DEFAULT_FILENAME))
+      # 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: ["**/*/metadata.rb"])
 
-      FileUtils.mv(scratch, destination)
       destination
     end
 
+    # Perform a validation with `Validator#validate` on each cached cookbook associated
+    # with the Lockfile of this Berksfile.
+    #
+    # This function will return true or raise the first errors encountered.
+    def verify
+      validate_lockfile_present!
+      validate_lockfile_trusted!
+      Berkshelf.formatter.msg "Verifying (#{lockfile.cached.length}) cookbook(s)..."
+      Validator.validate(lockfile.cached)
+      true
+    end
+
     # Visualize the current Berksfile as a "graph" using DOT.
     #
     # @param [String] outfile