berkshelf 3.0.0.beta3 → 3.0.0.beta4

data/features/commands/list.feature

@@ -3,11 +3,14 @@ Feature: berks list
     Given the cookbook store has the cookbooks:
       | fake1 | 1.0.0 |
       | fake2 | 1.0.1 |
-    Given I have a Berksfile pointing at the local Berkshelf API with:
+    And I have a Berksfile pointing at the local Berkshelf API with:
       """
       cookbook 'fake1', '1.0.0'
       cookbook 'fake2', '1.0.1'
       """
+    And the Lockfile has:
+      | fake1 | 1.0.0 |
+      | fake2 | 1.0.1 |
     When I successfully run `berks list`
     Then the output should contain:
       """
@@ -17,7 +20,37 @@ Feature: berks list
       """
 
 
-  Scenario: Running the list command with no sources defined
+  Scenario: Running the list command when the dependencies aren't downloaded
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    And the Lockfile has:
+      | fake | 1.0.0 |
+    When I run `berks list`
+    Then the output should contain:
+      """
+      Could not find cookbook 'fake (1.0.0)'.
+      """
+    And the exit status should be "CookbookNotFound"
+
+
+  Scenario: Running the list command when the lockfile isn't present
+    Given the cookbook store has the cookbooks:
+      | fake | 1.0.0 |
+    And I have a Berksfile pointing at the local Berkshelf API with:
+      """
+      cookbook 'fake', '1.0.0'
+      """
+    When I run `berks list`
+    Then the output should contain:
+      """
+      Could not find cookbook 'fake (= 1.0.0)'.
+      """
+    And the exit status should be "CookbookNotFound"
+
+
+  Scenario: Running the list command with no dependencies defined
     Given I have a Berksfile pointing at the local Berkshelf API
     When I successfully run `berks list`
     Then the output should contain:

data/features/commands/outdated.feature

@@ -70,9 +70,9 @@ Feature: berks outdated
     When I run `berks outdated`
     Then the output should contain:
       """
-      Could not find cookbook 'bacon (>= 0.0.0)'. Try running `berks install` to download and install the missing dependencies.
+      Could not find cookbook 'bacon (= 1.0.0)'. Try running `berks install` to download and install the missing dependencies.
       """
-    And the exit status should be "LockfileNotFound"
+    And the exit status should be "CookbookNotFound"
 
 
   Scenario: When the cookbook is not installed
@@ -85,6 +85,6 @@ Feature: berks outdated
     When I run `berks outdated`
     Then the output should contain:
       """
-      Could not find cookbook 'bacon (= 1.0.0)'. Try running `berks install` to download and install the missing dependencies.
+      Could not find cookbook 'bacon (1.0.0)'. Try running `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "CookbookNotFound"

data/features/commands/package.feature

@@ -1,3 +1,4 @@
+@api_server
 Feature: berks package
   Background:
     * the cookbook store has the cookbooks:

data/features/commands/show.feature

@@ -38,9 +38,9 @@ Feature: berks show
     When I run `berks show fake`
     Then the output should contain:
       """
-      Could not find cookbook 'fake (>= 0.0.0)'. Try running `berks install` to download and install the missing dependencies.
+      Could not find cookbook 'fake (= 1.0.0)'. Try running `berks install` to download and install the missing dependencies.
       """
-    And the exit status should be "LockfileNotFound"
+    And the exit status should be "CookbookNotFound"
 
 
   Scenario: When the cookbook is not installed
@@ -54,6 +54,6 @@ Feature: berks show
     When I run `berks show fake`
     Then the output should contain:
       """
-      Could not find cookbook 'fake (= 1.0.0)'. Try running `berks install` to download and install the missing dependencies.
+      Could not find cookbook 'fake (1.0.0)'. Try running `berks install` to download and install the missing dependencies.
       """
     And the exit status should be "CookbookNotFound"

data/features/commands/update.feature

@@ -1,3 +1,4 @@
+@api_server
 Feature: berks update
   Background:
     * the cookbook store has the cookbooks:

data/features/commands/upload.feature

@@ -168,11 +168,11 @@ Feature: berks upload
     When I successfully run `berks upload`
     Then the output should contain:
       """
-      Skipping fake (1.0.0) (already uploaded)
+      Skipping fake (1.0.0) (frozen)
       """
     And the output should contain:
       """
-      Skipped uploading some cookbooks because they already existed on the remote server. Re-run with the `--force` flag to force overwrite these cookbooks:
+      Skipped uploading some cookbooks because they already exist on the remote server and are frozen. Re-run with the `--force` flag to force overwrite these cookbooks:
 
         * fake (1.0.0)
       """
@@ -190,8 +190,32 @@ Feature: berks upload
     When I successfully run `berks upload`
     Then the output should contain:
       """
-      Skipping fake (0.0.0) (already uploaded)
-      Skipped uploading some cookbooks because they already existed on the remote server. Re-run with the `--force` flag to force overwrite these cookbooks:
+      Skipping fake (0.0.0) (frozen)
+      Skipped uploading some cookbooks because they already exist on the remote server and are frozen. Re-run with the `--force` flag to force overwrite these cookbooks:
 
         * fake (0.0.0)
       """
+  Scenario: When the syntax check is skipped
+    Given a cookbook named "fake"
+    And the cookbook "fake" has the file "recipes/default.rb" with:
+      """
+      Totally not valid Ruby syntax
+      """
+    And the cookbook "fake" has the file "templates/default/file.erb" with:
+      """
+      <% for %>
+      """
+    And the cookbook "fake" has the file "recipes/template.rb" with:
+      """
+      template "/tmp/wadus" do
+        source "file.erb"
+      end
+      """
+    And the cookbook "fake" has the file "Berksfile" with:
+      """
+      metadata
+      """
+    And I cd to "fake"
+    When I successfully run `berks upload --skip-syntax-check`
+    Then the Chef Server should have the cookbooks:
+      | fake | 0.0.0 |

data/features/json_formatter.feature

@@ -19,6 +19,8 @@ Feature: --format json
       {
         "cookbooks": [
           {
+            "api_source": "http://0.0.0.0:26210",
+            "location_path": "http://localhost:26310/",
             "version": "1.0.0",
             "name": "berkshelf"
           }

data/features/lockfile.feature

@@ -1,3 +1,4 @@
+@api_server
 Feature: Creating and reading the Berkshelf lockfile
   Background:
     * the cookbook store has the cookbooks:

data/features/support/env.rb

@@ -1,12 +1,16 @@
 require 'spork'
 
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+end
+
 Spork.prefork do
   require 'aruba/cucumber'
   require 'aruba/in_process'
   require 'aruba/spawn_process'
   require 'cucumber/rspec/doubles'
-  require 'berkshelf/api/rspec'
-  require 'berkshelf/api/cucumber'
+  require 'berkshelf/api/rspec' unless windows?
+  require 'berkshelf/api/cucumber' unless windows?
 
   Dir['spec/support/**/*.rb'].each { |f| require File.expand_path(f) }
 
@@ -18,7 +22,7 @@ Spork.prefork do
 
   at_exit do
     Berkshelf::RSpec::ChefServer.stop
-    Berkshelf::API::RSpec::Server.stop
+    Berkshelf::API::RSpec::Server.stop unless windows?
   end
 
   Before do
@@ -50,7 +54,7 @@ Spork.prefork do
     ]
 
     Berkshelf::RSpec::ChefServer.start(port: CHEF_SERVER_PORT)
-    Berkshelf::API::RSpec::Server.start(port: BERKS_API_PORT, endpoints: endpoints)
+    Berkshelf::API::RSpec::Server.start(port: BERKS_API_PORT, endpoints: endpoints) unless windows?
 
     @aruba_io_wait_seconds = Cucumber::JRUBY ? 7 : 5
     @aruba_timeout_seconds = Cucumber::JRUBY ? 35 : 15

data/generator_files/Gemfile.erb

@@ -1,6 +1,15 @@
 source 'https://rubygems.org'
 
 gem 'berkshelf'
+
+# Uncomment these lines (and the ones in the generated Vagrantfile) if you want
+# to live on the Edge:
+#
+# gem "berkshelf", github: "RiotGames/berkshelf"
+# gem "vagrant", github: "mitchellh/vagrant", tag: "v1.3.5"
+# gem "vagrant-berkshelf", github: "RiotGames/vagrant-berkshelf"
+# gem "vagrant-omnibus", github: "schisamo/vagrant-omnibus", tag: "v1.1.2"
+
 <% if options[:foodcritic] -%>
 gem 'thor-foodcritic'
 <% end -%>

data/generator_files/README.md.erb

@@ -1,24 +1,13 @@
-<%= name %> cookbook
-<%= '='*"#{name} cookbook".length %>
-TODO: Enter the cookbook description here.
+# <%= name %>-cookbook
 
-e.g.
-This cookbook makes your favorite breakfast sandwich.
+TODO: Enter the cookbook description here.
 
-Requirements
-------------
-TODO: List your cookbook requirements. Be sure to include any requirements this cookbook has on platforms, libraries, other cookbooks, packages, operating systems, etc.
+## Supported Platforms
 
-e.g.
-#### packages
-- `toaster` - <%= name %> needs toaster to brown your bagel.
+TODO: List your supported platforms.
 
-Attributes
-----------
-TODO: List you cookbook attributes here.
+## Attributes
 
-e.g.
-#### <%= name %>::default
 <table>
   <tr>
     <th>Key</th>
@@ -34,36 +23,29 @@ e.g.
   </tr>
 </table>
 
-Usage
------
-#### <%= name %>::default
-TODO: Write usage instructions for each cookbook.
+## Usage
+
+### <%= name %>::default
 
-e.g.
-Just include `<%= name %>` in your node's `run_list`:
+Include `<%= name %>` in your node's `run_list`:
 
 ```json
 {
-  "name":"my_node",
   "run_list": [
-    "recipe[<%= name %>]"
+    "recipe[<%= name %>::default]"
   ]
 }
 ```
 
-Contributing
-------------
-TODO: (optional) If this is a public cookbook, detail the process for contributing. If this is a private cookbook, remove this section.
-
-e.g.
+## Contributing
 
 1. Fork the repository on Github
-2. Create a named feature branch (like `add_component_x`)
+2. Create a named feature branch (i.e. `add-new-recipe`)
 3. Write you change
 4. Write tests for your change (if applicable)
 5. Run the tests, ensuring they all pass
-6. Submit a Pull Request using Github
+6. Submit a Pull Request
+
+## License and Authors
 
-License and Authors
--------------------
 Author:: <%= maintainer %> (<<%= maintainer_email %>>)

data/generator_files/Vagrantfile.erb

@@ -1,6 +1,12 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+# Uncomment these lines (and the ones in the generated Gemfile) if you want
+# to live on the Edge:
+#
+# Vagrant.require_plugin "vagrant-berkshelf"
+# Vagrant.require_plugin "vagrant-omnibus"
+
 Vagrant.configure("2") do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
@@ -73,9 +79,6 @@ Vagrant.configure("2") do |config|
   # View the documentation for the provider you're using for more
   # information on available options.
 
-  config.ssh.max_tries = 40
-  config.ssh.timeout   = 120
-
   # The path to the Berksfile to use with Vagrant Berkshelf
   # config.berkshelf.berksfile_path = "./Berksfile"
 

data/lib/berkshelf.rb

@@ -18,6 +18,7 @@ require_relative 'berkshelf/core_ext'
 require_relative 'berkshelf/thor_ext'
 
 module Berkshelf
+  require_relative 'berkshelf/version'
   require_relative 'berkshelf/errors'
   require_relative 'berkshelf/mixin'
 
@@ -113,6 +114,36 @@ module Berkshelf
       @formatter ||= Formatters::HumanReadable.new
     end
 
+    # @raise [Berkshelf::ChefConnectionError]
+    def ridley_connection(options = {}, &block)
+      ridley_options               = options.slice(:ssl)
+
+      ridley_options[:server_url]  = options[:server_url] || Berkshelf.config.chef.chef_server_url
+      ridley_options[:client_name] = options[:client_name] || Berkshelf.config.chef.node_name
+      ridley_options[:client_key]  = options[:client_key] || Berkshelf.config.chef.client_key
+      ridley_options[:ssl]         = { verify: (options[:ssl_verify].nil?) ? Berkshelf.config.ssl.verify : options[:ssl_verify]}
+
+      unless ridley_options[:server_url].present?
+        raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.server_url'
+      end
+
+      unless ridley_options[:client_name].present?
+        raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.node_name'
+      end
+
+      unless ridley_options[:client_key].present?
+        raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.client_key'
+      end
+
+      # @todo  Something scary going on here - getting an instance of Kitchen::Logger from test-kitchen
+      # https://github.com/opscode/test-kitchen/blob/master/lib/kitchen.rb#L99
+      Celluloid.logger = nil unless ENV["DEBUG_CELLULOID"]
+      Ridley.open(ridley_options, &block)
+    rescue Ridley::Errors::RidleyError => ex
+      log_exception(ex)
+      raise ChefConnectionError, ex # todo implement
+    end
+
     # Specify the format for output
     #
     # @param [#to_sym] format_id
@@ -138,6 +169,7 @@ module Berkshelf
   end
 end
 
+require_relative 'berkshelf/lockfile'
 require_relative 'berkshelf/api_client'
 require_relative 'berkshelf/base_generator'
 require_relative 'berkshelf/berksfile'
@@ -155,13 +187,11 @@ require_relative 'berkshelf/mercurial'
 require_relative 'berkshelf/init_generator'
 require_relative 'berkshelf/installer'
 require_relative 'berkshelf/location'
-require_relative 'berkshelf/lockfile'
 require_relative 'berkshelf/logger'
 require_relative 'berkshelf/resolver'
 require_relative 'berkshelf/source'
 require_relative 'berkshelf/source_uri'
 require_relative 'berkshelf/ui'
-require_relative 'berkshelf/version'
 
 Ridley.logger = Berkshelf.logger = Logger.new(STDOUT)
 Berkshelf.logger.level = Logger::WARN

data/lib/berkshelf/berksfile.rb

@@ -42,19 +42,15 @@ module Berkshelf
     #   The path on disk to the file representing this instance of Berksfile
     attr_reader :filepath
 
-    # @return [Array<Berkshelf::CachedCookbook>]
-    attr_reader :cached_cookbooks
-
     # @param [String] path
     #   path on disk to the file containing the contents of this Berksfile
     def initialize(path)
       @filepath         = path
       @dependencies     = Hash.new
-      @cached_cookbooks = nil
       @sources          = Array.new
     end
 
-    # Add a cookbook dependency to the Berksfile to be retrieved and have it's dependencies recursively retrieved
+    # Add a cookbook dependency to the Berksfile to be retrieved and have its dependencies recursively retrieved
     # and resolved.
     #
     # @example a cookbook dependency that will be retrieved from one of the default locations
@@ -162,14 +158,14 @@ module Berkshelf
         Berkshelf.formatter.deprecation "Your Berksfile contains a site location pointing to the Opscode Community " +
           "Site (site :opscode). Site locations have been replaced by the source location. Change this to: " +
           "'source \"http://api.berkshelf.com\" to remove this warning. For more information visit " +
-          "https://github.com/RiotGames/berkshelf/wiki/deprecated-locations"
+          "https://github.com/berkshelf/berkshelf/wiki/deprecated-locations"
         source(DEFAULT_API_URL)
         return
       end
 
       raise Berkshelf::DeprecatedError.new "Your Berksfile contains a site location. Site locations have been " +
         " replaced by the source location. Please remove your site location and try again. For more information " +
-        " visit https://github.com/RiotGames/berkshelf/wiki/deprecated-locations"
+        " visit https://github.com/berkshelf/berkshelf/wiki/deprecated-locations"
     end
 
     # @todo remove in Berkshelf 4.0
@@ -178,7 +174,7 @@ module Berkshelf
     def chef_api(*args)
       raise Berkshelf::DeprecatedError.new "Your Berksfile contains a chef_api location. Chef API locations have " +
         " been replaced by the source location. Please remove your site location and try again. For more " +
-        " information visit https://github.com/RiotGames/berkshelf/wiki/deprecated-locations"
+        " information visit https://github.com/berkshelf/berkshelf/wiki/deprecated-locations"
     end
 
     # Add a dependency of the given name and constraint to the array of dependencies.
@@ -276,6 +272,12 @@ module Berkshelf
       @dependencies[name]
     end
 
+    # Find a dependency, raising an exception if it is not found.
+    # @see {find}
+    def find!(name)
+      find(name) || raise(DependencyNotFound.new(name))
+    end
+
     # @return [Hash]
     #   a hash containing group names as keys and an array of Berkshelf::Dependencies
     #   that are a member of that group as values
@@ -376,29 +378,41 @@ module Berkshelf
     # @raise [CookbookNotFound]
     #   if there is a lockfile with a cookbook, but the cookbook is not downloaded
     #
-    # @param [String] name
+    # @param [Dependency] name
     #   the name of the cookbook to find
     #
     # @return [CachedCookbook]
     #   the CachedCookbook that corresponds to the given name parameter
-    def retrieve_locked(name)
-      validate_cookbook_names!(cookbooks: name)
+    def retrieve_locked(dependency)
+      locked = lockfile.find(dependency.name)
 
-      locked = lockfile.find(name)
       unless locked
-        raise LockfileNotFound, "Could not find cookbook '#{name} (>= 0.0.0)'."\
+        raise CookbookNotFound, "Could not find cookbook '#{dependency.to_s}'."\
           " Try running `berks install` to download and install the missing"\
           " dependencies."
       end
 
-      cookbook = locked.cached_cookbook
-      unless cookbook
-        raise CookbookNotFound, "Could not find cookbook '#{name} (= #{locked.locked_version})'."\
+      unless locked.downloaded?
+        raise CookbookNotFound, "Could not find cookbook '#{locked.to_s}'."\
           " Try running `berks install` to download and install the missing"\
           " dependencies."
       end
 
-      cookbook
+      @dependencies[dependency.name] = locked
+      locked.cached_cookbook
+    end
+
+    # The cached cookbooks installed by this Berksfile.
+    #
+    # @raise [Berkshelf::LockfileNotFound]
+    #   if there is no lockfile
+    # @raise [Berkshelf::CookbookNotFound]
+    #   if a listed source could not be found
+    #
+    # @return [Hash<Berkshelf::Dependency, Berkshelf::CachedCookbook>]
+    #   the list of dependencies as keys and the cached cookbook as the value
+    def list
+      Hash[*dependencies.sort.collect { |dependency| [dependency, retrieve_locked(dependency)] }.flatten]
     end
 
     # List of all the cookbooks which have a newer version found at a source that satisfies
@@ -426,7 +440,7 @@ module Berkshelf
 
       outdated = {}
       dependencies(options).each do |dependency|
-        locked = retrieve_locked(dependency.name)
+        locked = retrieve_locked(dependency)
         outdated[dependency.name] = {}
 
         sources.each do |source|
@@ -488,6 +502,7 @@ module Berkshelf
         halt_on_frozen: false,
         skip_dependencies: false,
         cookbooks: [],
+        validate: true
       }.merge(options)
 
       validate_cookbook_names!(options)
@@ -497,34 +512,6 @@ module Berkshelf
       do_upload(cached_cookbooks, options)
     end
 
-    # Resolve this Berksfile and apply the locks found in the generated Berksfile.lock to the
-    # target Chef environment
-    #
-    # @param [String] environment_name
-    #
-    # @option options [Hash] :ssl_verify (true)
-    #   Disable/Enable SSL verification during uploads
-    #
-    # @raise [EnvironmentNotFound]
-    #   if the target environment was not found
-    # @raise [ChefConnectionError]
-    #   if you are locking cookbooks with an invalid or not-specified client configuration
-    def apply(environment_name, options = {})
-      ridley_connection(options) do |conn|
-        unless environment = conn.environment.find(environment_name)
-          raise EnvironmentNotFound.new(environment_name)
-        end
-
-        install
-
-        environment.cookbook_versions = {}.tap do |cookbook_versions|
-          lockfile.dependencies.each { |dependency| cookbook_versions[dependency.name] = dependency.locked_version }
-        end
-
-        environment.save
-      end
-    end
-
     # Package the given cookbook for distribution outside of berkshelf. If the
     # name attribute is not given, all cookbooks in the Berksfile will be
     # packaged.
@@ -627,18 +614,33 @@ module Berkshelf
         src   = cookbook.path.to_s.gsub('\\', '/')
         files = Dir.glob(File.join(src, '*'))
 
-        if chefignore
-          files = chefignore.remove_ignores_from(files)
+        chefignore = Ridley::Chef::Chefignore.new(cookbook.path.to_s) rescue nil
+        chefignore.apply!(files) if chefignore
+
+        unless cookbook.compiled_metadata?
+          cookbook.compile_metadata(cookbook_destination)
         end
 
-        FileUtils.cp_r(files, cookbook_destination)
+        # 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" }
 
-        chefignore = Ridley::Chef::Chefignore.new(destination) rescue nil
-        Dir["#{cookbook_destination}/**/*"].each do |path|
-          FileUtils.rm_rf(path) if chefignore.ignored?(path)
-        end if chefignore
+        FileUtils.cp_r(files, cookbook_destination)
       end
 
+      FileUtils.cp(lockfile.filepath, File.join(scratch, Lockfile::DEFAULT_FILENAME))
+
       FileUtils.mv(scratch, destination)
       destination
     end
@@ -651,7 +653,7 @@ module Berkshelf
     #   the lockfile corresponding to this berksfile, or a new Lockfile if one does
     #   not exist
     def lockfile
-      @lockfile ||= Berkshelf::Lockfile.new(self)
+      @lockfile ||= Lockfile.from_berksfile(self)
     end
 
     private
@@ -659,7 +661,7 @@ module Berkshelf
       def do_upload(cookbooks, options = {})
         @skipped = []
 
-        ridley_connection(options) do |conn|
+        Berkshelf.ridley_connection(options) do |conn|
           cookbooks.each do |cookbook|
             Berkshelf.formatter.upload(cookbook, conn)
             validate_files!(cookbook)
@@ -669,6 +671,7 @@ module Berkshelf
                 force: options[:force],
                 freeze: options[:freeze],
                 name: cookbook.cookbook_name,
+                validate: options[:validate]
               })
             rescue Ridley::Errors::FrozenCookbook => ex
               if options[:halt_on_frozen]
@@ -683,7 +686,7 @@ module Berkshelf
 
         unless @skipped.empty?
           Berkshelf.formatter.msg "Skipped uploading some cookbooks because they" <<
-            " already existed on the remote server. Re-run with the `--force`" <<
+            " already exist on the remote server and are frozen. Re-run with the `--force`" <<
             " flag to force overwrite these cookbooks:" <<
             "\n\n" <<
             "  * " << @skipped.map { |c| "#{c.cookbook_name} (#{c.version})" }.join("\n  * ")
@@ -713,33 +716,6 @@ module Berkshelf
         cookbooks
       end
 
-      # @raise [Berkshelf::ChefConnectionError]
-      def ridley_connection(options = {}, &block)
-        ridley_options               = options.slice(:ssl)
-
-        ridley_options[:server_url]  = options[:server_url] || Berkshelf.config.chef.chef_server_url
-        ridley_options[:client_name] = options[:client_name] || Berkshelf.config.chef.node_name
-        ridley_options[:client_key]  = options[:client_key] || Berkshelf.config.chef.client_key
-        ridley_options[:ssl]         = { verify: (options[:ssl_verify].nil?) ? Berkshelf.config.ssl.verify : options[:ssl_verify]}
-
-        unless ridley_options[:server_url].present?
-          raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.server_url'
-        end
-
-        unless ridley_options[:client_name].present?
-          raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.node_name'
-        end
-
-        unless ridley_options[:client_key].present?
-          raise ChefConnectionError, 'Missing required attribute in your Berkshelf configuration: chef.client_key'
-        end
-
-        Ridley.open(ridley_options, &block)
-      rescue Ridley::Errors::RidleyError => ex
-        log_exception(ex)
-        raise ChefConnectionError, ex # todo implement
-      end
-
       # Determine if any cookbooks were specified that aren't in our shelf.
       #
       # @option options [Array<String>] :cookbooks