berkshelf 7.0.8 → 8.0.0

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

data/lib/berkshelf/formatters/human.rb

@@ -68,7 +68,7 @@ module Berkshelf
 
         hash.each do |name, info|
           info["remote"].each do |remote_source, remote_version|
-            out = "  * #{name} (#{info['local']} => #{remote_version})"
+            out = "  * #{name} (#{info["local"]} => #{remote_version})"
 
             unless remote_source.default?
               out << " [#{remote_source.uri}]"

data/lib/berkshelf/formatters/json.rb

@@ -12,7 +12,7 @@ module Berkshelf
         messages: [],
         warnings: [],
       }
-      @cookbooks = Hash.new
+      @cookbooks = {}
 
       Berkshelf.ui.mute { super }
     end

data/lib/berkshelf/installer.rb

@@ -1,4 +1,4 @@
-require "berkshelf/api-client"
+require_relative "api-client"
 require "concurrent/executors"
 require "concurrent/future"
 
@@ -19,13 +19,13 @@ module Berkshelf
     def build_universe
       berksfile.sources.collect do |source|
         Thread.new do
-          begin
-            Berkshelf.formatter.msg("Fetching cookbook index from #{source}...")
-            source.build_universe
-          rescue Berkshelf::APIClientError => ex
-            Berkshelf.formatter.warn "Error retrieving universe from source: #{source}"
-            Berkshelf.formatter.warn "  * [#{ex.class}] #{ex}"
-          end
+
+          Berkshelf.formatter.msg("Fetching cookbook index from #{source}...")
+          source.build_universe
+        rescue Berkshelf::APIClientError => ex
+          Berkshelf.formatter.warn "Error retrieving universe from source: #{source}"
+          Berkshelf.formatter.warn "  * [#{ex.class}] #{ex}"
+
         end
       end.map(&:join)
     end

data/lib/berkshelf/location.rb

@@ -9,7 +9,7 @@ module Berkshelf
       # is returned.
       #
       # @example Create a git location
-      #   Location.init(dependency, git: 'git://github.com/berkshelf/berkshelf.git')
+      #   Location.init(dependency, git: 'https://github.com/berkshelf/berkshelf.git')
       #
       # @example Create a GitHub location
       #   Location.init(dependency, github: 'berkshelf/berkshelf')
@@ -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/locations/github.rb

@@ -9,7 +9,7 @@ module Berkshelf
       when :https
         options[:git] = "https://#{HOST}/#{options.delete(:github)}.git"
       when :git
-        options[:git] = "git://#{HOST}/#{options.delete(:github)}.git"
+        options[:git] = "https://#{HOST}/#{options.delete(:github)}.git"
       else
         # if some bizarre value is provided, treat it as :https
         options[:git] = "https://#{HOST}/#{options.delete(:github)}.git"

data/lib/berkshelf/lockfile.rb

@@ -228,7 +228,7 @@ module Berkshelf
 
     # @return [Array<CachedCookbook>]
     def cached
-      graph.locks.values.collect { |dependency| dependency.cached_cookbook }
+      graph.locks.values.collect(&:cached_cookbook)
     end
 
     # The list of dependencies constrained in this lockfile.
@@ -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
@@ -570,7 +570,7 @@ module Berkshelf
               end
             end
 
-            graph << "  #{name} (#{info['locked_version']})\n"
+            graph << "  #{name} (#{info["locked_version"]})\n"
           end
 
           contents = "#{dependencies}\n#{graph}"
@@ -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/logger.rb

@@ -3,7 +3,7 @@ module Berkshelf
     def initialize(device = STDOUT)
       super
       self.level = Logger::WARN
-      @filter_params = Array.new
+      @filter_params = []
     end
 
     # Reimplements Logger#add adding message filtering. The info,
@@ -28,6 +28,7 @@ module Berkshelf
       if @logdev.nil? || severity < (@level)
         return true
       end
+
       progname ||= @progname
       if message.nil?
         if block_given?
@@ -38,7 +39,8 @@ module Berkshelf
         end
       end
       @logdev.write(
-        format_message(format_severity(severity), Time.now, progname, filter(message)))
+        format_message(format_severity(severity), Time.now, progname, filter(message))
+      )
       true
     end
 

data/lib/berkshelf/mixin/git.rb

@@ -1,4 +1,4 @@
-require "berkshelf/shell_out"
+require_relative "../shell_out"
 
 module Berkshelf
   module Mixin
@@ -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/resolver.rb

@@ -21,7 +21,7 @@ module Berkshelf
     def initialize(berksfile, demands = [])
       @berksfile = berksfile
       @graph     = Graph.new
-      @demands   = Array.new
+      @demands   = []
 
       Array(demands).each { |demand| add_demand(demand) }
       compute_solver_engine(berksfile)

data/lib/berkshelf/ridley_compat.rb

@@ -1,7 +1,7 @@
 require "chef/server_api"
 require "chef/http/simple_json"
 require "chef/http/simple"
-require "berkshelf/api_client/errors"
+require_relative "api_client/errors"
 require "chef/config"
 require "chef/cookbook_manifest"
 

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)
@@ -15,6 +15,7 @@ module Berkshelf
 
     def say(*args)
       return if quiet?
+
       super(*args)
     end
     alias_method :info, :say

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 "berkshelf/api-client"
-require "berkshelf/chef_repo_universe"
-require "berkshelf/ssl_policies"
-require "openssl"
+require_relative "api-client"
+require_relative "chef_repo_universe"
+require_relative "ssl_policies"
+require "openssl" unless defined?(OpenSSL)
 
 module Berkshelf
   class Source
@@ -84,7 +84,7 @@ module Berkshelf
     def build_universe
       @universe = api_client.universe
     rescue => ex
-      @universe = Array.new
+      @universe = []
       raise ex
     end
 
@@ -132,7 +132,7 @@ module Berkshelf
     #
     # @return [APIClient::RemoteCookbook]
     def latest(name)
-      versions(name).sort.last
+      versions(name).max
     end
 
     # @param [String] name
@@ -154,7 +154,7 @@ module Berkshelf
     end
 
     def inspect
-      "#<#{self.class.name} #{type}: #{uri.to_s.inspect}, #{options.map { |k, v| "#{k}: #{v.inspect}" }.join(', ')}>"
+      "#<#{self.class.name} #{type}: #{uri.to_s.inspect}, #{options.map { |k, v| "#{k}: #{v.inspect}" }.join(", ")}>"
     end
 
     def hash
@@ -163,6 +163,7 @@ module Berkshelf
 
     def ==(other)
       return false unless other.is_a?(self.class)
+
       type == other.type && uri == other.uri
     end
 

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
@@ -8,9 +8,7 @@ module Berkshelf
     attr_reader :store
 
     def initialize
-      @store = OpenSSL::X509::Store.new.tap do |store|
-        store.set_default_paths
-      end
+      @store = OpenSSL::X509::Store.new.tap(&:set_default_paths)
 
       set_custom_certs if ::File.exist?(trusted_certs_dir)
     end
@@ -22,7 +20,7 @@ module Berkshelf
     end
 
     def trusted_certs_dir
-      config_dir = Berkshelf.config.chef.trusted_certs_dir.to_s.tr('\\', "/")
+      config_dir = Berkshelf.config.chef.trusted_certs_dir.to_s.tr("\\", "/")
       if config_dir.empty? || !::File.exist?(config_dir)
         File.join(ENV["HOME"], ".chef", "trusted_certs")
       else
@@ -31,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/thor.rb

@@ -1 +1 @@
-require "berkshelf/cli"
+require_relative "cli"

data/lib/berkshelf/thor_ext/hash_with_indifferent_access.rb

@@ -1,5 +1,5 @@
 class Thor
-  module CoreExt #:nodoc:
+  module CoreExt # :nodoc:
     class HashWithIndifferentAccess < ::Hash
       def has_key?(key)
         super(convert_key(key))

data/lib/berkshelf/thor_ext.rb

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

data/lib/berkshelf/uploader.rb

@@ -32,7 +32,7 @@ module Berkshelf
                     Berkshelf.log.debug "  No names given, using all cookbooks"
                     filtered_cookbooks
                   else
-                    Berkshelf.log.debug "  Names given (#{names.join(', ')})"
+                    Berkshelf.log.debug "  Names given (#{names.join(", ")})"
                     names.map { |name| lockfile.retrieve(name) }
                   end
 
@@ -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"
 
@@ -59,39 +59,41 @@ module Berkshelf
         connection.get("users/#{Berkshelf.config.chef.node_name}") rescue nil
 
         cookbooks.map do |cookbook|
+
+          compiled_metadata = cookbook.compile_metadata
+          cookbook.reload if compiled_metadata
+          cookbook_version = cookbook.cookbook_version
+          Berkshelf.log.debug "  Uploading #{cookbook.cookbook_name}"
+          cookbook_version.freeze_version if options[:freeze]
+
+          # another two lines that are necessary for chef < 13.2 support (affects 11.x/12.x as well)
+          cookbook_version.metadata.maintainer "" if cookbook_version.metadata.maintainer.nil?
+          cookbook_version.metadata.maintainer_email "" if cookbook_version.metadata.maintainer_email.nil?
+
           begin
-            compiled_metadata = cookbook.compile_metadata
-            cookbook.reload if compiled_metadata
-            cookbook_version = cookbook.cookbook_version
-            Berkshelf.log.debug "  Uploading #{cookbook.cookbook_name}"
-            cookbook_version.freeze_version if options[:freeze]
-
-            # another two lines that are necessary for chef < 13.2 support (affects 11.x/12.x as well)
-            cookbook_version.metadata.maintainer "" if cookbook_version.metadata.maintainer.nil?
-            cookbook_version.metadata.maintainer_email "" if cookbook_version.metadata.maintainer_email.nil?
-
-            begin
-              Chef::CookbookUploader.new(
-                [ cookbook_version ],
-                force: options[:force],
-                concurrency: 1, # sadly
-                rest: connection
-              ).upload_cookbooks
-              Berkshelf.formatter.uploaded(cookbook, connection)
-            rescue Chef::Exceptions::CookbookFrozen
-              if options[:halt_on_frozen]
-                raise FrozenCookbook.new(cookbook)
-              end
-              Berkshelf.formatter.skipping(cookbook, connection)
-            end
-          ensure
-            if compiled_metadata
-              # this is necessary on windows to clean up the ruby object that was pointing at the file
-              # so that we can reliably delete it.  windows is terrible.
-              GC.start
-              File.unlink(compiled_metadata)
+            Chef::CookbookUploader.new(
+              [ cookbook_version ],
+              force: options[:force],
+              concurrency: 1, # sadly
+              rest: connection,
+              skip_syntax_check: options[:skip_syntax_check]
+            ).upload_cookbooks
+            Berkshelf.formatter.uploaded(cookbook, connection)
+          rescue Chef::Exceptions::CookbookFrozen
+            if options[:halt_on_frozen]
+              raise FrozenCookbook.new(cookbook)
             end
+
+            Berkshelf.formatter.skipping(cookbook, connection)
           end
+        ensure
+          if compiled_metadata
+            # this is necessary on windows to clean up the ruby object that was pointing at the file
+            # so that we can reliably delete it.  windows is terrible.
+            GC.start
+            File.unlink(compiled_metadata)
+          end
+
         end
       end
     end

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.8".freeze
+  VERSION = "8.0.0".freeze
 end

data/lib/berkshelf/visualizer.rb

@@ -1,6 +1,6 @@
-require "set"
-require "tempfile"
-require "berkshelf/shell_out"
+require "set" unless defined?(Set)
+require "tempfile" unless defined?(Tempfile)
+require_relative "shell_out"
 
 module Berkshelf
   class Visualizer

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"