berkshelf 7.0.10 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1209065e8abc3141efc5b789c212f990184a652cd89a0414ba4fefb2bc9c419
-  data.tar.gz: 627233958a52340668fcc510f5142eaf37a8dec3130dd8f99d389004f26a7d8d
+  metadata.gz: 62d08805f26730ed4eb3721de768e7361113fe5d877c485a60358161904db3f9
+  data.tar.gz: 9a3f0b74b8cbda7bc06a92febdf8881002d8b42a3427c9e7e21565a705f28a1c
 SHA512:
-  metadata.gz: 6a41ffac6b3b389d138f2bd430520b1e64257455f6b3332058d6f07bd7a52d0a60d24063206ffb54fb87c3645a92ef9087d0b653fc332bbc57f6335501bdbac6
-  data.tar.gz: 667994356ccb8b8be2b2be7ff191b5da06e4d95d75f98f7ef6124a404b8b5ee1397236f335cfd7317e8fb21b3df8f242d1e6f30e62c617f2360cfb3e5a61d590
+  metadata.gz: d2b5c48cbdb73b61b318cf679098d036d53da85c4f3308c01b51711bdcfe9d073f7a482a87285d684a874054ae1ebe00e0162ef032582243a9b333cecbe744be
+  data.tar.gz: dd118413d20ac879b40e92c4ea78055686fc0823d0ee1bcbe58ab9d799cb7c1fc48b0326018988737b9c9952989531a3ef6711cdad26476198b5f120c4cba34b

data/Gemfile

@@ -11,10 +11,9 @@ group :build do
 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"

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/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] ||= {
@@ -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

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

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,9 +87,7 @@ 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
           FileUtils.cp(source_file, "#{destination}/#{relative_path}")
         else
@@ -103,9 +100,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

data/lib/berkshelf/location.rb

@@ -28,9 +28,9 @@ module Berkshelf
 
       private
 
-        # Load the correct location from the given options.
-        #
-        # @return [Class, nil]
+      # Load the correct location from the given options.
+      #
+      # @return [Class, nil]
       def klass_from_options(options)
         options.each do |key, _|
           id = key.to_s.capitalize

data/lib/berkshelf/locations/git.rb

@@ -37,28 +37,22 @@ module Berkshelf
       scratch_path = Pathname.new(Dir.mktmpdir)
 
       if cached?
-        Dir.chdir(cache_path) do
-          git %{fetch --force --tags #{uri} "refs/heads/*:refs/heads/*"}
-        end
+        git(%{fetch --force --tags #{uri} "refs/heads/*:refs/heads/*"}, cwd: cache_path.to_s)
       else
         git %{clone #{uri} "#{cache_path}" --bare --no-hardlinks}
       end
 
-      Dir.chdir(cache_path) do
-        @revision ||= git %{rev-parse #{@rev_parse}}
-      end
+      @revision ||= git(%{rev-parse #{@rev_parse}}, cwd: cache_path.to_s)
 
       # Clone into a scratch directory for validations
       git %{clone --no-checkout "#{cache_path}" "#{scratch_path}"}
 
       # Make sure the scratch directory is up-to-date and account for rel paths
-      Dir.chdir(scratch_path) do
-        git %{fetch --force --tags "#{cache_path}"}
-        git %{reset --hard #{@revision}}
+      git(%{fetch --force --tags "#{cache_path}"}, cwd: scratch_path.to_s)
+      git(%{reset --hard #{@revision}}, cwd: scratch_path.to_s)
 
-        if rel
-          git %{filter-branch --subdirectory-filter "#{rel}" --force}
-        end
+      if rel
+        git(%{filter-branch --subdirectory-filter "#{rel}" --force}, cwd: scratch_path.to_s)
       end
 
       # Validate the scratched path is a valid cookbook

data/lib/berkshelf/lockfile.rb

@@ -511,8 +511,8 @@ module Berkshelf
       "#<Berkshelf::Lockfile #{Pathname.new(filepath).basename}, dependencies: #{dependencies.inspect}>"
     end
 
-      # The class responsible for parsing the lockfile and turning it into a
-      # useful data structure.
+    # The class responsible for parsing the lockfile and turning it into a
+    # useful data structure.
     class LockfileParser
       NAME_VERSION         = '(?! )(.*?)(?: \(([^-]*)(?:-(.*))?\))?'.freeze
       DEPENDENCY_PATTERN   = /^ {2}#{NAME_VERSION}$/.freeze
@@ -599,9 +599,9 @@ module Berkshelf
 
       private
 
-        # Parse a dependency line.
-        #
-        # @param [String] line
+      # Parse a dependency line.
+      #
+      # @param [String] line
       def parse_dependency(line)
         if line =~ DEPENDENCY_PATTERN
           name, version = $1, $2
@@ -615,9 +615,9 @@ module Berkshelf
         end
       end
 
-        # Parse a graph line.
-        #
-        # @param [String] line
+      # Parse a graph line.
+      #
+      # @param [String] line
       def parse_graph(line)
         if line =~ DEPENDENCY_PATTERN
           name, version = $1, $2
@@ -631,7 +631,7 @@ module Berkshelf
       end
     end
 
-      # The class representing an internal graph.
+    # The class representing an internal graph.
     class Graph
       include Enumerable
 

data/lib/berkshelf/mixin/git.rb

@@ -13,12 +13,12 @@ module Berkshelf
       #
       # @raise [String]
       #   the +$stdout+ from the command
-      def git(command, error = true)
+      def git(command, error = true, **kwargs)
         unless Berkshelf.which("git") || Berkshelf.which("git.exe") || Berkshelf.which("git.bat")
           raise GitNotInstalled.new
         end
 
-        response = shell_out(%{git #{command}})
+        response = shell_out(%{git #{command}}, **kwargs)
 
         if response.error?
           raise GitCommandError.new(command, cache_path, response.stderr)

data/lib/berkshelf/packager.rb

@@ -1,5 +1,5 @@
 require "archive/tar/minitar"
-require "zlib"
+require "zlib" unless defined?(Zlib)
 
 module Berkshelf
   # A class for archiving and compressing directory containing one or more cookbooks.
@@ -40,10 +40,8 @@ module Berkshelf
     # @return [String]
     #   path to the generated archive
     def run(source)
-      Dir.chdir(source.to_s) do |dir|
-        tgz = Zlib::GzipWriter.new(File.open(out_file, "wb"))
-        Archive::Tar::Minitar.pack(Dir.glob("*"), tgz)
-      end
+      tgz = Zlib::GzipWriter.new(File.open(out_file, "wb"))
+      Archive::Tar::Minitar.pack(Dir.glob("#{source}/*"), tgz)
 
       out_file
     rescue SystemCallError => ex
@@ -64,10 +62,10 @@ module Berkshelf
 
     private
 
-      # @return [String]
+    # @return [String]
     attr_reader :out_dir
 
-      # @return [String]
+    # @return [String]
     attr_reader :filename
   end
 end

data/lib/berkshelf/shell.rb

@@ -1,4 +1,4 @@
-require "thor"
+require "thor" unless defined?(Thor)
 
 module Berkshelf
   # Subclass the current shell (which is different based on the OS)

data/lib/berkshelf/shell_out.rb

@@ -1,4 +1,4 @@
-require "mixlib/shellout"
+require "mixlib/shellout" unless defined?(Mixlib::ShellOut)
 
 module Berkshelf
   module ShellOut
@@ -8,8 +8,9 @@ module Berkshelf
       cmd
     end
 
-    def shell_out!(*args)
-      cmd = shell_out(*args)
+    def shell_out!(*args, **options)
+      cmd = Mixlib::ShellOut.new(*args, **options)
+      cmd.run_command
       cmd.error!
       cmd
     end

data/lib/berkshelf/source.rb

@@ -1,7 +1,7 @@
 require_relative "api-client"
 require_relative "chef_repo_universe"
 require_relative "ssl_policies"
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 
 module Berkshelf
   class Source
@@ -132,7 +132,7 @@ module Berkshelf
     #
     # @return [APIClient::RemoteCookbook]
     def latest(name)
-      versions(name).sort.last
+      versions(name).max
     end
 
     # @param [String] name

data/lib/berkshelf/source_uri.rb

@@ -1,4 +1,4 @@
-require "addressable/uri"
+require "addressable/uri" unless defined?(Addressable::URI)
 
 module Berkshelf
   class SourceURI < Addressable::URI

data/lib/berkshelf/ssl_policies.rb

@@ -1,4 +1,4 @@
-require "openssl"
+require "openssl" unless defined?(OpenSSL)
 
 module Berkshelf
   class SSLPolicy
@@ -29,11 +29,9 @@ module Berkshelf
     end
 
     def set_custom_certs
-      Dir.chdir(trusted_certs_dir) do
-        ::Dir.glob("{*.crt,*.pem}").each do |cert|
-          cert = OpenSSL::X509::Certificate.new(IO.read(cert))
-          add_trusted_cert(cert)
-        end
+      ::Dir.glob("#{trusted_certs_dir}/{*.crt,*.pem}").each do |cert|
+        cert = OpenSSL::X509::Certificate.new(IO.read(cert))
+        add_trusted_cert(cert)
       end
     end
   end

data/lib/berkshelf/uploader.rb

@@ -45,10 +45,10 @@ module Berkshelf
 
     private
 
-      # Upload the list of cookbooks to the Chef Server, with some exception
-      # wrapping.
-      #
-      # @param [Array<String>] cookbooks
+    # Upload the list of cookbooks to the Chef Server, with some exception
+    # wrapping.
+    #
+    # @param [Array<String>] cookbooks
     def upload(cookbooks)
       Berkshelf.log.info "Starting upload"
 

data/lib/berkshelf/validator.rb

@@ -22,15 +22,9 @@ module Berkshelf
       #  the Cookbook(s) to validate
       def validate_files(cookbooks)
         Array(cookbooks).each do |cookbook|
-          path = cookbook.path.to_s
+          base, name = Pathname.new(cookbook.path.to_s).split
 
-          files = Dir.chdir(path) do
-            Dir.glob(File.join("**", "*.rb")).select do |f|
-              f = File.join(path, f)
-              parent = Pathname.new(path).dirname.to_s
-              f.gsub(parent, "") =~ /[[:space:]]/
-            end
-          end
+          files = Dir.glob("#{name}/**/*.rb", base: base.to_s).select { |f| f =~ /[[:space:]]/ }
 
           raise InvalidCookbookFiles.new(cookbook, files) unless files.empty?
         end

data/lib/berkshelf/version.rb

@@ -1,3 +1,3 @@
 module Berkshelf
-  VERSION = "7.0.10".freeze
+  VERSION = "7.2.0".freeze
 end

data/lib/berkshelf/visualizer.rb

@@ -1,5 +1,5 @@
-require "set"
-require "tempfile"
+require "set" unless defined?(Set)
+require "tempfile" unless defined?(Tempfile)
 require_relative "shell_out"
 
 module Berkshelf

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/spec/spec_helper.rb

@@ -2,7 +2,7 @@ def windows?
   !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
 end
 
-BERKS_SPEC_DATA = File.expand_path("../data", __FILE__)
+BERKS_SPEC_DATA = File.expand_path("data", __dir__)
 
 require "rspec"
 require "cleanroom/rspec"

data/spec/support/git.rb

@@ -84,26 +84,26 @@ module Berkshelf
 
       private
 
-        # The path to store the local git clones.
-        #
-        # @return [Pathname]
+      # The path to store the local git clones.
+      #
+      # @return [Pathname]
       def clones
         ensure_and_return(tmp_path.join("clones"))
       end
 
-        # The path to store the git remotes.
-        #
-        # @return [Pathname]
+      # The path to store the git remotes.
+      #
+      # @return [Pathname]
       def remotes
         ensure_and_return(tmp_path.join("remotes"))
       end
 
-        # Generate a cookbook by the given name.
-        #
-        # @param [#to_s] name
-        #   the name of the cookbook to create
-        # @param [Hash] options
-        #   the list ooptions to pass to the generator
+      # Generate a cookbook by the given name.
+      #
+      # @param [#to_s] name
+      #   the name of the cookbook to create
+      # @param [Hash] options
+      #   the list ooptions to pass to the generator
       def generate_git_cookbook(name, options = {})
         options = {
           skip_vagrant: true,
@@ -114,12 +114,12 @@ module Berkshelf
         Berkshelf::Cli.new.invoke(:cookbook, [name.to_s], options)
       end
 
-        # Make sure the given path exists and return the path
-        #
-        # @param [#to_s] path
-        #   the path to create and return
-        #
-        # @return [Pathname]
+      # Make sure the given path exists and return the path
+      #
+      # @param [#to_s] path
+      #   the path to create and return
+      #
+      # @return [Pathname]
       def ensure_and_return(path)
         FileUtils.mkdir(path) unless File.exist?(path)
         Pathname.new(path).expand_path

data/spec/support/path_helpers.rb

@@ -50,10 +50,10 @@ module Berkshelf
 
       private
 
-        # This is the magical "reset" function that gives us a clean working
-        # directory on each run.
-        #
-        # @return [nil]
+      # This is the magical "reset" function that gives us a clean working
+      # directory on each run.
+      #
+      # @return [nil]
       def reload_configs
         Berkshelf.chef_config = chef_config
 

data/spec/unit/berkshelf/locations/git_spec.rb

@@ -104,11 +104,10 @@ module Berkshelf
 
       context "when the repository is cached" do
         it "pulls a new version" do
-          allow(Dir).to receive(:chdir) { |args, &b| b.call } # Force eval the chdir block
-
+          cache_path = subject.send(:cache_path)
           allow(subject).to receive(:cached?).and_return(true)
           expect(subject).to receive(:git).with(
-            'fetch --force --tags https://repo.com "refs/heads/*:refs/heads/*"'
+            'fetch --force --tags https://repo.com "refs/heads/*:refs/heads/*"', cwd: cache_path.to_s
           )
           subject.install
         end
@@ -116,8 +115,6 @@ module Berkshelf
 
       context "when the revision is not cached" do
         it "clones the repository" do
-          allow(Dir).to receive(:chdir) { |args, &b| b.call } # Force eval the chdir block
-
           cache_path = subject.send(:cache_path)
           allow(subject).to receive(:cached?).and_return(false)
           expect(subject).to receive(:git).with(

data/spec/unit/berkshelf/ridley_compat_spec.rb

@@ -4,7 +4,7 @@ require "chef/cookbook_manifest"
 describe Berkshelf::RidleyCompat do
   let(:opts) { {} }
 
-  subject { described_class.new(opts) }
+  subject { described_class.new(**opts) }
 
   context "default" do
     it "has a cookbook version_class" do

data/spec/unit/berkshelf/source_spec.rb

@@ -4,8 +4,9 @@ module Berkshelf
   describe Source do
     let(:berksfile) { double("Berksfile", filepath: "/test/Berksfile") }
     let(:arguments) { [] }
+    let(:kwargs) { {} }
     let(:config) { Config.new }
-    subject(:instance) { described_class.new(berksfile, *arguments) }
+    subject(:instance) { described_class.new(berksfile, *arguments, **kwargs) }
     before do
       allow(Berkshelf::Config).to receive(:instance).and_return(config)
     end
@@ -19,7 +20,8 @@ module Berkshelf
       end
 
       context "with a string argument and options" do
-        let(:arguments) { ["https://example.com", { key: "value" }] }
+        let(:arguments) { ["https://example.com" ] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq :supermarket }
       end
 
@@ -29,7 +31,8 @@ module Berkshelf
       end
 
       context "with a symbol argument and options" do
-        let(:arguments) { [:chef_server, { key: "value" }] }
+        let(:arguments) { [:chef_server ] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq :chef_server }
       end
 
@@ -44,7 +47,8 @@ module Berkshelf
       end
 
       context "with a hash argument and disconnected options" do
-        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" }, { key: "value" }] }
+        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" }] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq :artifactory }
       end
     end
@@ -58,7 +62,8 @@ module Berkshelf
       end
 
       context "with a string argument and options" do
-        let(:arguments) { ["https://example.com", { key: "value" }] }
+        let(:arguments) { ["https://example.com" ] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq "https://example.com" }
       end
 
@@ -69,7 +74,8 @@ module Berkshelf
       end
 
       context "with a symbol argument and options" do
-        let(:arguments) { [:chef_server, { key: "value" }] }
+        let(:arguments) { [:chef_server] }
+        let(:kwargs) { { key: "value" } }
         before { config.chef.chef_server_url = "https://chefserver/" }
         it { is_expected.to eq "https://chefserver/" }
       end
@@ -85,7 +91,8 @@ module Berkshelf
       end
 
       context "with a hash argument and disconnected options" do
-        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" }, { key: "value" }] }
+        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" } ] }
+        let(:kwargs) { { key: "value" } }
         it { is_expected.to eq "https://example.com/api/chef/chef-virtual" }
       end
 
@@ -96,7 +103,7 @@ module Berkshelf
 
       context "with a chef_repo source" do
         let(:arguments) { [{ chef_repo: "." }] }
-        it { is_expected.to eq(windows? ? "file://C/test" : "file:///test") }
+        it { is_expected.to eq(windows? ? "file://D/test" : "file:///test") }
       end
     end
 
@@ -119,7 +126,8 @@ module Berkshelf
       end
 
       context "with a string argument and options" do
-        let(:arguments) { ["https://example.com", { key: "value" }] }
+        let(:arguments) { ["https://example.com"] }
+        let(:kwargs) { { key: "value" } }
         its([:key]) { is_expected.to eq "value" }
       end
 
@@ -129,7 +137,8 @@ module Berkshelf
       end
 
       context "with a symbol argument and options" do
-        let(:arguments) { [:chef_server, { key: "value" }] }
+        let(:arguments) { [:chef_server] }
+        let(:kwargs) { { key: "value" } }
         its([:key]) { is_expected.to eq "value" }
       end
 
@@ -144,7 +153,8 @@ module Berkshelf
       end
 
       context "with a hash argument and disconnected options" do
-        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" }, { key: "value" }] }
+        let(:arguments) { [{ artifactory: "https://example.com/api/chef/chef-virtual" } ] }
+        let(:kwargs) { { key: "value" } }
         its([:key]) { is_expected.to eq "value" }
       end
 
@@ -156,7 +166,7 @@ module Berkshelf
 
       context "with a chef_repo source" do
         let(:arguments) { [{ chef_repo: "." }] }
-        its([:path]) { is_expected.to eq(windows? ? "C:/test" : "/test") }
+        its([:path]) { is_expected.to eq(windows? ? "D:/test" : "/test") }
       end
     end
 

data/spec/unit/berkshelf/ssl_policies_spec.rb

@@ -73,7 +73,6 @@ describe Berkshelf::SSLPolicy do
         before do
           allow(chef_config).to receive_messages(trusted_certs_dir: self_signed_crt_path_windows_backslashes)
           allow(File).to receive(:exist?).with(self_signed_crt_path_windows_forwardslashes).and_return(true)
-          allow(Dir).to receive(:chdir).with(self_signed_crt_path_windows_forwardslashes)
         end
 
         it "replaces the backslashes in trusted_certs_dir from Berkshelf config with forwardslashes" do

data/spec/unit/berkshelf/validator_spec.rb

@@ -4,10 +4,6 @@ describe Berkshelf::Validator do
   describe "#validate_files" do
     let(:cookbook) { double("cookbook", cookbook_name: "cookbook", path: "path") }
 
-    before do
-      allow(Dir).to receive(:chdir) { |&block| block.call }
-    end
-
     it "raises an error when the cookbook has spaces in the files" do
       allow(Dir).to receive(:glob).and_return(["/there are/spaces/in this/recipes/default.rb"])
       expect do
@@ -21,14 +17,5 @@ describe Berkshelf::Validator do
         subject.validate_files(cookbook)
       end.to_not raise_error
     end
-
-    it "does not raise an exception with spaces in the path" do
-      allow(Dir).to receive(:glob).and_return(["/there are/spaces/in this/recipes/default.rb"])
-      allow_any_instance_of(Pathname).to receive(:dirname).and_return("/there are/spaces/in this")
-
-      expect do
-        subject.validate_files(cookbook)
-      end.to_not raise_error
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf
 version: !ruby/object:Gem::Version
-  version: 7.0.10
+  version: 7.2.0
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,10 +9,10 @@ authors:
 - Michael Ivey
 - Justin Campbell
 - Seth Vargo
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-27 00:00:00.000000000 Z
+date: 2021-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.1.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -140,7 +140,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 1.1.4
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -164,14 +164,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.6.52
+        version: 15.7.32
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 13.6.52
+        version: 15.7.32
 - !ruby/object:Gem::Dependency
   name: chef-config
   requirement: !ruby/object:Gem::Requirement
@@ -359,7 +359,7 @@ homepage: https://docs.chef.io/berkshelf.html
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -374,8 +374,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 2.0.0
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Manages a Chef cookbook's dependencies
 test_files: []