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

data/lib/chef/knife/cookbook_delete.rb

@@ -106,7 +106,7 @@ class Chef
         end
         valid_responses[(available_versions.size + 1).to_s] = :all
         question << "#{available_versions.size + 1}. All versions\n\n"
-        responses = ask_question(question).split(",").map { |response| response.strip }
+        responses = ask_question(question).split(",").map(&:strip)
 
         if responses.empty?
           ui.error("No versions specified, exiting")

data/lib/chef/knife/cookbook_download.rb

@@ -33,21 +33,21 @@ class Chef
       banner "knife cookbook download COOKBOOK [VERSION] (options)"
 
       option :latest,
-       short: "-N",
-       long: "--latest",
-       description: "The version of the cookbook to download.",
-       boolean: true
+        short: "-N",
+        long: "--latest",
+        description: "The version of the cookbook to download.",
+        boolean: true
 
       option :download_directory,
-       short: "-d DOWNLOAD_DIRECTORY",
-       long: "--dir DOWNLOAD_DIRECTORY",
-       description: "The directory to download the cookbook into.",
-       default: Dir.pwd
+        short: "-d DOWNLOAD_DIRECTORY",
+        long: "--dir DOWNLOAD_DIRECTORY",
+        description: "The directory to download the cookbook into.",
+        default: Dir.pwd
 
       option :force,
-       short: "-f",
-       long: "--force",
-       description: "Force download over the download directory if it exists."
+        short: "-f",
+        long: "--force",
+        description: "Force download over the download directory if it exists."
 
       # TODO: tim/cw: 5-23-2010: need to implement knife-side
       # specificity for downloads - need to implement --platform and
@@ -87,7 +87,7 @@ class Chef
           ui.info("Downloading #{segment}")
           files.each do |segment_file|
             dest = File.join(basedir, segment_file["path"].gsub("/", File::SEPARATOR))
-            Chef::Log.trace("Downloading #{segment_file['path']} to #{dest}")
+            Chef::Log.trace("Downloading #{segment_file["path"]} to #{dest}")
             FileUtils.mkdir_p(File.dirname(dest))
             tempfile = rest.streaming_request(segment_file["url"])
             FileUtils.mv(tempfile.path, dest)

data/lib/chef/knife/cookbook_show.rb

@@ -31,19 +31,19 @@ class Chef
       banner "knife cookbook show COOKBOOK [VERSION] [PART] [FILENAME] (options)"
 
       option :fqdn,
-       short: "-f FQDN",
-       long: "--fqdn FQDN",
-       description: "The FQDN of the host to see the file for."
+        short: "-f FQDN",
+        long: "--fqdn FQDN",
+        description: "The FQDN of the host to see the file for."
 
       option :platform,
-       short: "-p PLATFORM",
-       long: "--platform PLATFORM",
-       description: "The platform to see the file for."
+        short: "-p PLATFORM",
+        long: "--platform PLATFORM",
+        description: "The platform to see the file for."
 
       option :platform_version,
-       short: "-V VERSION",
-       long: "--platform-version VERSION",
-       description: "The platform version to see the file for."
+        short: "-V VERSION",
+        long: "--platform-version VERSION",
+        description: "The platform version to see the file for."
 
       option :with_uri,
         short: "-w",
@@ -57,7 +57,7 @@ class Chef
 
         case @name_args.length
         when 4 # We are showing a specific file
-          node = Hash.new
+          node = {}
           node[:fqdn] = config[:fqdn] if config.key?(:fqdn)
           node[:platform] = config[:platform] if config.key?(:platform)
           node[:platform_version] = config[:platform_version] if config.key?(:platform_version)

data/lib/chef/knife/cookbook_upload.rb

@@ -92,7 +92,7 @@ class Chef
         # Get a list of cookbooks and their versions from the server
         # to check for the existence of a cookbook's dependencies.
         @server_side_cookbooks = Chef::CookbookVersion.list_all_versions
-        justify_width = @server_side_cookbooks.map { |name| name.size }.max.to_i + 2
+        justify_width = @server_side_cookbooks.map(&:size).max.to_i + 2
         if config[:all]
           cookbook_repo.load_cookbooks
           cookbooks_for_upload = []
@@ -154,7 +154,7 @@ class Chef
             upload_set = {}
             @name_args.each do |cookbook_name|
               begin
-                if ! upload_set.key?(cookbook_name)
+                unless upload_set.key?(cookbook_name)
                   upload_set[cookbook_name] = cookbook_repo[cookbook_name]
                   if config[:depends]
                     upload_set[cookbook_name].metadata.dependencies.each_key { |dep| @name_args << dep }
@@ -224,7 +224,7 @@ class Chef
           broken_filenames = Array(broken_files).map { |path, info| path }
           ui.error "The cookbook #{cookbook.name} has one or more broken files"
           ui.error "This is probably caused by broken symlinks in the cookbook directory"
-          ui.error "The broken file(s) are: #{broken_filenames.join(' ')}"
+          ui.error "The broken file(s) are: #{broken_filenames.join(" ")}"
           exit 1
         end
       end
@@ -240,7 +240,7 @@ class Chef
           missing_cookbook_names = missing_dependencies.map { |cookbook_name, version| "'#{cookbook_name}' version '#{version}'" }
           ui.error "Cookbook #{cookbook.name} depends on cookbooks which are not currently"
           ui.error "being uploaded and cannot be found on the server."
-          ui.error "The missing cookbook(s) are: #{missing_cookbook_names.join(', ')}"
+          ui.error "The missing cookbook(s) are: #{missing_cookbook_names.join(", ")}"
           exit 1
         end
       end
@@ -253,7 +253,7 @@ class Chef
           Log.debug "Versions of cookbook '#{cookbook_name}' returned by the server: #{versions.join(", ")}"
           @server_side_cookbooks[cookbook_name]["versions"].each do |versions_hash|
             if Chef::VersionConstraint.new(version).include?(versions_hash["version"])
-              Log.debug "Matched cookbook '#{cookbook_name}' with constraint '#{version}' to cookbook version '#{versions_hash['version']}' on the server"
+              Log.debug "Matched cookbook '#{cookbook_name}' with constraint '#{version}' to cookbook version '#{versions_hash["version"]}' on the server"
               return true
             end
           end

data/lib/chef/knife/core/bootstrap_context.rb

@@ -96,7 +96,7 @@ class Chef
             client_rb << "chef_license \"#{@chef_config[:chef_license]}\"\n"
           end
 
-          if !(@chef_config[:config_log_level].nil? || @chef_config[:config_log_level].empty?)
+          unless @chef_config[:config_log_level].nil? || @chef_config[:config_log_level].empty?
             client_rb << %Q{log_level   :#{@chef_config[:config_log_level]}\n}
           end
 

data/lib/chef/knife/core/cookbook_scm_repo.rb

@@ -50,7 +50,7 @@ class Chef
           exit 1
         end
         if use_current_branch
-          @default_branch = get_current_branch()
+          @default_branch = get_current_branch
         end
         unless branch_exists?(default_branch)
           ui.error "The default branch '#{default_branch}' does not exist"

data/lib/chef/knife/core/gem_glob_loader.rb

@@ -111,14 +111,14 @@ class Chef
 
         def check_spec_for_glob(spec, glob)
           dirs = if spec.require_paths.size > 1
-                   "{#{spec.require_paths.join(',')}}"
+                   "{#{spec.require_paths.join(",")}}"
                  else
                    spec.require_paths.first
                  end
 
           glob = File.join(Chef::Util::PathHelper.escape_glob_dir(spec.full_gem_path, dirs), glob)
 
-          Dir[glob].map { |f| f.untaint }
+          Dir[glob].map(&:untaint)
         end
 
         def from_different_chef_version?(path)

data/lib/chef/knife/core/generic_presenter.rb

@@ -201,13 +201,13 @@ class Chef
               end
           end
           # necessary (?) for coercing objects (the run_list object?) to hashes
-          ( !data.kind_of?(Array) && data.respond_to?(:to_hash) ) ? data.to_hash : data
+          ( !data.is_a?(Array) && data.respond_to?(:to_hash) ) ? data.to_hash : data
         end
 
         def format_cookbook_list_for_display(item)
           if config[:with_uri]
             item.inject({}) do |collected, (cookbook, versions)|
-              collected[cookbook] = Hash.new
+              collected[cookbook] = {}
               versions["versions"].each do |ver|
                 collected[cookbook][ver["version"]] = ver["url"]
               end
@@ -218,9 +218,9 @@ class Chef
               collected[cookbook] = versions["versions"].map { |v| v["version"] }
               collected
             end
-            key_length = versions_by_cookbook.empty? ? 0 : versions_by_cookbook.keys.map { |name| name.size }.max + 2
+            key_length = versions_by_cookbook.empty? ? 0 : versions_by_cookbook.keys.map(&:size).max + 2
             versions_by_cookbook.sort.map do |cookbook, versions|
-              "#{cookbook.ljust(key_length)} #{versions.join('  ')}"
+              "#{cookbook.ljust(key_length)} #{versions.join("  ")}"
             end
           end
         end

data/lib/chef/knife/core/node_presenter.rb

@@ -61,7 +61,7 @@ class Chef
         end
 
         def summarize_json(data)
-          if data.kind_of?(Chef::Node)
+          if data.is_a?(Chef::Node)
             node = data
             result = {}
 
@@ -92,53 +92,53 @@ class Chef
         # the volume of output is adjusted accordingly. Uses colors if enabled
         # in the ui object.
         def summarize(data)
-          if data.kind_of?(Chef::Node)
+          if data.is_a?(Chef::Node)
             node = data
             # special case ec2 with their split horizon whatsis.
             ip = (node[:ec2] && node[:ec2][:public_ipv4]) || node[:ipaddress]
 
             summarized = <<~SUMMARY
-              #{ui.color('Node Name:', :bold)}   #{ui.color(node.name, :bold)}
+              #{ui.color("Node Name:", :bold)}   #{ui.color(node.name, :bold)}
             SUMMARY
             show_policy = !(node.policy_name.nil? && node.policy_group.nil?)
             if show_policy
               summarized << <<~POLICY
-                #{key('Policy Name:')}  #{node.policy_name}
-                #{key('Policy Group:')} #{node.policy_group}
+                #{key("Policy Name:")}  #{node.policy_name}
+                #{key("Policy Group:")} #{node.policy_group}
               POLICY
             else
               summarized << <<~ENV
-                #{key('Environment:')} #{node.chef_environment}
+                #{key("Environment:")} #{node.chef_environment}
               ENV
             end
             summarized << <<~SUMMARY
-              #{key('FQDN:')}        #{node[:fqdn]}
-              #{key('IP:')}          #{ip}
-              #{key('Run List:')}    #{node.run_list}
+              #{key("FQDN:")}        #{node[:fqdn]}
+              #{key("IP:")}          #{ip}
+              #{key("Run List:")}    #{node.run_list}
             SUMMARY
             unless show_policy
               summarized << <<~ROLES
-                #{key('Roles:')}       #{Array(node[:roles]).join(', ')}
+                #{key("Roles:")}       #{Array(node[:roles]).join(", ")}
               ROLES
             end
             summarized << <<~SUMMARY
-              #{key('Recipes:')}     #{Array(node[:recipes]).join(', ')}
-              #{key('Platform:')}    #{node[:platform]} #{node[:platform_version]}
-              #{key('Tags:')}        #{node.tags.join(', ')}
+              #{key("Recipes:")}     #{Array(node[:recipes]).join(", ")}
+              #{key("Platform:")}    #{node[:platform]} #{node[:platform_version]}
+              #{key("Tags:")}        #{node.tags.join(", ")}
             SUMMARY
             if config[:medium_output] || config[:long_output]
               summarized += <<~MORE
-                #{key('Attributes:')}
+                #{key("Attributes:")}
                 #{text_format(node.normal_attrs)}
               MORE
             end
             if config[:long_output]
               summarized += <<~MOST
-                #{key('Default Attributes:')}
+                #{key("Default Attributes:")}
                 #{text_format(node.default_attrs)}
-                #{key('Override Attributes:')}
+                #{key("Override Attributes:")}
                 #{text_format(node.override_attrs)}
-                #{key('Automatic Attributes (Ohai Data):')}
+                #{key("Automatic Attributes (Ohai Data):")}
                 #{text_format(node.automatic_attrs)}
               MOST
             end

data/lib/chef/knife/core/object_loader.rb

@@ -40,7 +40,7 @@ class Chef
 
         def load_from(repo_location, *components)
           unless object_file = find_file(repo_location, *components)
-            ui.error "Could not find or open file '#{components.last}' in current directory or in '#{repo_location}/#{components.join('/')}'"
+            ui.error "Could not find or open file '#{components.last}' in current directory or in '#{repo_location}/#{components.join("/")}'"
             exit 1
           end
           object_from_file(object_file)

data/lib/chef/knife/core/status_presenter.rb

@@ -108,13 +108,13 @@ class Chef
               end
             end
 
-            line_parts = Array.new
+            line_parts = []
 
             if node["ohai_time"]
               hours, minutes, seconds = time_difference_in_hms(node["ohai_time"])
-              hours_text   = "#{hours} hour#{hours == 1 ? ' ' : 's'}"
-              minutes_text = "#{minutes} minute#{minutes == 1 ? ' ' : 's'}"
-              seconds_text = "#{seconds} second#{seconds == 1 ? ' ' : 's'}"
+              hours_text   = "#{hours} hour#{hours == 1 ? " " : "s"}"
+              minutes_text = "#{minutes} minute#{minutes == 1 ? " " : "s"}"
+              seconds_text = "#{seconds} second#{seconds == 1 ? " " : "s"}"
               if hours > 24
                 color = :red
                 text = hours_text
@@ -140,7 +140,7 @@ class Chef
             if node["platform"]
               platform = node["platform"].dup
               if node["platform_version"]
-                platform << " #{node['platform_version']}"
+                platform << " #{node["platform_version"]}"
               end
               line_parts << platform
             end

data/lib/chef/knife/core/subcommand_loader.rb

@@ -82,6 +82,7 @@ class Chef
       # Load all the sub-commands
       def load_commands
         return true if @loaded
+
         subcommand_files.each { |subcommand| Kernel.load subcommand }
         @loaded = true
       end
@@ -108,7 +109,7 @@ class Chef
         cmd_words = positional_arguments(args)
         load_command(cmd_words)
         result = Chef::Knife.subcommands[find_longest_key(Chef::Knife.subcommands,
-                                                          cmd_words, "_")]
+          cmd_words, "_")]
         result || Chef::Knife.subcommands[args.first.tr("-", "_")]
       end
 
@@ -116,7 +117,7 @@ class Chef
         category_words = positional_arguments(args)
         category_words.map! { |w| w.split("-") }.flatten!
         find_longest_key(Chef::Knife.subcommands_by_category,
-                         category_words, " ")
+          category_words, " ")
       end
 
       #

data/lib/chef/knife/core/text_formatter.rb

@@ -28,7 +28,7 @@ class Chef
           @ui = ui
           @data = if data.respond_to?(:display_hash)
                     data.display_hash
-                  elsif data.kind_of?(Array)
+                  elsif data.is_a?(Array)
                     data
                   elsif data.respond_to?(:to_hash)
                     data.to_hash
@@ -48,7 +48,7 @@ class Chef
             justify_width = data.keys.map { |k| k.to_s.size }.max.to_i + 1
             data.sort.each do |key, value|
               # key: ['value'] should be printed as key: value
-              if value.kind_of?(Array) && value.size == 1 && is_singleton(value[0])
+              if value.is_a?(Array) && value.size == 1 && is_singleton(value[0])
                 value = value[0]
               end
               if is_singleton(value)
@@ -62,7 +62,7 @@ class Chef
                 lines.each { |line| buffer << "  #{line}\n" }
               end
             end
-          elsif data.kind_of?(Array)
+          elsif data.is_a?(Array)
             data.each_index do |index|
               item = data[index]
               buffer << text_format(data[index])
@@ -77,7 +77,7 @@ class Chef
         end
 
         def is_singleton(value)
-          !(value.kind_of?(Array) || value.respond_to?(:keys))
+          !(value.is_a?(Array) || value.respond_to?(:keys))
         end
       end
     end

data/lib/chef/knife/core/ui.rb

@@ -69,6 +69,7 @@ class Chef
         stdout.puts message
       rescue Errno::EPIPE => e
         raise e if @config[:verbosity] >= 2
+
         exit 0
       end
 
@@ -85,6 +86,7 @@ class Chef
         unless lines.empty?
           prefix, = first_line.split(":", 2)
           return if prefix.nil?
+
           prefix_len = prefix.length
           prefix_len -= 9 if color? # prefix includes 9 bytes of color escape sequences
           prefix_len += 2 # include room to align to the ": " following PREFIX
@@ -95,6 +97,7 @@ class Chef
         end
       rescue Errno::EPIPE => e
         raise e if @config[:verbosity] >= 2
+
         exit 0
       end
 
@@ -105,28 +108,28 @@ class Chef
       #
       # @param message [String] the text string
       def debug(message)
-        log("#{color('DEBUG:', :blue, :bold)} #{message}")
+        log("#{color("DEBUG:", :blue, :bold)} #{message}")
       end
 
       # Print a warning message
       #
       # @param message [String] the text string
       def warn(message)
-        log("#{color('WARNING:', :yellow, :bold)} #{message}")
+        log("#{color("WARNING:", :yellow, :bold)} #{message}")
       end
 
       # Print an error message
       #
       # @param message [String] the text string
       def error(message)
-        log("#{color('ERROR:', :red, :bold)} #{message}")
+        log("#{color("ERROR:", :red, :bold)} #{message}")
       end
 
       # Print a message describing a fatal error.
       #
       # @param message [String] the text string
       def fatal(message)
-        log("#{color('FATAL:', :red, :bold)} #{message}")
+        log("#{color("FATAL:", :red, :bold)} #{message}")
       end
 
       def color(string, *colors)
@@ -186,6 +189,7 @@ class Chef
         stdout.puts data
       rescue Errno::EPIPE => e
         raise e if @config[:verbosity] >= 2
+
         exit 0
       end
 
@@ -199,7 +203,7 @@ class Chef
 
       def edit_data(data, parse_output = true, object_class: nil)
         output = Chef::JSONCompat.to_json_pretty(data)
-        if !config[:disable_editing]
+        unless config[:disable_editing]
           Tempfile.open([ "knife-edit-", ".json" ]) do |tf|
             tf.sync = true
             tf.puts output