berkshelf 7.0.7 → 7.2.0

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,

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
@@ -122,7 +122,7 @@ module Berkshelf
             default :email, nil
             default :license, nil
           end
-          default :allowed_licenses, Array.new
+          default :allowed_licenses, []
           default :raise_license_exception, false
           config_context :vagrant do
             config_context :vm do

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.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/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/dependency.rb

@@ -171,7 +171,7 @@ module Berkshelf
         "#{name} (#{version_constraint})",
         "locked_version: #{locked_version.inspect}",
         "groups: #{groups}",
-        "location: #{location || 'default'}>",
+        "location: #{location || "default"}>",
       ].join(", ")
     end
 

data/lib/berkshelf/downloader.rb

@@ -1,6 +1,7 @@
-require "net/http"
-require "mixlib/archive"
-require "berkshelf/ssl_policies"
+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
@@ -83,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|
@@ -120,7 +121,7 @@ module Berkshelf
         )
 
         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
@@ -131,6 +132,7 @@ module Berkshelf
         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)
@@ -143,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"
@@ -183,6 +185,7 @@ module Berkshelf
 
         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) }
 
         Mixlib::Archive.new(archive_path).extract(unpack_dir)

data/lib/berkshelf/errors.rb

@@ -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)
 
@@ -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,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/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

@@ -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

data/lib/berkshelf/installer.rb

@@ -1,4 +1,4 @@
-require "berkshelf/api-client"
+require_relative "api-client"
 require "concurrent/executors"
 require "concurrent/future"
 

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

@@ -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,13 +511,13 @@ 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}$/
-      DEPENDENCIES_PATTERN = /^ {4}#{NAME_VERSION}$/
-      OPTION_PATTERN       = /^ {4}(.+)\: (.+)/
+      DEPENDENCY_PATTERN   = /^ {2}#{NAME_VERSION}$/.freeze
+      DEPENDENCIES_PATTERN = /^ {4}#{NAME_VERSION}$/.freeze
+      OPTION_PATTERN       = /^ {4}(.+)\: (.+)/.freeze
 
       # Create a new lockfile parser.
       #
@@ -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