berkshelf 2.0.0.beta → 2.0.0

data/lib/berkshelf/command.rb

@@ -1,9 +1,8 @@
 module Berkshelf
   # This superclass is responsible for handling common command methods and options.
-  #
-  # @author Seth Vargo <sethvargo@gmail.com>
   module Command
     # Initialize a new instance of the parent class
+    #
     # @param [Hash] options
     #   the list of options to pass to the installer
     def initialize(options = {})
@@ -18,26 +17,26 @@ module Berkshelf
       #   if there are conflicting or invalid options
       def validate_options!
         if options[:except] && options[:only]
-          raise ::Berkshelf::ArgumentError, "Cannot specify both :except and :only"
+          raise Berkshelf::ArgumentError, 'Cannot specify both :except and :only'
         end
 
         if options[:cookbooks] && (options[:except] || options[:only])
-          ::Berkshelf.ui.warn ":cookbooks were supplied to update(), so :except and :only are ignored..."
+          Berkshelf.ui.warn ':cookbooks were supplied to update(), so :except and :only are ignored...'
         end
       end
 
       # Ensure the berkshelf directory is created and accessible.
       def ensure_berkshelf_directory!
-        unless ::File.exists?(Berkshelf.berkshelf_path)
-          ::FileUtils.mkdir_p(Berkshelf.berkshelf_path)
+        unless File.exists?(Berkshelf.berkshelf_path)
+          FileUtils.mkdir_p(Berkshelf.berkshelf_path)
         end
       end
 
       # Check for the presence of a Berksfile. Berkshelf cannot do anything
       # without the presence of a Berksfile.lock.
       def ensure_berksfile!
-        unless ::File.exists?(options[:berksfile])
-          raise ::Berkshelf::BerksfileNotFound, "No #{options[:berksfile]} was found at ."
+        unless File.exists?(options[:berksfile])
+          raise Berkshelf::BerksfileNotFound, "No #{options[:berksfile]} was found at ."
         end
       end
 
@@ -45,8 +44,8 @@ module Berkshelf
       # an exception to require at least one definition.
       def ensure_berksfile_content!
         begin
-          unless ::File.read(options[:berksfile]).size > 1
-            raise ::Berksfile::BerksfileNotFound, "Your #{options[:berksfile]} is empty! You need at least one cookbook definition."
+          unless File.read(options[:berksfile]).size > 1
+            raise Berkshelf::BerksfileNotFound, "Your #{options[:berksfile]} is empty! You need at least one cookbook definition."
           end
         rescue Errno::ENOENT
           ensure_berksfile!
@@ -75,7 +74,7 @@ module Berkshelf
       # @return [Berkshelf::Berksfile]
       #   the current Berksfile
       def berksfile
-        @berksfile ||= ::Berkshelf::Berksfile.from_file(options[:berksfile])
+        @berksfile ||= Berkshelf::Berksfile.from_file(options[:berksfile])
       end
 
       # Filter the list of sources from the options passed to the installer.
@@ -100,7 +99,7 @@ module Berkshelf
           missing_cookbooks = (cookbooks - sources.map(&:name))
 
           unless missing_cookbooks.empty?
-            raise ::Berkshelf::CookbookNotFound, "Could not find cookbooks #{missing_cookbooks.collect{|cookbook| "'#{cookbook}'"}.join(', ')} in any of the sources. #{missing_cookbooks.size == 1 ? 'Is it' : 'Are they' } in your Berksfile?"
+            raise Berkshelf::CookbookNotFound, "Could not find cookbooks #{missing_cookbooks.collect{|cookbook| "'#{cookbook}'"}.join(', ')} in any of the sources. #{missing_cookbooks.size == 1 ? 'Is it' : 'Are they' } in your Berksfile?"
           end
 
           sources.select { |source| options[:cookbooks].include?(source.name) }

data/lib/berkshelf/commands/shelf.rb

@@ -0,0 +1,130 @@
+module Berkshelf
+  # All tasks that operate on the Berkshelf shelf.
+  class Shelf < Thor
+    desc 'list', 'List all cookbooks and their versions'
+    def list
+      cookbooks = store.cookbooks.inject({}) do |hash, cookbook|
+        (hash[cookbook.cookbook_name] ||= []).push(cookbook.version)
+        hash
+      end
+
+      if cookbooks.empty?
+        Berkshelf.formatter.msg 'There are no cookbooks in the Berkshelf shelf'
+      else
+        Berkshelf.formatter.msg 'Cookbooks in the Berkshelf shelf:'
+        cookbooks.sort.each do |cookbook, versions|
+          Berkshelf.formatter.msg("  * #{cookbook} (#{versions.sort.join(', ')})")
+        end
+      end
+    end
+
+    method_option :version, aliases: '-v', type: :string, desc: 'Version to show'
+    desc 'show', 'Display information about a cookbook in the Berkshelf shelf'
+    def show(name)
+      cookbooks = find(name, options[:version])
+
+      if options[:version]
+        Berkshelf.formatter.msg "Displaying '#{name}' (#{options[:version]}) in the Berkshelf shelf:"
+      else
+        Berkshelf.formatter.msg "Displaying all versions of '#{name}' in the Berkshelf shelf:"
+      end
+
+      cookbooks.each do |cookbook|
+        Berkshelf.formatter.show(cookbook)
+        Berkshelf.formatter.msg("\n")
+      end
+    end
+
+    method_option :version, aliases: '-v', type: :string,  desc: 'Version to remove'
+    method_option :force,   aliases: '-f', type: :boolean, desc: 'Force removal, even if other cookbooks are contingent', default: false
+    desc 'uninstall', 'Remove a cookbook from the Berkshelf shelf'
+    def uninstall(name)
+      cookbooks = find(name, options[:version])
+      cookbooks.each { |c| uninstall_cookbook(c, options[:force]) }
+    end
+
+    no_tasks do
+      # Shortcut helper to the CookbookStore
+      #
+      # @return [Berkshelf::CookbookStore]
+      def store
+        Berkshelf.cookbook_store
+      end
+
+      # Find a cookbook in the store by name and version. If the no version
+      # is given, all cookbooks with the given name are returned. Otherwise,
+      # only the cookbook matching the given version is returned.
+      #
+      # @param [String] name
+      #   the name of the cookbook to find
+      # @param [String, nil] version
+      #   the version of the cookbook to find
+      #
+      # @raise [Berkshelf::CookbookNotFound]
+      #   if the cookbook does not exist
+      #
+      # @return [Array<Berkshelf::CachedCookbook>]
+      #   the list of cookbooks that match the parameters - this is always an
+      #   array!
+      def find(name, version = nil)
+        cookbooks = if version
+          [store.cookbook(name, version)].compact
+        else
+          store.cookbooks(name).sort
+        end
+
+        if cookbooks.empty?
+          if version
+            raise Berkshelf::CookbookNotFound, "Cookbook '#{name}' (#{version}) is not in the Berkshelf shelf"
+          else
+            raise Berkshelf::CookbookNotFound, "Cookbook '#{name}' is not in the Berkshelf shelf"
+          end
+        end
+
+        cookbooks
+      end
+
+      # Uninstall a cookbook from the CookbookStore. This method assumes the
+      # cookbook exists, so perform that validation elsewhere.
+      #
+      # By default, this method will request confirmation from the user to
+      # delete a cookbook that is a dependency on another (contingent). This
+      # behavior can be overridden by setting the second parameter `force` to
+      # true.
+      #
+      # @param [Berkshelf::CachedCookbook] cookbook
+      #   the cookbook to uninstall
+      # @param [Boolean] force
+      #   if false, the user will need to confirm before uninstalling
+      #   if contingencies exist
+      def uninstall_cookbook(cookbook, force = false)
+        unless options[:force] || (contingent = contingencies(cookbook)).empty?
+          contingent = contingent.map { |c| "#{c.cookbook_name} (#{c.version})" }.join(', ')
+          confirm = Berkshelf.ui.ask("[#{contingent}] depend on #{cookbook.cookbook_name}.\n\nAre you sure you want to continue? (y/N)")
+
+          exit unless confirm.upcase[0] == 'Y'
+        end
+
+        FileUtils.rm_rf(cookbook.path)
+        Berkshelf.formatter.msg("Successfully uninstalled #{cookbook.cookbook_name} (#{cookbook.version})")
+      end
+
+      # Return a list of all cookbooks which are contingent upon the given
+      # cookbook.
+      #
+      # @param [Berkshelf::CachedCookbook] cookbook
+      #   the cached cookbook to search for dependencies against
+      #
+      # @return [Array<Berkshelf::CachedCookbook>]
+      #   the list of cookbooks which depend on the parameter
+      def contingencies(cookbook)
+        store.cookbooks.select { |c| c.dependencies.include?(cookbook.cookbook_name) }
+      end
+    end
+  end
+
+  class Cli < Thor
+    desc 'shelf SUBCOMMAND', 'Interact with the cookbook store'
+    subcommand 'shelf', Berkshelf::Shelf
+  end
+end

data/lib/berkshelf/commands/test_command.rb

@@ -0,0 +1,11 @@
+require 'kitchen/cli'
+
+module Berkshelf
+  class TestCommand < Kitchen::CLI
+    namespace "test"
+  end
+
+  class Cli < Thor
+    register(Berkshelf::TestCommand, 'test', 'test [COMMAND]', 'Testing tasks for your cookbook', hide: true)
+  end
+end

data/lib/berkshelf/community_rest.rb

@@ -3,7 +3,6 @@ require 'retryable'
 require 'addressable/uri'
 
 module Berkshelf
-  # @author Jamie Winsor <reset@riotgames.com>
   class CommunityREST < Faraday::Connection
     class << self
       # @param [String] target
@@ -74,7 +73,7 @@ module Berkshelf
       @retry_interval = options[:retry_interval]
 
       builder = Faraday::Builder.new do |b|
-        b.response :json
+        b.response :parse_json
         b.request :retry,
           max: @retries,
           interval: @retry_interval,

data/lib/berkshelf/config.rb

@@ -1,8 +1,6 @@
 require 'chozo/config'
 
 module Berkshelf
-  # @author Justin Campbell <justin.campbell@riotgames.com>
-  # @author Jamie Winsor <reset@riotgames.com>
   class Config < Chozo::Config::JSON
     LOCATIONS = [
       File.join('.', '.berkshelf', 'config.json').freeze,
@@ -70,28 +68,34 @@ module Berkshelf
 
     attribute 'chef.chef_server_url',
       type: String,
-      default: Berkshelf::Chef::Config.instance[:chef_server_url]
+      default: Berkshelf.chef_config[:chef_server_url]
     attribute 'chef.validation_client_name',
       type: String,
-      default: Berkshelf::Chef::Config.instance[:validation_client_name]
+      default: Berkshelf.chef_config[:validation_client_name]
     attribute 'chef.validation_key_path',
       type: String,
-      default: Berkshelf::Chef::Config.instance[:validation_key]
+      default: Berkshelf.chef_config[:validation_key]
     attribute 'chef.client_key',
       type: String,
-      default: Berkshelf::Chef::Config.instance[:client_key]
+      default: Berkshelf.chef_config[:client_key]
     attribute 'chef.node_name',
       type: String,
-      default: Berkshelf::Chef::Config.instance[:node_name]
+      default: Berkshelf.chef_config[:node_name]
     attribute 'cookbook.copyright',
       type: String,
-      default: Berkshelf::Chef::Config.instance[:cookbook_copyright]
+      default: Berkshelf.chef_config[:cookbook_copyright]
     attribute 'cookbook.email',
       type: String,
-      default: Berkshelf::Chef::Config.instance[:cookbook_email]
+      default: Berkshelf.chef_config[:cookbook_email]
     attribute 'cookbook.license',
       type: String,
-      default: Berkshelf::Chef::Config.instance[:cookbook_license]
+      default: Berkshelf.chef_config[:cookbook_license]
+    attribute 'allowed_licenses',
+      type: Array,
+      default: Array.new
+    attribute 'raise_license_exception',
+      type: Boolean,
+      default: false
     attribute 'vagrant.vm.box',
       type: String,
       default: 'Berkshelf-CentOS-6.3-x86_64-minimal',

data/lib/berkshelf/cookbook_generator.rb

@@ -1,6 +1,7 @@
 module Berkshelf
-  # @author Jamie Winsor <reset@riotgames.com>
   class CookbookGenerator < BaseGenerator
+    require_relative 'config'
+
     argument :name,
       type: :string,
       required: true
@@ -13,6 +14,11 @@ module Berkshelf
       type: :boolean,
       default: false
 
+    class_option :skip_test_kitchen,
+      type: :boolean,
+      default: false,
+      desc: 'Skip adding a testing environment to your cookbook'
+
     class_option :foodcritic,
       type: :boolean,
       default: false
@@ -42,19 +48,19 @@ module Berkshelf
       default: Berkshelf::Config.instance.cookbook.email
 
     def generate
-      empty_directory target.join("files/default")
-      empty_directory target.join("templates/default")
-      empty_directory target.join("attributes")
-      empty_directory target.join("definitions")
-      empty_directory target.join("libraries")
-      empty_directory target.join("providers")
-      empty_directory target.join("recipes")
-      empty_directory target.join("resources")
-
-      template "default_recipe.erb", target.join("recipes/default.rb")
-      template "metadata.rb.erb", target.join("metadata.rb")
-      template license_file, target.join("LICENSE")
-      template "README.md.erb", target.join("README.md")
+      empty_directory target.join('files/default')
+      empty_directory target.join('templates/default')
+      empty_directory target.join('attributes')
+      empty_directory target.join('definitions')
+      empty_directory target.join('libraries')
+      empty_directory target.join('providers')
+      empty_directory target.join('recipes')
+      empty_directory target.join('resources')
+
+      template 'default_recipe.erb', target.join('recipes/default.rb')
+      template 'metadata.rb.erb', target.join('metadata.rb')
+      template license_file, target.join('LICENSE')
+      template 'README.md.erb', target.join('README.md')
 
       Berkshelf::InitGenerator.new([target], options.merge(default_options)).invoke_all
     end
@@ -67,11 +73,11 @@ module Berkshelf
 
       def license_name
         case options[:license]
-        when "apachev2"; "Apache 2.0"
-        when "gplv2"; "GNU Public License 2.0"
-        when "gplv3"; "GNU Public License 3.0"
-        when "mit"; "MIT"
-        when "reserved"; "All rights reserved"
+        when 'apachev2'; 'Apache 2.0'
+        when 'gplv2'; 'GNU Public License 2.0'
+        when 'gplv3'; 'GNU Public License 3.0'
+        when 'mit'; 'MIT'
+        when 'reserved'; 'All rights reserved'
         else
           raise Berkshelf::InternalError, "Unknown license: '#{options[:license]}'"
         end
@@ -83,11 +89,11 @@ module Berkshelf
 
       def license_file
         case options[:license]
-        when "apachev2"; "licenses/apachev2.erb"
-        when "gplv2"; "licenses/gplv2.erb"
-        when "gplv3"; "licenses/gplv3.erb"
-        when "mit"; "licenses/mit.erb"
-        when "reserved"; "licenses/reserved.erb"
+        when 'apachev2'; 'licenses/apachev2.erb'
+        when 'gplv2'; 'licenses/gplv2.erb'
+        when 'gplv3'; 'licenses/gplv3.erb'
+        when 'mit'; 'licenses/mit.erb'
+        when 'reserved'; 'licenses/reserved.erb'
         else
           raise Berkshelf::InternalError, "Unknown license: '#{options[:license]}'"
         end

data/lib/berkshelf/cookbook_source.rb

@@ -1,5 +1,4 @@
 module Berkshelf
-  # @author Jamie Winsor <reset@riotgames.com>
   class CookbookSource
     class << self
       @@valid_options = [:constraint, :locations, :group, :locked_version]
@@ -206,6 +205,7 @@ module Berkshelf
         if location.kind_of?(GitLocation)
           h[:git] = location.uri
           h[:ref] = location.ref
+          h[:rel] = location.rel if location.rel
         end
 
         # Path is intentionally left relative here for cross-team compatibility

data/lib/berkshelf/cookbook_store.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 
 module Berkshelf
-  # @author Jamie Winsor <reset@riotgames.com>
   class CookbookStore
     # @return [String]
     #   filepath to where cookbooks are stored

data/lib/berkshelf/core_ext.rb

@@ -1,3 +1,3 @@
 Dir["#{File.dirname(__FILE__)}/core_ext/*.rb"].sort.each do |path|
-  require "berkshelf/core_ext/#{File.basename(path, '.rb')}"
+  require_relative "core_ext/#{File.basename(path, '.rb')}"
 end

data/lib/berkshelf/core_ext/file.rb

@@ -7,7 +7,7 @@ class File
     #
     # @return [Boolean]
     def cookbook?(path)
-      File.exists?(File.join(path, "metadata.rb"))
+      File.exists?(File.join(path, 'metadata.rb'))
     end
     alias_method :chef_cookbook?, :cookbook?
   end

data/lib/berkshelf/downloader.rb

@@ -1,6 +1,8 @@
 module Berkshelf
-  # @author Jamie Winsor <reset@riotgames.com>
   class Downloader
+    require_relative 'cookbook_source'
+    require_relative 'location'
+
     extend Forwardable
 
     DEFAULT_LOCATIONS = [

data/lib/berkshelf/errors.rb

@@ -15,7 +15,7 @@ module Berkshelf
   class ArgumentError < InternalError; end
   class AbstractFunction < InternalError
     def to_s
-      "Function must be implemented on includer"
+      'Function must be implemented on includer'
     end
   end
 
@@ -25,51 +25,67 @@ module Berkshelf
   class CookbookNotFound < BerkshelfError; status_code(103); end
   class GitError < BerkshelfError
     status_code(104)
-    attr_reader :stderr
 
+    # @param [#to_s] stderr
+    #   the error that came from stderr
     def initialize(stderr)
-      @stderr = stderr
+      @stderr = stderr.to_s
+    end
+
+    # A common header for all git errors. The #to_s method should
+    # use this before outputting any specific errors.
+    #
+    # @return [String]
+    def header
+      'An error occurred during Git execution:'
     end
 
     def to_s
-      out = "An error occured during Git execution:\n"
-      out << stderr.prepend_each("\n", "\t")
+      [
+        header,
+        "",
+        "  " + @stderr.to_s.split("\n").map(&:strip).join("\n  "),
+        ""
+      ].join("\n")
     end
   end
-  class PrivateGitRepo < GitError; end
-  class AmbiguousGitRef < GitError
-    attr_reader :ref
 
+  class AmbiguousGitRef < GitError
     def initialize(ref)
       @ref = ref
     end
 
     def to_s
-      out = "An error occurred during Git execution:\n"
-      out << "Ambiguous Git ref: #{ref}"
+      [
+        header,
+        "",
+        "  Ambiguous Git ref: '#{@ref}'",
+        "",
+      ].join("\n")
     end
   end
-  class InvalidGitRef < GitError
-    attr_reader :ref
 
+  class InvalidGitRef < GitError
     def initialize(ref)
       @ref = ref
     end
 
     def to_s
-      out = "An error occurred during Git execution:\n"
-      out << "Invalid Git ref: #{ref}"
+      [
+        header,
+        "",
+        "  Invalid Git ref: '#{@ref}'",
+        "",
+      ].join("\n")
     end
   end
 
   class DuplicateSourceDefined < BerkshelfError; status_code(105); end
   class NoSolution < BerkshelfError; status_code(106); end
   class CookbookSyntaxError < BerkshelfError; status_code(107); end
-  class BerksConfigNotFound < BerkshelfError; status_code(109); end
 
   class InvalidGitURI < BerkshelfError
     status_code(110)
-    attr_reader :uri
 
     # @param [String] uri
     def initialize(uri)
@@ -77,13 +93,12 @@ module Berkshelf
     end
 
     def to_s
-      "'#{uri}' is not a valid Git URI."
+      "'#{@uri}' is not a valid Git URI"
     end
   end
 
   class UnknownGitHubProtocol < BerkshelfError
     status_code(110)
-    attr_reader :protocol
 
     # @param [String] protocol
     def initialize(protocol)
@@ -91,7 +106,7 @@ module Berkshelf
     end
 
     def to_s
-      "'#{self.protocol}' is not a supported Git protocol for the 'github' location key. Please use 'git' instead."
+      "'#{@protocol}' is not supported for the 'github' location key - please use 'git' instead"
     end
   end
 
@@ -99,13 +114,14 @@ module Berkshelf
     status_code(110)
 
     def to_s
-      "Could not find a Git executable in your path. Please add it and try again."
+      'Could not find a Git executable in your path - please add it and try again'
     end
   end
 
   class ConstraintNotSatisfied < BerkshelfError; status_code(111); end
   class InvalidChefAPILocation < BerkshelfError; status_code(112); end
   class BerksfileReadError < BerkshelfError
+    # @param [#status_code] original_error
     def initialize(original_error)
       @original_error = original_error
     end
@@ -115,18 +131,19 @@ module Berkshelf
     def status_code
       @original_error.respond_to?(:status_code) ? @original_error.status_code : 113
     end
+
+    def to_s
+      [
+        "An error occurred while reading the Berksfile:",
+        "",
+        "  " +  @original_error.to_s.split("\n").map(&:strip).join("\n  "),
+      ].join("\n")
+    end
   end
 
-  # @author Seth Vargo <sethvargo@gmail.com>
   class MismatchedCookbookName < BerkshelfError
     status_code(114)
 
-    # @return [Berkshelf::Location]
-    attr_reader :location
-
-    # @return [Berkshelf::CachedCookbook]
-    attr_reader :cached_cookbook
-
     # @param [Berkshelf::Location] location
     #   the location that is mismatched
     # @param [Berkshelf::CachedCookbook] cached_cookbook
@@ -140,13 +157,13 @@ module Berkshelf
       [
         "In your Berksfile, you have:",
         "",
-        "  cookbook '#{location.name}'",
+        "  cookbook '#{@location.name}'",
         "",
-        "But that cookbook is actually named '#{cached_cookbook.cookbook_name}'.",
+        "But that cookbook is actually named '#{@cached_cookbook.cookbook_name}'",
         "",
-        "This can cause potentially unwanted side-effects in the future.",
+        "This can cause potentially unwanted side-effects in the future",
         "",
-        "NOTE: If you don't explicitly set the `name` attribute in the metadata, the name of the directory will be used!"
+        "NOTE: If you don't explicitly set the `name` attribute in the metadata, the name of the directory will be used!",
       ].join("\n")
     end
   end
@@ -159,15 +176,10 @@ module Berkshelf
     end
 
     def to_s
-      strings = ["Invalid configuration:"]
-
-      @errors.each do |key, errors|
-        errors.each do |error|
-          strings << "  #{key} #{error}"
-        end
-      end
-
-      strings.join "\n"
+      [
+        'Invalid configuration:',
+        @errors.map { |key, errors| errors.map { |error| "  #{key} #{error}" } },
+      ].join("\n")
     end
   end
 
@@ -200,7 +212,7 @@ module Berkshelf
         "does not satisfy the version constraint:",
         "  #{@cached_cookbook.cookbook_name} (#{@location.version_constraint})",
         "",
-        "This occurs when the Chef Server has a cookbook with a missing/mis-matched version number in its `metadata.rb`."
+        "This occurs when the Chef Server has a cookbook with a missing/mis-matched version number in its `metadata.rb`",
       ].join("\n")
     end
   end
@@ -219,16 +231,17 @@ module Berkshelf
     end
 
     def to_s
-      "Unknown site shortname: #{@shortname.inspect}. Supported shortnames are: #{SiteLocation::SHORTNAMES.keys.map(&:inspect).join(',')}"
+      [
+        "Unknown site shortname '#{@shortname}' - supported shortnames are:",
+        "",
+        "  * " + SiteLocation::SHORTNAMES.keys.join("\n  * "),
+      ].join("\n")
     end
   end
 
   class OutdatedCookbookSource < BerkshelfError
     status_code(128)
 
-    # @return [Berkshelf::CookbookSource]
-    attr_reader :locked_source, :source
-
     # @param [Berkshelf::CookbookSource] source
     #   the cookbook source that is outdated
     def initialize(locked_source, source)
@@ -238,14 +251,14 @@ module Berkshelf
 
     def to_s
       [
-        "Berkshelf could not find compatible versions for cookbook '#{source.name}':",
+        "Berkshelf could not find compatible versions for cookbook '#{@source.name}':",
         "  In Berksfile:",
-        "    #{locked_source.name} (#{locked_source.locked_version})",
+        "    #{@locked_source.name} (#{@locked_source.locked_version})",
         "",
         "  In Berksfile.lock:",
-        "    #{source.name} (#{source.version_constraint})",
+        "    #{@source.name} (#{@source.version_constraint})",
         "",
-        "Try running `berks update #{source.name}, which will try to find  '#{source.name}' matching '#{source.version_constraint}'."
+        "Try running `berks update #{@source.name}, which will try to find  '#{@source.name}' matching '#{@source.version_constraint}'.",
       ].join("\n")
     end
   end
@@ -258,7 +271,7 @@ module Berkshelf
     end
 
     def to_s
-      %Q[The environment "#{@environment_name}" does not exist.]
+      "The environment '#{@environment_name}' does not exist"
     end
   end
 
@@ -266,11 +279,10 @@ module Berkshelf
     status_code(130)
 
     def to_s
-      "There was an error connecting to the chef server."
+      'There was an error connecting to the Chef Server'
     end
   end
 
-  # @author Seth Vargo <sethvargo@gmail.com>
   class UnknownCompressionType < BerkshelfError
     status_code(131)
 
@@ -279,8 +291,71 @@ module Berkshelf
     end
 
     def to_s
-      "The file at '#{@destination}' is not a known compression type!"
+      "The file at '#{@destination}' is not a known compression type"
+    end
+  end
+
+  # Raised when a cookbook or its recipes contain a space or invalid
+  # character in the path.
+  #
+  # @param [Berkshelf::CachedCookbook] cookbook
+  #   the cookbook that failed validation
+  # @param [Array<#to_s>] files
+  #   the list of files that were not valid
+  class InvalidCookbookFiles < BerkshelfError
+    status_code(132)
+
+    def initialize(cookbook, files)
+      @cookbook = cookbook
+      @files = files
+    end
+
+    def to_s
+      [
+        "The cookbook '#{@cookbook.cookbook_name}' has invalid filenames:",
+        "",
+        "  " + @files.map(&:to_s).join("\n  "),
+        "",
+        "Please note, spaces are not a valid character in filenames",
+      ].join("\n")
+    end
+  end
+
+  # Raised when a CachedCookbook has a license file that isn't allowed
+  # by the Berksfile.
+  #
+  # @param [Berkshelf::CachedCookbook] cookbook
+  #   the cookbook that failed license validation
+  class LicenseNotAllowed < BerkshelfError
+    status_code(133)
+
+    def initialize(cookbook)
+      @cookbook = cookbook
+    end
+
+    def to_s
+      msg =  "'#{@cookbook.cookbook_name}' has a license of '#{@cookbook.metadata.license}', but"
+      msg << " '#{@cookbook.metadata.license}' is not in your list of allowed licenses"
+      msg
     end
+  end
 
+  # Raised when a cookbook or its recipes contain a space or invalid
+  # character in the path.
+  class ConfigNotFound < BerkshelfError
+    status_code(133)
+
+    # @param [String] type
+    #   the type of config that was not found (Berkshelf, Chef, etc)
+    # @param [#to_s] path
+    #   the path to the specified Chef config that did not exist
+    def initialize(type, path)
+      @type = type.to_s
+      @path = path
+    end
+
+    def to_s
+      "No #{@type.capitalize} config file found at: '#{@path}'!"
+    end
   end
 end