berkshelf 5.2.0 → 8.0.15

data/lib/berkshelf/core_ext/file_utils.rb

@@ -1,4 +1,4 @@
-require 'fileutils'
+require "fileutils" unless defined?(FileUtils)
 
 module FileUtils
   class << self
@@ -14,10 +14,10 @@ module FileUtils
     # symlink on Linux
     # @see {FileUtils::mv}
     def mv(src, dest, options = {})
-      old_mv(src, dest, options)
+      old_mv(src, dest, **options)
     rescue Errno::EACCES, Errno::ENOENT
-      options.delete(:force) if options.has_key?(:force)
-      FileUtils.cp_r(src, dest, options)
+      options.delete(:force) if options.key?(:force)
+      FileUtils.cp_r(src, dest, **options)
       FileUtils.rm_rf(src)
     end
   end

data/lib/berkshelf/core_ext.rb

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

data/lib/berkshelf/dependency.rb

@@ -22,7 +22,7 @@ module Berkshelf
     # @return [String]
     attr_reader :name
     # @return [Array<String,Symbol>]
-    attr_reader :groups
+    attr_writer :groups
     # @return [Berkshelf::Location]
     attr_reader :location
     # @return [Semverse::Version]
@@ -122,23 +122,24 @@ module Berkshelf
     def cached_cookbook
       return @cached_cookbook if @cached_cookbook
 
-      @cached_cookbook = if location
-        cookbook = location.cached_cookbook
+      @cached_cookbook =
+        if location
+          cookbook = location.cached_cookbook
 
-        # If we have a cached cookbook, tighten our constraints
-        if cookbook
-          self.locked_version     = cookbook.version
-          self.version_constraint = cookbook.version
-        end
+          # If we have a cached cookbook, tighten our constraints
+          if cookbook
+            self.locked_version     = cookbook.version
+            self.version_constraint = cookbook.version
+          end
 
-        cookbook
-      else
-        if locked_version
-          CookbookStore.instance.cookbook(name, locked_version)
+          cookbook
         else
-          CookbookStore.instance.satisfy(name, version_constraint)
+          if locked_version
+            CookbookStore.instance.cookbook(name, locked_version)
+          else
+            CookbookStore.instance.satisfy(name, version_constraint)
+          end
         end
-      end
 
       @cached_cookbook
     end
@@ -150,15 +151,6 @@ module Berkshelf
       groups.include?(group.to_sym)
     end
 
-    # The location for this dependency, such as a remote Chef Server, the
-    # community API, :git, or a :path location. By default, this will be the
-    # community API.
-    #
-    # @return [Berkshelf::Location]
-    def location
-      @location
-    end
-
     # The list of groups this dependency belongs to.
     #
     # @return [Array<Symbol>]
@@ -167,7 +159,7 @@ module Berkshelf
     end
 
     def <=>(other)
-      [self.name, self.version_constraint] <=> [other.name, other.version_constraint]
+      [name, version_constraint] <=> [other.name, other.version_constraint]
     end
 
     def to_s
@@ -175,20 +167,21 @@ module Berkshelf
     end
 
     def inspect
-      '#<Berkshelf::Dependency: ' << [
+      "#<Berkshelf::Dependency: " << [
         "#{name} (#{version_constraint})",
         "locked_version: #{locked_version.inspect}",
         "groups: #{groups}",
-        "location: #{location || 'default'}>"
-      ].join(', ')
+        "location: #{location || "default"}>",
+      ].join(", ")
     end
 
     def to_lock
-      out = if location || version_constraint.to_s == '>= 0.0.0'
-        "  #{name}\n"
-      else
-        "  #{name} (#{version_constraint})\n"
-      end
+      out =
+        if location || version_constraint.to_s == ">= 0.0.0"
+          "  #{name}\n"
+        else
+          "  #{name} (#{version_constraint})\n"
+        end
 
       out << location.to_lock if location
       out

data/lib/berkshelf/downloader.rb

@@ -1,5 +1,7 @@
-require 'net/http'
-require 'mixlib/archive'
+require "net/http" unless defined?(Net::HTTP)
+require "mixlib/archive" unless defined?(Mixlib::Archive)
+require_relative "ssl_policies"
+require "faraday" unless defined?(Faraday)
 
 module Berkshelf
   class Downloader
@@ -14,6 +16,10 @@ module Berkshelf
       @berksfile = berksfile
     end
 
+    def ssl_policy
+      @ssl_policy ||= SSLPolicy.new
+    end
+
     # Download the given Berkshelf::Dependency. If the optional block is given,
     # the temporary path to the cookbook is yielded and automatically deleted
     # when the block returns. If no block is given, it is the responsibility of
@@ -28,11 +34,12 @@ module Berkshelf
     #
     # @return [String]
     def download(*args, &block)
-      options = args.last.is_a?(Hash) ? args.pop : Hash.new
+      # options are ignored
+      # options = args.last.is_a?(Hash) ? args.pop : Hash.new
       dependency, version = args
 
       sources.each do |source|
-        if result = try_download(source, dependency, version)
+        if ( result = try_download(source, dependency, version) )
           if block_given?
             value = yield result
             FileUtils.rm_rf(result)
@@ -43,7 +50,7 @@ module Berkshelf
         end
       end
 
-      raise CookbookNotFound.new(dependency, version, 'in any of the sources')
+      raise CookbookNotFound.new(dependency, version, "in any of the sources")
     end
 
     # @param [Berkshelf::Source] source
@@ -52,27 +59,46 @@ module Berkshelf
     #
     # @return [String]
     def try_download(source, name, version)
-      unless remote_cookbook = source.cookbook(name, version)
+      unless ( remote_cookbook = source.cookbook(name, version) )
         return nil
       end
 
       case remote_cookbook.location_type
       when :opscode, :supermarket
-        CommunityREST.new(remote_cookbook.location_path).download(name, version)
+        options = { ssl: source.options[:ssl] }
+        if source.type == :artifactory
+          options[:headers] = { "X-Jfrog-Art-Api" => source.options[:api_key] }
+        end
+
+        # Allow Berkshelf install to function if a relative url exists in location_path
+        path = URI.parse(remote_cookbook.location_path).absolute? ? remote_cookbook.location_path : "#{source.uri_string}#{remote_cookbook.location_path}"
+
+        CommunityREST.new(path, options).download(name, version)
       when :chef_server
+        tmp_dir      = Dir.mktmpdir
+        unpack_dir   = Pathname.new(tmp_dir) + "#{name}-#{version}"
         # @todo Dynamically get credentials for remote_cookbook.location_path
         credentials = {
           server_url: remote_cookbook.location_path,
-          client_name: Berkshelf::Config.instance.chef.node_name,
-          client_key: Berkshelf::Config.instance.chef.client_key,
-          ssl: Berkshelf::Config.instance.ssl
+          client_name: source.options[:client_name] || Berkshelf::Config.instance.chef.node_name,
+          client_key: source.options[:client_key] || Berkshelf::Config.instance.chef.client_key,
+          ssl: source.options[:ssl],
         }
-        # @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(credentials) { |r| r.cookbook.download(name, version) }
+        RidleyCompat.new_client(**credentials) do |conn|
+          cookbook = Chef::CookbookVersion.load(name, version)
+          manifest = cookbook.cookbook_manifest
+          manifest.by_parent_directory.each do |segment, files|
+            files.each do |segment_file|
+              dest = File.join(unpack_dir, segment_file["path"].gsub("/", File::SEPARATOR))
+              FileUtils.mkdir_p(File.dirname(dest))
+              tempfile = conn.streaming_request(segment_file["url"])
+              FileUtils.mv(tempfile.path, dest)
+            end
+          end
+        end
+        unpack_dir
       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")
@@ -81,19 +107,21 @@ module Berkshelf
         # Find the correct github connection options for this specific cookbook.
         cookbook_uri = URI.parse(remote_cookbook.location_path)
         if cookbook_uri.host == "github.com"
-          options = Berkshelf::Config.instance.github.detect { |opts| opts["web_endpoint"] == nil }
-          options = {} if options == nil
+          options = Berkshelf::Config.instance.github.detect { |opts| opts["web_endpoint"].nil? }
+          options = {} if options.nil?
         else
           options = Berkshelf::Config.instance.github.detect { |opts| opts["web_endpoint"] == "#{cookbook_uri.scheme}://#{cookbook_uri.host}" }
-          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options == nil
+          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options.nil?
         end
 
-        github_client = Octokit::Client.new(access_token: options[:access_token],
-          api_endpoint: options[:api_endpoint], web_endpoint: options[:web_endpoint],
-          connection_options: {ssl: {verify: options[:ssl_verify].nil? ? true : options[:ssl_verify]}})
+        github_client = Octokit::Client.new(
+          access_token: options["access_token"],
+          api_endpoint: options["api_endpoint"], web_endpoint: options["web_endpoint"],
+          connection_options: { ssl: { verify: options["ssl_verify"].nil? ? true : options["ssl_verify"] } }
+        )
 
         begin
-          url = URI(github_client.archive_link(cookbook_uri.path.gsub(/^\//, ""), ref: "v#{version}"))
+          url = URI(github_client.archive_link(cookbook_uri.path.gsub(%r{^/}, ""), ref: "v#{version}"))
         rescue Octokit::Unauthorized
           return nil
         end
@@ -101,9 +129,10 @@ module Berkshelf
         # We use Net::HTTP.new and then get here, because Net::HTTP.get does not support proxy settings.
         http = Net::HTTP.new(url.host, url.port)
         http.use_ssl = url.scheme == "https"
-        http.verify_mode = (options[:ssl_verify].nil? || options[:ssl_verify]) ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+        http.verify_mode = (options["ssl_verify"].nil? || options["ssl_verify"]) ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
         resp = http.get(url.request_uri)
         return nil unless resp.is_a?(Net::HTTPSuccess)
+
         open(archive_path, "wb") { |file| file.write(resp.body) }
 
         Mixlib::Archive.new(archive_path).extract(unpack_dir)
@@ -111,20 +140,20 @@ module Berkshelf
         # we need to figure out where the cookbook is located in the archive. This is because the directory name
         # pattern is not cosistant between private and public github repositories
         cookbook_directory = Dir.entries(unpack_dir).select do |f|
-          (! f.start_with?('.')) && (Pathname.new(File.join(unpack_dir, f)).cookbook?)
+          (! f.start_with?(".")) && (Pathname.new(File.join(unpack_dir, f)).cookbook?)
         end[0]
 
         File.join(unpack_dir, cookbook_directory)
       when :uri
-        Thread.exclusive { require 'open-uri' unless defined?(OpenURI) }
+        require "open-uri" unless defined?(OpenURI)
 
         tmp_dir      = Dir.mktmpdir
         archive_path = Pathname.new(tmp_dir) + "#{name}-#{version}.tar.gz"
         unpack_dir   = Pathname.new(tmp_dir) + "#{name}-#{version}"
 
         url = remote_cookbook.location_path
-        open(url, 'rb') do |remote_file|
-          archive_path.open('wb') { |local_file| local_file.write remote_file.read }
+        URI.open(url, "rb") do |remote_file|
+          archive_path.open("wb") { |local_file| local_file.write remote_file.read }
         end
 
         Mixlib::Archive.new(archive_path).extract(unpack_dir)
@@ -132,13 +161,11 @@ module Berkshelf
         # The top level directory is inconsistant. So we unpack it and
         # use the only directory created in the unpack_dir.
         cookbook_directory = unpack_dir.entries.select do |filename|
-          (! filename.to_s.start_with?('.')) && (unpack_dir + filename).cookbook?
+          (! filename.to_s.start_with?(".")) && (unpack_dir + filename).cookbook?
         end.first
 
         (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}"
@@ -147,26 +174,26 @@ module Berkshelf
         cookbook_uri = URI.parse(remote_cookbook.location_path)
         if cookbook_uri.host
           options = Berkshelf::Config.instance.gitlab.detect { |opts| opts["web_endpoint"] == "#{cookbook_uri.scheme}://#{cookbook_uri.host}" }
-          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options == nil
+          raise ConfigurationError.new "Missing github endpoint configuration for #{cookbook_uri.scheme}://#{cookbook_uri.host}" if options.nil?
         end
 
-        connection ||= Faraday.new(url: options[:web_endpoint]) do |faraday|
-          faraday.headers[:accept] = 'application/x-tar'
+        connection ||= Faraday.new(url: options["web_endpoint"]) do |faraday|
+          faraday.headers[:accept] = "application/x-tar"
           faraday.response :logger, @logger unless @logger.nil?
-          faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+          faraday.adapter  Faraday.default_adapter # make requests with Net::HTTP
         end
 
-        resp = connection.get(cookbook_uri.request_uri + '&private_token=' + options[:private_token])
+        resp = connection.get(cookbook_uri.request_uri + "&private_token=" + options["private_token"])
         return nil unless resp.status == 200
+
         open(archive_path, "wb") { |file| file.write(resp.body) }
 
-        tgz = Zlib::GzipReader.new(File.open(archive_path, "rb"))
-        Archive::Tar::Minitar.unpack(tgz, unpack_dir)
+        Mixlib::Archive.new(archive_path).extract(unpack_dir)
 
         # The top level directory is inconsistant. So we unpack it and
         # use the only directory created in the unpack_dir.
         cookbook_directory = unpack_dir.entries.select do |filename|
-          (! filename.to_s.start_with?('.')) && (unpack_dir + filename).cookbook?
+          (! filename.to_s.start_with?(".")) && (unpack_dir + filename).cookbook?
         end.first
 
         (unpack_dir + cookbook_directory).to_s
@@ -175,7 +202,7 @@ module Berkshelf
         FileUtils.cp_r(remote_cookbook.location_path, tmp_dir)
         File.join(tmp_dir, name)
       else
-        raise RuntimeError, "unknown location type #{remote_cookbook.location_type}"
+        raise "unknown location type #{remote_cookbook.location_type}"
       end
     rescue CookbookNotFound
       nil

data/lib/berkshelf/errors.rb

@@ -61,7 +61,7 @@ module Berkshelf
     end
 
     def to_s
-      out  = "Your Berksfile contains multiple entries named "
+      out = "Your Berksfile contains multiple entries named "
       out << "'#{@name}'. Please remove duplicate dependencies, or put them in "
       out << "different groups."
       out
@@ -83,7 +83,7 @@ module Berkshelf
 
     def to_s
       @original_exception.to_s +
-      "Unable to find a solution for demands: #{demands.join(', ')}"
+        "Unable to find a solution for demands: #{demands.join(", ")}"
     end
 
     alias_method :message, :to_s
@@ -91,6 +91,7 @@ module Berkshelf
 
   class CookbookSyntaxError < BerkshelfError; set_status_code(107); end
   class ConstraintNotSatisfied < BerkshelfError; set_status_code(111); end
+
   class BerksfileReadError < BerkshelfError
     set_status_code(113)
 
@@ -254,6 +255,7 @@ module Berkshelf
   end
 
   class UploadFailure < BerkshelfError; end
+
   class FrozenCookbook < UploadFailure
     set_status_code(126)
 
@@ -285,11 +287,11 @@ module Berkshelf
 
     def to_s
       "Berkshelf could not find compatible versions for cookbook '#{@dependency.name}':\n" +
-      "  In Berksfile:\n" +
-      "    #{@dependency.name} (#{@dependency.version_constraint})\n\n" +
-      "  In Berksfile.lock:\n" +
-      "    #{@locked.name} (#{@locked.version})\n\n" +
-      "Try running `berks update #{@dependency.name}`, which will try to find '#{@dependency.name}' matching " +
+        "  In Berksfile:\n" +
+        "    #{@dependency.name} (#{@dependency.version_constraint})\n\n" +
+        "  In Berksfile.lock:\n" +
+        "    #{@locked.name} (#{@locked.version})\n\n" +
+        "Try running `berks update #{@dependency.name}`, which will try to find '#{@dependency.name}' matching " +
         "'#{@dependency.version_constraint}'."
     end
 
@@ -314,7 +316,7 @@ module Berkshelf
     set_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
 
@@ -372,7 +374,7 @@ module Berkshelf
 
     def to_s
       "Unknown license: '#{license}'\n" +
-      "Available licenses: #{CookbookGenerator::LICENSES.join(', ')}"
+        "Available licenses: #{CookbookGenerator::LICENSES.join(", ")}"
     end
 
     alias_method :message, :to_s
@@ -436,11 +438,12 @@ module Berkshelf
   end
 
   class DuplicateDemand < BerkshelfError; set_status_code(138); end
+
   class LockfileNotFound < BerkshelfError
     set_status_code(140)
 
     def to_s
-      'Lockfile not found! Run `berks install` to create the lockfile.'
+      "Lockfile not found! Run `berks install` to create the lockfile."
     end
   end
 
@@ -467,7 +470,7 @@ module Berkshelf
     set_status_code(144)
 
     def to_s
-      'The lockfile is out of sync! Run `berks install` to sync the lockfile.'
+      "The lockfile is out of sync! Run `berks install` to sync the lockfile."
     end
   end
 
@@ -527,6 +530,9 @@ module Berkshelf
     alias_method :message, :to_s
   end
 
+  class CookbookSyntaxError < BerkshelfError; end
+  class RedirectLimitReached < BerkshelfError; end
+
   class MissingLockfileCookbookVersion < CookbookNotFound
     set_status_code(149)
 
@@ -544,7 +550,7 @@ module Berkshelf
     def intialize(environment_file)
       @environment_file = environment_file
     end
-  
+
     def to_s
       "Could not find environment file #{@environment_file}"
     end
@@ -556,11 +562,11 @@ module Berkshelf
 
   class GitNotInstalled < GitError
     def initialize
-      super 'You need to install Git before you can download ' \
-        'cookbooks from git repositories. For more information, please ' \
-        'see the Git docs: http://git-scm.org. If you have git installed, ' \
-        'please make sure it is in your $PATH and accessible by the user ' \
-        'running this command.'
+      super "You need to install Git before you can download " \
+        "cookbooks from git repositories. For more information, please " \
+        "see the Git docs: http://git-scm.org. If you have git installed, " \
+        "please make sure it is in your $PATH and accessible by the user " \
+        "running this command."
     end
   end
 

data/lib/berkshelf/file_syncer.rb

@@ -1,11 +1,11 @@
-require 'fileutils'
+require "fileutils" unless defined?(FileUtils)
 
 module Berkshelf
   module FileSyncer
     extend self
 
     # Files to be ignored during a directory globbing
-    IGNORED_FILES = %w(. ..).freeze
+    IGNORED_FILES = %w{. ..}.freeze
 
     #
     # Glob across the given pattern, accounting for dotfiles, removing Ruby's
@@ -17,8 +17,15 @@ module Berkshelf
     # @return [Array<String>]
     #   the list of all files
     #
-    def glob(pattern)
-      Dir.glob(pattern, File::FNM_DOTMATCH).sort.reject do |file|
+    # @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, **kwargs)
+      Dir.glob(pattern, File::FNM_DOTMATCH, **kwargs).sort.reject do |file|
         basename = File.basename(file)
         IGNORED_FILES.include?(basename)
       end
@@ -58,24 +65,17 @@ 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) }
-      end
+      source_files =
+        glob("**/*", base: source).reject do |source_file|
+          excludes.any? { |exclude| File.fnmatch?(exclude, source_file, File::FNM_DOTMATCH) }
+        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)
@@ -87,14 +87,15 @@ module Berkshelf
           target = File.readlink(source_file)
 
           destination = File.expand_path(destination)
-          Dir.chdir(destination) do
-            FileUtils.ln_sf(target, "#{destination}/#{relative_path}")
-          end
+          FileUtils.ln_sf(target, "#{destination}/#{relative_path}")
         when :file
+          # TODO: Workaround issue related to [1] which impacts running ChefSpec on Github Actions
+          # [1] https://github.com/docker/for-linux/issues/1015
+          FileUtils.touch(source_file)
           FileUtils.cp(source_file, "#{destination}/#{relative_path}")
         else
           type = File.ftype(source_file)
-          raise RuntimeError, "Unknown file type: `#{type}' at " \
+          raise "Unknown file type: `#{type}' at " \
             "`#{source_file}'. Failed to sync `#{source_file}' to " \
             "`#{destination}/#{relative_path}'!"
         end
@@ -102,20 +103,11 @@ 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)
-        end
+        destination_files = glob("**/*", base: destination)
 
         # 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,20 +115,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/formatters/human.rb

@@ -19,7 +19,9 @@ module Berkshelf
     def install(source, cookbook)
       message = "Installing #{cookbook.name} (#{cookbook.version})"
 
-      unless source.default?
+      if source.type == :chef_repo
+        message << " from #{cookbook.location_path}"
+      elsif !source.default?
         message << " from #{source}"
         message << " ([#{cookbook.location_type}] #{cookbook.location_path})"
       end
@@ -60,13 +62,13 @@ module Berkshelf
     #   { 'cookbook' => { 'supermarket.chef.io' => #<Cookbook> } }
     def outdated(hash)
       if hash.empty?
-        Berkshelf.ui.info('All cookbooks up to date!')
+        Berkshelf.ui.info("All cookbooks up to date!")
       else
-        Berkshelf.ui.info('The following cookbooks have newer versions:')
+        Berkshelf.ui.info("The following cookbooks have newer versions:")
 
         hash.each do |name, info|
-          info['remote'].each do |remote_source, remote_version|
-            out = "  * #{name} (#{info['local']} => #{remote_version})"
+          info["remote"].each do |remote_source, remote_version|
+            out = "  * #{name} (#{info["local"]} => #{remote_version})"
 
             unless remote_source.default?
               out << " [#{remote_source.uri}]"

data/lib/berkshelf/formatters/json.rb

@@ -8,11 +8,11 @@ module Berkshelf
     def initialize
       @output = {
         cookbooks: [],
-        errors:    [],
-        messages:  [],
-        warnings:  [],
+        errors: [],
+        messages: [],
+        warnings: [],
       }
-      @cookbooks = Hash.new
+      @cookbooks = {}
 
       Berkshelf.ui.mute { super }
     end
@@ -92,11 +92,11 @@ module Berkshelf
     #   { 'cookbook' => { 'supermarket.chef.io' => #<Cookbook> } }
     def outdated(hash)
       hash.each do |name, info|
-        info['remote'].each do |remote_source, remote_version|
+        info["remote"].each do |remote_source, remote_version|
           source = remote_source.uri.to_s
 
           cookbooks[name] ||= {}
-          cookbooks[name][:local] = info['local'].to_s
+          cookbooks[name][:local] = info["local"].to_s
           cookbooks[name][:remote] ||= {}
           cookbooks[name][:remote][source] = remote_version.to_s
         end