berkshelf 7.0.9 → 7.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f8c64894fa5e6b2ec2e82b6cc2f4835d67faf33204e5bf1412e4a5eea9fb0b0
-  data.tar.gz: 3dd04763b8ac3735045e7296e498d112dcba3d34fef9c32263f7f8b557faa149
+  metadata.gz: a3328d9ead777bfb150d7588648ca5376fa46fa5fafa8ded0afdb9cc710043b3
+  data.tar.gz: 94203ac8481a5a5155987e5f060d6fd1c78cc9f3073dd84efcb597d1a21ff5c6
 SHA512:
-  metadata.gz: 16a792fea670f247f48880b806f47fa2c50c55aa5cc1c255f2a7f47232adea30eb6360c7f2c957b51c380555dc9aaa6ec242f657ec88101dc5804a4147220954
-  data.tar.gz: 15e850ce857ec01c3b42f319fc159169d7211bf5eb2ed828dec7b4010607860ba47abab36269f1a8fd83817e3310a5b299ed2a32f6de8e7ca4ff412e8534fb51
+  metadata.gz: 337c5f8eb9d149f27e7fc40f6e1228f7fdbc2606a8c352dbe8c942ee5f6ab081e5db039fb9b46e41a9dbaff017ddf7d004d02c7d8d272d3042cf892e5e68396e
+  data.tar.gz: b9d8896f85f1c98924c3472ad97648071bc8301854a0ea49fe7dde2472faafe54f035b27140928462de7e099aa95983cda21d52d928ad93698ccf7e1404265e2

data/Gemfile

@@ -2,19 +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 "chef-bin" # for the proxy tests
-  gem "aruba",         ">= 0.10.0"
+  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"
@@ -23,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

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,14 +10,14 @@ 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
 
@@ -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.rb

@@ -16,8 +16,8 @@ module Berkshelf
         Connection.new(*args)
       end
 
-      def chef_server(*args)
-        ChefServerConnection.new(*args)
+      def chef_server(**args)
+        ChefServerConnection.new(**args)
       end
     end
   end

data/lib/berkshelf/api_client/chef_server_connection.rb

@@ -5,15 +5,13 @@ module Berkshelf
     require_relative "errors"
 
     class ChefServerConnection
-      attr_reader :client
-
-      def initialize(*args)
-        @client = Berkshelf::RidleyCompat.new(*args)
-        @url = args[0][:server_url]
+      def initialize(**args)
+        @client = Berkshelf::RidleyCompat.new(**args)
+        @url = args[:server_url]
       end
 
       def universe
-        response = client.get("universe")
+        response = @client.get("universe")
 
         [].tap do |cookbooks|
           response.each do |name, versions|

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

@@ -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(&:version).last
+          end.max_by(&:version)
 
           unless latest.nil?
             hash[name] ||= {
@@ -644,7 +644,7 @@ module Berkshelf
           FileUtils.mkdir_p(cookbook_destination)
 
           # Dir.glob does not support backslash as a File separator
-          src   = cookbook.path.to_s.tr('\\', "/")
+          src   = cookbook.path.to_s.tr("\\", "/")
           files = FileSyncer.glob(File.join(src, "**/*"))
 
           # strip directories
@@ -740,41 +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?
@@ -785,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/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/cli.rb

@@ -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/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
@@ -75,7 +75,7 @@ module Berkshelf
       @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,

data/lib/berkshelf/config.rb

@@ -1,5 +1,5 @@
-require "mixlib/config"
-require "openssl"
+require "mixlib/config" unless defined?(Mixlib::Config)
+require "openssl" unless defined?(OpenSSL)
 
 # we need this method, but have to inject it into mixlib-config directly
 # to have it available from config contexts

data/lib/berkshelf/cookbook_store.rb

@@ -1,4 +1,4 @@
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 require "chef/exceptions"
 
 module Berkshelf
@@ -49,9 +49,7 @@ module Berkshelf
 
     # Destroy the contents of the initialized storage path.
     def clean!
-      Dir.chdir(storage_path) do
-        FileUtils.rm_rf(Dir.glob("*"))
-      end
+      FileUtils.rm_rf(Dir.glob("#{storage_path}/*"))
     end
 
     # Import a cookbook found on the local filesystem into this instance of the cookbook store.

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.key?(:force)
-      FileUtils.cp_r(src, dest, options)
+      FileUtils.cp_r(src, dest, **options)
       FileUtils.rm_rf(src)
     end
   end

data/lib/berkshelf/downloader.rb

@@ -1,7 +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"
+require "faraday" unless defined?(Faraday)
 
 module Berkshelf
   class Downloader
@@ -84,7 +84,7 @@ module Berkshelf
           client_key: source.options[:client_key] || Berkshelf::Config.instance.chef.client_key,
           ssl: source.options[:ssl],
         }
-        RidleyCompat.new_client(credentials) do |conn|
+        RidleyCompat.new_client(**credentials) do |conn|
           cookbook = Chef::CookbookVersion.load(name, version)
           manifest = cookbook.cookbook_manifest
           manifest.by_parent_directory.each do |segment, files|
@@ -145,7 +145,7 @@ module Berkshelf
 
         File.join(unpack_dir, cookbook_directory)
       when :uri
-        require "open-uri"
+        require "open-uri" unless defined?(OpenURI)
 
         tmp_dir      = Dir.mktmpdir
         archive_path = Pathname.new(tmp_dir) + "#{name}-#{version}.tar.gz"

data/lib/berkshelf/errors.rb

@@ -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)
 
@@ -436,6 +438,7 @@ module Berkshelf
   end
 
   class DuplicateDemand < BerkshelfError; set_status_code(138); end
+
   class LockfileNotFound < BerkshelfError
     set_status_code(140)
 

data/lib/berkshelf/file_syncer.rb

@@ -1,4 +1,4 @@
-require "fileutils"
+require "fileutils" unless defined?(FileUtils)
 
 module Berkshelf
   module FileSyncer
@@ -24,8 +24,8 @@ module Berkshelf
     #   versions of windows points at 'C:\users'. Some users have their
     #   temp directory still referring to 'C:\Documents and Settings'.
     #
-    def glob(pattern)
-      Dir.glob(pattern, File::FNM_DOTMATCH).sort.reject do |file|
+    def glob(pattern, **kwargs)
+      Dir.glob(pattern, File::FNM_DOTMATCH, **kwargs).sort.reject do |file|
         basename = File.basename(file)
         IGNORED_FILES.include?(basename)
       end
@@ -65,11 +65,10 @@ module Berkshelf
         [exclude, "#{exclude}/*"]
       end.flatten
 
-      source_files = Dir.chdir(source) do
-        glob("**/*").reject do |source_file|
+      source_files =
+        glob("**/*", base: source).reject do |source_file|
           excludes.any? { |exclude| File.fnmatch?(exclude, source_file, File::FNM_DOTMATCH) }
         end
-      end
 
       # Ensure the destination directory exists
       FileUtils.mkdir_p(destination) unless File.directory?(destination)
@@ -88,10 +87,11 @@ 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)
@@ -103,9 +103,7 @@ module Berkshelf
 
       if options[:delete]
         # Remove any files in the destination that are not in the source files
-        destination_files = Dir.chdir(destination) do
-          glob("**/*")
-        end
+        destination_files = glob("**/*", base: destination)
 
         # Remove any extra files that are present in the destination, but are
         # not in the source list