berkshelf 7.0.9 → 7.2.2

data/lib/berkshelf/installer.rb

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

@@ -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
@@ -20,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
@@ -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"
 
@@ -59,41 +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,
-                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)
+            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.9".freeze
+  VERSION = "7.2.2".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/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