chef 15.1.36-universal-mingw32 → 15.2.20-universal-mingw32

data/lib/chef/knife/role_run_list_add.rb

@@ -69,11 +69,11 @@ class Chef
         if @name_args.size > 1
           # Check for nested lists and create a single plain one
           entries = @name_args[1..-1].map do |entry|
-            entry.split(",").map { |e| e.strip }
+            entry.split(",").map(&:strip)
           end.flatten
         else
           # Convert to array and remove the extra spaces
-          entries = @name_args[1].split(",").map { |e| e.strip }
+          entries = @name_args[1].split(",").map(&:strip)
         end
 
         add_to_env_run_list(role, environment, entries, config[:after])

data/lib/chef/knife/role_run_list_set.rb

@@ -51,11 +51,11 @@ class Chef
         elsif @name_args.size > 1
           # Check for nested lists and create a single plain one
           entries = @name_args[1..-1].map do |entry|
-            entry.split(",").map { |e| e.strip }
+            entry.split(",").map(&:strip)
           end.flatten
         else
           # Convert to array and remove the extra spaces
-          entries = @name_args[1].split(",").map { |e| e.strip }
+          entries = @name_args[1].split(",").map(&:strip)
         end
 
         set_env_run_list(role, environment, entries )

data/lib/chef/knife/search.rb

@@ -83,7 +83,7 @@ class Chef
         result_items = []
         result_count = 0
 
-        search_args = Hash.new
+        search_args = {}
         search_args[:fuzz] = true
         search_args[:start] = config[:start] if config[:start]
         search_args[:rows] = config[:rows] if config[:rows]
@@ -97,7 +97,7 @@ class Chef
 
         begin
           q.search(@type, @query, search_args) do |item|
-            formatted_item = Hash.new
+            formatted_item = {}
             if config[:id_only]
               formatted_item = format_for_display({ "id" => item["__display_name"] })
             elsif item.is_a?(Hash)
@@ -169,7 +169,7 @@ class Chef
       # and the path is an array with the path elements as strings (in order)
       # See lib/chef/search/query.rb for more examples of this.
       def create_result_filter(filter_string)
-        final_filter = Hash.new
+        final_filter = {}
         filter_string.delete!(" ")
         filters = filter_string.split(",")
         filters.each do |f|
@@ -180,7 +180,7 @@ class Chef
       end
 
       def create_result_filter_from_attributes(filter_array)
-        final_filter = Hash.new
+        final_filter = {}
         filter_array.each do |f|
           final_filter[f] = f.split(".")
         end

data/lib/chef/knife/ssh.rb

@@ -185,8 +185,8 @@ class Chef
           if fqdns.count != fqdns.uniq.count
             duplicated_fqdns = fqdns.uniq
             ui.send(config[:duplicated_fqdns],
-              "SSH #{duplicated_fqdns.count > 1 ? 'nodes are' : 'node is'} " +
-              "duplicated: #{duplicated_fqdns.join(',')}")
+              "SSH #{duplicated_fqdns.count > 1 ? "nodes are" : "node is"} " +
+              "duplicated: #{duplicated_fqdns.join(",")}")
             exit 10 if config[:duplicated_fqdns] == :fatal
           end
         end
@@ -225,7 +225,7 @@ class Chef
       end
 
       def search_nodes
-        list = Array.new
+        list = []
         query = Chef::Search::Query.new
         required_attributes = { fqdn: ["fqdn"], cloud: ["cloud"] }
 
@@ -245,10 +245,12 @@ class Chef
           # we should skip the loop to next iteration if the item
           # returned by the search is nil
           next if item.nil?
+
           # next if we couldn't find the specified attribute in the
           # returned node object
           host = get_ssh_attribute(item)
           next if host.nil?
+
           prefix = get_prefix_attribute(item)
           ssh_port = item.dig("cloud", "public_ssh_port")
           srv = [host, ssh_port, prefix]
@@ -288,7 +290,7 @@ class Chef
           port ||= ssh_config[:port]
           opts[:port] = port unless port.nil?
           opts[:logger] = Chef::Log.with_child(subsystem: "net/ssh") if Chef::Log.level == :trace
-          if !config[:host_key_verify]
+          unless config[:host_key_verify]
             opts[:verify_host_key] = false
             opts[:user_known_hosts_file] = "/dev/null"
           end
@@ -358,11 +360,12 @@ class Chef
         command.force_encoding("binary") if command.respond_to?(:force_encoding)
         subsession.open_channel do |chan|
           if config[:on_error] && exit_status != 0
-            chan.close()
+            chan.close
           else
             chan.request_pty
             chan.exec command do |ch, success|
               raise ArgumentError, "Cannot execute #{command}" unless success
+
               ch.on_data do |ichannel, data|
                 print_data(ichannel.connection[:prefix], data)
                 if data =~ /^knife sudo password: /
@@ -394,7 +397,7 @@ class Chef
       # line is input.
       def read_line
         loop do
-          command = reader.readline("#{ui.color('knife-ssh>', :bold)} ", true)
+          command = reader.readline("#{ui.color("knife-ssh>", :bold)} ", true)
 
           if command.nil?
             command = "exit"
@@ -430,7 +433,7 @@ class Chef
             break
           when /^on (.+?); (.+)$/
             raw_list = $1.split(" ")
-            server_list = Array.new
+            server_list = []
             session.servers.each do |session_server|
               server_list << session_server if raw_list.include?(session_server.host)
             end
@@ -483,7 +486,7 @@ class Chef
           end.join(" \\; ")
         end
 
-        tmux_name = "'knife ssh #{@name_args[0].tr(':.', '=-')}'"
+        tmux_name = "'knife ssh #{@name_args[0].tr(":.", "=-")}'"
         begin
           server = session.servers_for.first
           cmd = ["tmux new-session -d -s #{tmux_name}",
@@ -545,6 +548,7 @@ class Chef
 
       def get_stripped_unfrozen_value(value)
         return nil if value.nil?
+
         value.strip
       end
 
@@ -594,7 +598,7 @@ class Chef
         @password = config[:ssh_password] if config[:ssh_password]
 
         # If a password was not given, check for SSH identity file.
-        if !@password
+        unless @password
           configure_ssh_identity_file
           configure_ssh_gateway_identity
         end

data/lib/chef/knife/supermarket_download.rb

@@ -115,7 +115,7 @@ class Chef
       end
 
       def specific_cookbook_version_url
-        "#{cookbooks_api_url}/#{@name_args[0]}/versions/#{@name_args[1].tr('.', '_')}"
+        "#{cookbooks_api_url}/#{@name_args[0]}/versions/#{@name_args[1].tr(".", "_")}"
       end
     end
   end

data/lib/chef/knife/supermarket_install.rb

@@ -34,11 +34,11 @@ class Chef
       category "supermarket"
 
       option :no_deps,
-       short: "-D",
-       long: "--skip-dependencies",
-       boolean: true,
-       default: false,
-       description: "Skips automatic dependency installation."
+        short: "-D",
+        long: "--skip-dependencies",
+        boolean: true,
+        default: false,
+        description: "Skips automatic dependency installation."
 
       option :cookbook_path,
         short: "-o PATH:PATH",

data/lib/chef/knife/supermarket_list.rb

@@ -39,7 +39,7 @@ class Chef
 
       def run
         if config[:with_uri]
-          cookbooks = Hash.new
+          cookbooks = {}
           get_cookbook_list.each { |k, v| cookbooks[k] = v["cookbook"] }
           ui.output(format_for_display(cookbooks))
         else

data/lib/chef/knife/supermarket_share.rb

@@ -113,7 +113,8 @@ class Chef
         data = noauth_rest.get("#{config[:supermarket_site]}/api/v1/cookbooks/#{@name_args[0]}")
         data["category"]
       rescue => e
-        return "Other" if e.kind_of?(Net::HTTPClientException) && e.response.code == "404"
+        return "Other" if e.is_a?(Net::HTTPClientException) && e.response.code == "404"
+
         ui.fatal("Unable to reach Supermarket: #{e.message}. Increase log verbosity (-VV) for more information.")
         Chef::Log.trace("\n#{e.backtrace.join("\n")}")
         exit(1)
@@ -149,7 +150,7 @@ class Chef
       end
 
       def tar_cmd
-        if !@tar_cmd
+        unless @tar_cmd
           @tar_cmd = "tar"
           begin
             # Unix and Mac only - prefer gnutar

data/lib/chef/knife/supermarket_show.rb

@@ -45,7 +45,7 @@ class Chef
         when 1
           noauth_rest.get("#{supermarket_uri}/cookbooks/#{@name_args[0]}")
         when 2
-          noauth_rest.get("#{supermarket_uri}/cookbooks/#{@name_args[0]}/versions/#{name_args[1].tr('.', '_')}")
+          noauth_rest.get("#{supermarket_uri}/cookbooks/#{@name_args[0]}/versions/#{name_args[1].tr(".", "_")}")
         end
       end
 

data/lib/chef/knife/supermarket_unshare.rb

@@ -50,6 +50,7 @@ class Chef
           rest.delete "#{config[:supermarket_site]}/api/v1/cookbooks/#{@name_args[0]}"
         rescue Net::HTTPClientException => e
           raise e unless e.message =~ /Forbidden/
+
           ui.error "Forbidden: You must be the maintainer of #{@cookbook_name} to unshare it."
           exit 1
         end

data/lib/chef/knife/tag_delete.rb

@@ -41,7 +41,7 @@ class Chef
         end
 
         node = Chef::Node.load name
-        deleted_tags = Array.new
+        deleted_tags = []
         tags.each do |tag|
           unless node.tags.delete(tag).nil?
             deleted_tags << tag

data/lib/chef/knife/xargs.rb

@@ -183,7 +183,7 @@ class Chef
         end
 
         # Create the command
-        paths = tempfiles.keys.map { |tempfile| tempfile.path }.join(" ")
+        paths = tempfiles.keys.map(&:path).join(" ")
         if config[:replace_all]
           final_command = command.gsub(config[:replace_all], paths)
         elsif config[:replace_first]
@@ -197,7 +197,7 @@ class Chef
 
       def destroy_tempfiles(tempfiles)
         # Unlink the files now that we're done with them
-        tempfiles.each_key { |tempfile| tempfile.close! }
+        tempfiles.each_key(&:close!)
       end
 
       def xargs_files(command, tempfiles)

data/lib/chef/log/syslog.rb

@@ -36,11 +36,11 @@ class Chef
       def initialize(program_name = "#{Chef::Dist::CLIENT}", facility = ::Syslog::LOG_DAEMON, logopts = nil)
         super
         return if defined? ::Logger::Syslog::SYSLOG
+
         ::Logger::Syslog.const_set :SYSLOG, SYSLOG
       end
 
-      def close
-      end
+      def close; end
     end
   end
 end

data/lib/chef/log/winevt.rb

@@ -47,8 +47,7 @@ class Chef
         @eventlog = eventlog || ::Win32::EventLog.open("Application")
       end
 
-      def close
-      end
+      def close; end
 
       def info(msg)
         @eventlog.report_event(

data/lib/chef/mash.rb

@@ -72,7 +72,7 @@ class Mash < Hash
     super
     # Handle nested values
     each do |k, v|
-      if v.kind_of?(Mash) || v.is_a?(Array)
+      if v.is_a?(Mash) || v.is_a?(Array)
         self[k] = v.dup
       end
     end
@@ -210,7 +210,7 @@ class Mash < Hash
   #
   # @api private
   def convert_key(key)
-    key.kind_of?(Symbol) ? key.to_s : key
+    key.is_a?(Symbol) ? key.to_s : key
   end
 
   # @param value<Object> The value to convert.

data/lib/chef/mixin/api_version_request_handling.rb

@@ -35,7 +35,7 @@ class Chef
         return nil if exception.response.code != "406" || exception.response["x-ops-server-api-version"].nil?
 
         # intersection of versions the server and client support, will be of length zero if no intersection
-        server_supported_client_versions = Array.new
+        server_supported_client_versions = []
 
         header = Chef::JSONCompat.from_json(exception.response["x-ops-server-api-version"])
         min_server_version = Integer(header["min_version"])

data/lib/chef/mixin/checksum.rb

@@ -29,6 +29,7 @@ class Chef
 
       def short_cksum(checksum)
         return "none" if checksum.nil?
+
         checksum.slice(0, 6)
       end
 

data/lib/chef/mixin/convert_to_class_name.rb

@@ -25,7 +25,7 @@ class Chef
       def convert_to_class_name(str)
         str = normalize_snake_case_name(str)
         rname = nil
-        regexp = %r{^(.+?)(_(.+))?$}
+        regexp = /^(.+?)(_(.+))?$/
 
         mn = str.match(regexp)
         if mn
@@ -112,6 +112,7 @@ class Chef
             constant = constant.ancestors.inject do |const, ancestor|
               break const    if ancestor == Object
               break ancestor if ancestor.const_defined?(name, false)
+
               const
             end
 

data/lib/chef/mixin/create_path.rb

@@ -29,11 +29,11 @@ class Chef
       # === Returns
       # The created file_path.
       def create_path(file_path)
-        unless file_path.kind_of?(String) || file_path.kind_of?(Array)
+        unless file_path.is_a?(String) || file_path.is_a?(Array)
           raise ArgumentError, "file_path must be a string or an array!"
         end
 
-        if file_path.kind_of?(String)
+        if file_path.is_a?(String)
           file_path = File.expand_path(file_path).split(File::SEPARATOR)
           file_path.shift if file_path[0] == ""
           # Check if path starts with a separator or drive letter (Windows)

data/lib/chef/mixin/deep_merge.rb

@@ -30,8 +30,8 @@ class Chef
       extend self
 
       def merge(first, second)
-        first  = Mash.new(first)  unless first.kind_of?(Mash)
-        second = Mash.new(second) unless second.kind_of?(Mash)
+        first  = Mash.new(first)  unless first.is_a?(Mash)
+        second = Mash.new(second) unless second.is_a?(Mash)
 
         DeepMerge.deep_merge(second, first)
       end
@@ -62,7 +62,7 @@ class Chef
         when nil
           dest
         when Hash
-          if dest.kind_of?(Hash)
+          if dest.is_a?(Hash)
             source.each do |src_key, src_value|
               if dest.key?(src_key)
                 dest[src_key] = deep_merge!(src_value, dest[src_key])
@@ -74,7 +74,7 @@ class Chef
             dest = source
           end
         when Array
-          if dest.kind_of?(Array)
+          if dest.is_a?(Array)
             dest |= source
           else
             dest = source
@@ -103,7 +103,7 @@ class Chef
       # values when there is a conflict.
       def hash_only_merge!(merge_onto, merge_with)
         # If there are two Hashes, recursively merge.
-        if merge_onto.kind_of?(Hash) && merge_with.kind_of?(Hash)
+        if merge_onto.is_a?(Hash) && merge_with.is_a?(Hash)
           merge_with.each do |key, merge_with_value|
             value =
               if merge_onto.key?(key)

data/lib/chef/mixin/get_source_from_package.rb

@@ -35,6 +35,7 @@ class Chef
       def initialize(new_resource, run_context)
         super
         return if new_resource.package_name.is_a?(Array)
+
         # if we're passed something that looks like a filesystem path, with no source, use it
         #  - require at least one '/' in the path to avoid gem_package "foo" breaking if a file named 'foo' exists in the cwd
         if new_resource.source.nil? && new_resource.package_name.match(/#{::File::SEPARATOR}/) && ::File.exist?(new_resource.package_name)

data/lib/chef/mixin/homebrew_user.rb

@@ -40,6 +40,7 @@ class Chef
         # They could provide us a user name or a UID
         if provided_user
           return provided_user if provided_user.is_a? Integer
+
           return Etc.getpwnam(provided_user).uid
         end
 
@@ -67,7 +68,7 @@ class Chef
           owner = ::File.stat(brew_path).uid
         else
           raise Chef::Exceptions::CannotDetermineHomebrewOwner,
-                'Could not find the "brew" executable in /usr/local/bin or anywhere on the path.'
+            'Could not find the "brew" executable in /usr/local/bin or anywhere on the path.'
         end
 
         Chef::Log.debug "Found Homebrew owner #{Etc.getpwuid(owner).name}; executing `brew` commands as them"

data/lib/chef/mixin/openssl_helper.rb

@@ -46,6 +46,7 @@ class Chef
         # Check if the dhparam.pem file exists
         # Verify the dhparam.pem file contains a key
         return false unless ::File.exist?(dhparam_pem_path)
+
         dhparam = ::OpenSSL::PKey::DH.new File.read(dhparam_pem_path)
         dhparam.params_ok?
       end
@@ -158,6 +159,7 @@ class Chef
       def gen_ec_priv_key(curve)
         raise TypeError, "curve must be a string" unless curve.is_a?(String)
         raise ArgumentError, "Specified curve is not available on this system" unless curve == "prime256v1" || curve == "secp384r1" || curve == "secp521r1"
+
         ::OpenSSL::PKey::EC.new(curve).generate_key
       end
 
@@ -262,7 +264,7 @@ class Chef
         cert = ::OpenSSL::X509::Certificate.new
         ef = ::OpenSSL::X509::ExtensionFactory.new
 
-        cert.serial = gen_serial()
+        cert.serial = gen_serial
         cert.version = 2
         cert.subject = request.subject
         cert.public_key = request.public_key
@@ -275,6 +277,7 @@ class Chef
           extension << ef.create_extension("basicConstraints", "CA:TRUE", true)
         else
           raise TypeError, "info['issuer'] must be a Ruby OpenSSL::X509::Certificate object" unless info["issuer"].is_a?(::OpenSSL::X509::Certificate)
+
           cert.issuer = info["issuer"].subject
           ef.issuer_certificate = info["issuer"]
         end
@@ -284,7 +287,7 @@ class Chef
         cert.extensions = extension
         cert.add_extension ef.create_extension("subjectKeyIdentifier", "hash")
         cert.add_extension ef.create_extension("authorityKeyIdentifier",
-                                               "keyid:always,issuer:always")
+          "keyid:always,issuer:always")
 
         cert.sign(key, ::OpenSSL::Digest::SHA256.new)
         cert
@@ -315,7 +318,7 @@ class Chef
 
         crl.add_extension ::OpenSSL::X509::Extension.new("crlNumber", ::OpenSSL::ASN1::Integer(1))
         crl.add_extension ef.create_extension("authorityKeyIdentifier",
-                                              "keyid:always,issuer:always")
+          "keyid:always,issuer:always")
         crl.sign(ca_private_key, ::OpenSSL::Digest::SHA256.new)
         crl
       end
@@ -325,6 +328,7 @@ class Chef
       # @return [Integer]
       def get_next_crl_number(crl)
         raise TypeError, "crl must be a Ruby OpenSSL::X509::CRL object" unless crl.is_a?(::OpenSSL::X509::CRL)
+
         crlnum = 1
         crl.extensions.each do |e|
           crlnum = e.value if e.oid == "crlNumber"
@@ -361,7 +365,7 @@ class Chef
         revoked.time = Time.now
 
         ext = ::OpenSSL::X509::Extension.new("CRLReason",
-               ::OpenSSL::ASN1::Enumerated(revoke_info["reason"]))
+          ::OpenSSL::ASN1::Enumerated(revoke_info["reason"]))
         revoked.add_extension(ext)
         crl.add_revoked(revoked)
 
@@ -391,9 +395,9 @@ class Chef
         ef.issuer_certificate = info["issuer"]
 
         crl.extensions = [ ::OpenSSL::X509::Extension.new("crlNumber",
-                   ::OpenSSL::ASN1::Integer(get_next_crl_number(crl)))]
+          ::OpenSSL::ASN1::Integer(get_next_crl_number(crl)))]
         crl.add_extension ef.create_extension("authorityKeyIdentifier",
-                                              "keyid:always,issuer:always")
+          "keyid:always,issuer:always")
         crl.sign(ca_private_key, ::OpenSSL::Digest::SHA256.new)
         crl
       end