berkshelf 7.0.8 → 7.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7106f564a5687739b6b869ddb82caab720210cb55ceaec843de5864321752591
-  data.tar.gz: 4196d7280ddf0bcec16c38c6cde5b9829a8e7d37b3aed818671e23294d1af301
+  metadata.gz: 4950e40e68a8fa20ad29aa5d589f27e4dd3fa0d7966abaedae2a9fc81398bc42
+  data.tar.gz: 706ca0ccbf4033186ac0adb6b1da988a55028fa1ccfae5c09a02c2ac414d31b4
 SHA512:
-  metadata.gz: ba89f50812a6ffa647fc6c9cb349ce169e9fbb2c641d635157ed4410e75363f5eb2a4ab817002de907965bde4234fd9d7930dfe1a3f76bd8997aa4f2efe30a72
-  data.tar.gz: 51c592e399c3213ec72755dca557b7926e1d8abd14659bcc6e2547d032b018eac8c4b3fb69037e4c26fefe7611b0d3c96465af6fe7f67e62915107476b6018d7
+  metadata.gz: a4207838b3b203d6446a6f4d529e2d74a67a4109dadb206011be3e9f34a7bd3ca5373df4e3ec5e07994da54571d6c9d91c7c245cd45b4afdbe5b6481c5db9aec
+  data.tar.gz: 4a57a2691d696385dbf46aa141b69b5dcd619a920f9abfb3a8b4ce0f5c3155591216b7c1267a804f3f80c8b805875253824b67686a1141df0107e772329fb3dc

data/Gemfile

@@ -2,18 +2,14 @@ source "https://rubygems.org"
 
 gemspec
 
-group :changelog do
-  gem "github_changelog_generator"
-end
-
 group :build do
   gem "rake",          ">= 10.1"
 end
 
 group :development do
-  # these all deliberately float because berkshelf has a Gemfile.lock that
-  # equality pins them.  temporarily pin as necessary for API breaks.
-  gem "aruba",         ">= 0.10.0"
+  gem "chef-bin" # for the proxy tests
+  gem "aruba",         "~> 0.10" # Stay below 1 until aruba/in_process monkeypatching stops
+  gem "cucumber",      "< 4.0" # until we identify what is generating the ~@no_run tag in CI
   gem "cucumber-expressions", "= 5.0.13"
   gem "chef-zero",     ">= 4.0"
   gem "dep_selector",  ">= 1.0"
@@ -22,11 +18,7 @@ group :development do
   gem "rspec-its",     ">= 1.2"
   gem "webmock",       ">= 1.11"
   gem "http",          ">= 0.9.8"
-  gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
-end
-
-group :docs do
-  gem "yard", ">= 0.8"
+  gem "chefstyle"
 end
 
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]

data/Rakefile

@@ -14,8 +14,8 @@ begin
   require "cucumber"
   require "cucumber/rake/task"
   Cucumber::Rake::Task.new(:features) do |t|
-    if RUBY_PLATFORM =~ WINDOWS_PLATFORM
-      t.cucumber_opts = "--tags ~@not-windows"
+    if RUBY_PLATFORM =~ WINDOWS_PLATFORM || RUBY_PLATFORM =~ /darwin/
+      t.cucumber_opts = "--tags 'not @not-windows'"
     end
   end
 rescue LoadError
@@ -35,7 +35,7 @@ begin
 rescue LoadError
 end
 
-task default: [:spec, :features]
+task default: %i{spec features}
 task :ci do
   ENV["CI"] = "true"
   Rake::Task[:spec].invoke

data/berkshelf.gemspec

@@ -1,5 +1,4 @@
-# -*- encoding: utf-8; mode: ruby -*-
-require File.expand_path("../lib/berkshelf/version", __FILE__)
+require File.expand_path("lib/berkshelf/version", __dir__)
 
 Gem::Specification.new do |s|
   s.authors = [
@@ -36,9 +35,9 @@ Gem::Specification.new do |s|
   s.add_dependency "solve",                "~> 4.0"
   s.add_dependency "thor",                 ">= 0.20"
   s.add_dependency "octokit",              "~> 4.0"
-  s.add_dependency "mixlib-archive",       ">= 0.4", "< 2.0"
+  s.add_dependency "mixlib-archive",       ">= 1.1.4", "< 2.0" # needed for ruby 3.0 / Dir.chdir removal
   s.add_dependency "concurrent-ruby",      "~> 1.0"
-  s.add_dependency "chef",                 ">= 13.6.52"
+  s.add_dependency "chef",                 ">= 15.7.32" # needed for --skip-syntax-check
   s.add_dependency "chef-config"
   # this is required for Mixlib::Config#from_json
   s.add_dependency "mixlib-config", ">= 2.2.5"

data/bin/berks

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-$:.push File.expand_path("../../lib", __FILE__)
+$:.push File.expand_path("../lib", __dir__)
 require "berkshelf/cli"
 
 Berkshelf::Cli::Runner.new(ARGV.dup).execute!

data/lib/berkshelf.rb

@@ -10,20 +10,20 @@ rescue LoadError
 end
 
 require "cleanroom"
-require "digest/md5"
-require "forwardable"
-require "json"
-require "pathname"
+require "digest/md5" unless defined?(Digest::MD5)
+require "forwardable" unless defined?(Forwardable)
+require "json" unless defined?(JSON)
+require "pathname" unless defined?(Pathname)
 require "semverse"
 require "solve"
-require "thor"
-require "uri"
+require "thor" unless defined?(Thor)
+require "uri" unless defined?(URI)
 
 JSON.create_id = nil
 
 require_relative "berkshelf/core_ext"
 require_relative "berkshelf/thor_ext"
-require "berkshelf/chef_config_compat"
+require_relative "berkshelf/chef_config_compat"
 
 module Berkshelf
   Encoding.default_external = Encoding::UTF_8
@@ -169,7 +169,7 @@ module Berkshelf
         raise ChefConnectionError, "Missing required attribute in your Berkshelf configuration: chef.client_key"
       end
 
-      RidleyCompat.new_client(ridley_options, &block)
+      RidleyCompat.new_client(**ridley_options, &block)
     rescue ChefConnectionError, BerkshelfError
       raise
     rescue => ex
@@ -222,7 +222,6 @@ require_relative "berkshelf/lockfile"
 require_relative "berkshelf/berksfile"
 require_relative "berkshelf/cached_cookbook"
 require_relative "berkshelf/cli"
-require_relative "berkshelf/chef_config_compat"
 require_relative "berkshelf/community_rest"
 require_relative "berkshelf/cookbook_store"
 require_relative "berkshelf/config"

data/lib/berkshelf/api_client/chef_server_connection.rb

@@ -1,4 +1,4 @@
-require "berkshelf/ridley_compat"
+require_relative "../ridley_compat"
 
 module Berkshelf
   module APIClient
@@ -19,7 +19,8 @@ module Berkshelf
           response.each do |name, versions|
             versions.each do |version, attributes|
               attributes[:location_path] = @url
-              cookbooks << RemoteCookbook.new(name, version, attributes) end
+              cookbooks << RemoteCookbook.new(name, version, attributes)
+            end
           end
         end
       rescue Ridley::Errors::HTTPNotFound

data/lib/berkshelf/api_client/connection.rb

@@ -1,4 +1,4 @@
-require "berkshelf/ridley_compat"
+require_relative "../ridley_compat"
 
 module Berkshelf
   module APIClient

data/lib/berkshelf/api_client/remote_cookbook.rb

@@ -1,4 +1,4 @@
-require "json"
+require "json" unless defined?(JSON)
 require "chef/mash"
 
 module Berkshelf

data/lib/berkshelf/berksfile.rb

@@ -13,7 +13,7 @@ module Berkshelf
       def from_options(options = {})
         options[:berksfile] ||= File.join(Dir.pwd, Berkshelf::DEFAULT_FILENAME)
         symbolized = Hash[options.map { |k, v| [k.to_sym, v] }]
-        from_file(options[:berksfile], symbolized.select { |k,| [:except, :only, :delete].include? k })
+        from_file(options[:berksfile], symbolized.select { |k,| %i{except only delete}.include? k })
       end
 
       # @param [#to_s] file
@@ -66,8 +66,8 @@ module Berkshelf
     #   group to be installed and all others to be ignored
     def initialize(path, options = {})
       @filepath         = File.expand_path(path)
-      @dependencies     = Hash.new
-      @sources          = Hash.new
+      @dependencies     = {}
+      @sources          = {}
       @delete           = options[:delete]
 
       # defaults for what solvers to use
@@ -146,7 +146,7 @@ module Berkshelf
     #   @see PathLocation
     #   @see GitLocation
     def cookbook(*args)
-      options = args.last.is_a?(Hash) ? args.pop : Hash.new
+      options = args.last.is_a?(Hash) ? args.pop : {}
       name, constraint = args
 
       options[:path] &&= File.expand_path(options[:path], File.dirname(filepath))
@@ -176,10 +176,10 @@ module Berkshelf
     # @option options [String] :path
     #   path to the metadata file
     def metadata(options = {})
-      path          = options[:path] || File.dirname(filepath)
+      path = options[:path] || File.dirname(filepath)
 
       loader = Chef::Cookbook::CookbookVersionLoader.new(path)
-      loader.load_cookbooks
+      loader.load!
       cookbook_version = loader.cookbook_version
       metadata = cookbook_version.metadata
 
@@ -282,7 +282,7 @@ module Berkshelf
       if @dependencies[name]
         # Only raise an exception if the dependency is a true duplicate
         groups = (options[:group].nil? || options[:group].empty?) ? [:default] : options[:group]
-        if !(@dependencies[name].groups & groups).empty?
+        unless (@dependencies[name].groups & groups).empty?
           raise DuplicateDependencyDefined.new(name)
         end
       end
@@ -500,7 +500,7 @@ module Berkshelf
           latest = cookbooks.select do |cookbook|
             (include_non_satisfying || dependency.version_constraint.satisfies?(cookbook.version)) &&
               Semverse::Version.coerce(cookbook.version) > dependency.locked_version
-          end.sort_by { |cookbook| cookbook.version }.last
+          end.max_by(&:version)
 
           unless latest.nil?
             hash[name] ||= {
@@ -659,7 +659,7 @@ module Berkshelf
           files.reject! { |file_path| chefignore.ignored?(file_path) }
 
           # convert Pathname objects back to strings
-          files.map! { |f| f.to_s }
+          files.map!(&:to_s)
 
           # copy each file to destination
           files.each do |rpath|
@@ -740,39 +740,41 @@ module Berkshelf
 
     private
 
-      # Ensure the lockfile is present on disk.
-      #
-      # @raise [LockfileNotFound]
-      #   if the lockfile does not exist on disk
-      #
-      # @return [true]
+    # Ensure the lockfile is present on disk.
+    #
+    # @raise [LockfileNotFound]
+    #   if the lockfile does not exist on disk
+    #
+    # @return [true]
     def validate_lockfile_present!
       raise LockfileNotFound unless lockfile.present?
+
       true
     end
 
-      # Ensure that all dependencies defined in the Berksfile exist in this
-      # lockfile.
-      #
-      # @raise [LockfileOutOfSync]
-      #   if there are dependencies specified in the Berksfile which do not
-      #   exist (or are not satisifed by) the lockfile
-      #
-      # @return [true]
+    # Ensure that all dependencies defined in the Berksfile exist in this
+    # lockfile.
+    #
+    # @raise [LockfileOutOfSync]
+    #   if there are dependencies specified in the Berksfile which do not
+    #   exist (or are not satisifed by) the lockfile
+    #
+    # @return [true]
     def validate_lockfile_trusted!
       raise LockfileOutOfSync unless lockfile.trusted?
+
       true
     end
 
-      # Ensure that all dependencies in the lockfile are installed on this
-      # system. You should validate that the lockfile can be trusted before
-      # using this method.
-      #
-      # @raise [DependencyNotInstalled]
-      #   if the dependency in the lockfile is not in the Berkshelf shelf on
-      #   this system
-      #
-      # @return [true]
+    # Ensure that all dependencies in the lockfile are installed on this
+    # system. You should validate that the lockfile can be trusted before
+    # using this method.
+    #
+    # @raise [DependencyNotInstalled]
+    #   if the dependency in the lockfile is not in the Berkshelf shelf on
+    #   this system
+    #
+    # @return [true]
     def validate_dependencies_installed!
       lockfile.graph.locks.each do |_, dependency|
         unless dependency.installed?
@@ -783,13 +785,13 @@ module Berkshelf
       true
     end
 
-      # Determine if any cookbooks were specified that aren't in our shelf.
-      #
-      # @param [Array<String>] names
-      #   a list of cookbook names
-      #
-      # @raise [DependencyNotFound]
-      #   if a cookbook name is given that does not exist
+    # Determine if any cookbooks were specified that aren't in our shelf.
+    #
+    # @param [Array<String>] names
+    #   a list of cookbook names
+    #
+    # @raise [DependencyNotFound]
+    #   if a cookbook name is given that does not exist
     def validate_cookbook_names!(names)
       missing = names - lockfile.graph.locks.keys
 

data/lib/berkshelf/cached_cookbook.rb

@@ -1,6 +1,6 @@
 require "chef/cookbook/cookbook_version_loader"
 require "chef/cookbook/syntax_check"
-require "berkshelf/errors"
+require_relative "errors"
 require "chef/json_compat"
 
 module Berkshelf
@@ -66,7 +66,7 @@ module Berkshelf
       @loader ||=
         begin
           loader = Chef::Cookbook::CookbookVersionLoader.new(@path)
-          loader.load_cookbooks
+          loader.load!
           loader
         end
     end
@@ -151,7 +151,8 @@ module Berkshelf
     def validate
       raise IOError, "No Cookbook found at: #{path}" unless path.exist?
 
-      syntax_checker = Chef::Cookbook::SyntaxCheck.for_cookbook(cookbook_name, path)
+      syntax_checker = Chef::Cookbook::SyntaxCheck.new(path.to_path)
+
       unless syntax_checker.validate_ruby_files
         raise Berkshelf::Errors::CookbookSyntaxError, "Invalid ruby files in cookbook: #{cookbook_name} (#{version})."
       end
@@ -166,6 +167,7 @@ module Berkshelf
       json_file = "#{path}/metadata.json"
       rb_file = "#{path}/metadata.rb"
       return nil if File.exist?(json_file)
+
       md = Chef::Cookbook::Metadata.new
       md.from_file(rb_file)
       f = File.open(json_file, "w")

data/lib/berkshelf/chef_config_compat.rb

@@ -1,6 +1,6 @@
 require "chef-config/config"
 require "chef-config/workstation_config_loader"
-require "socket" # FIXME: why?
+require "socket" unless defined?(Socket) # FIXME: why?
 
 module Berkshelf
   class ChefConfigCompat

data/lib/berkshelf/chef_repo_universe.rb

@@ -1,5 +1,5 @@
-require "berkshelf/api_client/remote_cookbook"
-require "berkshelf/cached_cookbook"
+require_relative "api_client/remote_cookbook"
+require_relative "cached_cookbook"
 
 module Berkshelf
   # Shim to look like a Berkshelf::APIClient but for a chef repo folder.
@@ -15,8 +15,10 @@ module Berkshelf
     def universe
       Dir.entries(cookbooks_path).sort.each_with_object([]) do |entry, cookbooks|
         next if entry[0] == "." # Skip hidden folders.
+
         entry_path = "#{cookbooks_path}/#{entry}"
         next unless File.directory?(entry_path) # Skip non-dirs.
+
         cookbook = begin
           Berkshelf::CachedCookbook.from_path(entry_path)
                    rescue IOError

data/lib/berkshelf/cli.rb

@@ -1,4 +1,4 @@
-require "berkshelf"
+require_relative "../berkshelf"
 require_relative "config"
 require_relative "commands/shelf"
 
@@ -419,11 +419,11 @@ module Berkshelf
 
     private
 
-      # Print a list of the given cookbooks. This is used by various
-      # methods like {list} and {contingent}.
-      #
-      # @param [Array<CachedCookbook>] cookbooks
-      #
+    # Print a list of the given cookbooks. This is used by various
+    # methods like {list} and {contingent}.
+    #
+    # @param [Array<CachedCookbook>] cookbooks
+    #
     def print_list(cookbooks)
       Array(cookbooks).sort.each do |cookbook|
         Berkshelf.formatter.msg "  * #{cookbook.cookbook_name} (#{cookbook.version})"

data/lib/berkshelf/commands/shelf.rb

@@ -13,7 +13,7 @@ module Berkshelf
       else
         Berkshelf.formatter.msg "Cookbooks in the Berkshelf shelf:"
         cookbooks.sort.each do |cookbook, versions|
-          Berkshelf.formatter.msg("  * #{cookbook} (#{versions.sort.join(', ')})")
+          Berkshelf.formatter.msg("  * #{cookbook} (#{versions.sort.join(", ")})")
         end
       end
     end

data/lib/berkshelf/community_rest.rb

@@ -1,5 +1,5 @@
-require "retryable"
-require "mixlib/archive"
+require "retryable" unless defined?(Retryable)
+require "mixlib/archive" unless defined?(Mixlib::Archive)
 
 module Berkshelf
   class CommunityREST
@@ -69,13 +69,13 @@ module Berkshelf
     #   how often we should pause between retries
     def initialize(uri = V1_API, options = {})
       options = options.dup
-      options         = { retries: 5, retry_interval: 0.5, ssl: Berkshelf::Config.instance.ssl }.merge(options)
-      @api_uri        = uri
+      options = { retries: 5, retry_interval: 0.5, ssl: Berkshelf::Config.instance.ssl }.merge(options)
+      @api_uri = uri
       options[:server_url] = uri
-      @retries        = options.delete(:retries)
+      @retries = options.delete(:retries)
       @retry_interval = options.delete(:retry_interval)
 
-      @connection = Berkshelf::RidleyCompatJSON.new(options)
+      @connection = Berkshelf::RidleyCompatJSON.new(**options)
     end
 
     # Download and extract target cookbook archive to the local file system,