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

data/lib/chef/knife/data_bag_create.rb

@@ -55,6 +55,7 @@ class Chef
           ui.info("Data bag #{@data_bag_name} already exists")
         rescue Net::HTTPClientException => e
           raise unless e.to_s =~ /^404/
+
           # if it doesn't exists, try to create it
           rest.post("data", { "name" => @data_bag_name })
           ui.info("Created data_bag[#{@data_bag_name}]")

data/lib/chef/knife/data_bag_from_file.rb

@@ -98,7 +98,7 @@ class Chef
       end
 
       def normalize_item_paths(args)
-        paths = Array.new
+        paths = []
         args.each do |path|
           if File.directory?(path)
             paths.concat(Dir.glob(File.join(Chef::Util::PathHelper.escape_glob_dir(path), "*.json")))

data/lib/chef/knife/data_bag_secret_options.rb

@@ -35,23 +35,23 @@ class Chef
 
       def self.included(base)
         base.option :secret,
-               short: "-s SECRET",
-               long: "--secret ",
-               description: "The secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret'.",
-               # Need to store value from command line in separate variable - knife#merge_configs populates same keys
-               # on config object from
-               proc: Proc.new { |s| set_cl_secret(s) }
+          short: "-s SECRET",
+          long: "--secret ",
+          description: "The secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret'.",
+          # Need to store value from command line in separate variable - knife#merge_configs populates same keys
+          # on config object from
+          proc: Proc.new { |s| set_cl_secret(s) }
 
         base.option :secret_file,
-               long: "--secret-file SECRET_FILE",
-               description: "A file containing the secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret_file'.",
-               proc: Proc.new { |sf| set_cl_secret_file(sf) }
+          long: "--secret-file SECRET_FILE",
+          description: "A file containing the secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret_file'.",
+          proc: Proc.new { |sf| set_cl_secret_file(sf) }
 
         base.option :encrypt,
-               long: "--encrypt",
-               description: "If 'secret' or 'secret_file' is present in your config, then encrypt data bags using it.",
-               boolean: true,
-               default: false
+          long: "--encrypt",
+          description: "If 'secret' or 'secret_file' is present in your config, then encrypt data bags using it.",
+          boolean: true,
+          default: false
       end
 
       def encryption_secret_provided?

data/lib/chef/knife/data_bag_show.rb

@@ -44,8 +44,8 @@ class Chef
                       # Users do not need to pass --encrypt to read data, we simply try to use the provided secret
                       ui.info("Encrypted data bag detected, decrypting with provided secret.")
                       raw = Chef::EncryptedDataBagItem.load(@name_args[0],
-                                                            @name_args[1],
-                                                            secret)
+                        @name_args[1],
+                        secret)
                       format_for_display(raw.to_h)
                     elsif encrypted && !secret
                       ui.warn("Encrypted data bag detected, but no secret provided for decoding. Displaying encrypted data.")

data/lib/chef/knife/deps.rb

@@ -67,7 +67,7 @@ class Chef
       end
 
       def print_flattened_dependencies(entry, dependencies)
-        if !dependencies[entry.path]
+        unless dependencies[entry.path]
           dependencies[entry.path] = get_dependencies(entry)
           dependencies[entry.path].each do |child|
             child_entry = Chef::ChefFS::FileSystem.resolve_path(@root, child)
@@ -78,8 +78,8 @@ class Chef
       end
 
       def print_dependencies_tree(entry, dependencies, printed = {}, depth = 0)
-        dependencies[entry.path] = get_dependencies(entry) if !dependencies[entry.path]
-        output "#{'  ' * depth}#{format_path(entry)}"
+        dependencies[entry.path] = get_dependencies(entry) unless dependencies[entry.path]
+        output "#{"  " * depth}#{format_path(entry)}"
         if !printed[entry.path] && (config[:recurse] || depth == 0)
           printed[entry.path] = true
           dependencies[entry.path].each do |child|
@@ -97,7 +97,7 @@ class Chef
           node = Chef::JSONCompat.parse(entry.read)
           result = []
           if node["chef_environment"] && node["chef_environment"] != "_default"
-            result << "/environments/#{node['chef_environment']}.json"
+            result << "/environments/#{node["chef_environment"]}.json"
           end
           if node["run_list"]
             result += dependencies_from_runlist(node["run_list"])
@@ -109,13 +109,13 @@ class Chef
           result = []
           if role["run_list"]
             dependencies_from_runlist(role["run_list"]).each do |dependency|
-              result << dependency if !result.include?(dependency)
+              result << dependency unless result.include?(dependency)
             end
           end
           if role["env_run_lists"]
             role["env_run_lists"].each_pair do |env, run_list|
               dependencies_from_runlist(run_list).each do |dependency|
-                result << dependency if !result.include?(dependency)
+                result << dependency unless result.include?(dependency)
               end
             end
           end

data/lib/chef/knife/edit.rb

@@ -66,14 +66,14 @@ class Chef
       end
 
       def edit_text(text, extension)
-        if !config[:disable_editing]
+        unless config[:disable_editing]
           Tempfile.open([ "knife-edit-", extension ]) do |file|
             # Write the text to a temporary file
             file.write(text)
             file.close
 
             # Let the user edit the temporary file
-            if !system("#{config[:editor]} #{file.path}")
+            unless system("#{config[:editor]} #{file.path}")
               raise "Please set EDITOR environment variable. See https://docs.chef.io/knife_setup.html for details."
             end
 

data/lib/chef/knife/environment_compare.rb

@@ -109,6 +109,7 @@ class Chef
           environments.each { |n| total << constraints[n][c] }
           if total.uniq.count == 1
             next if config[:mismatch]
+
             color = :white
           else
             color = :yellow

data/lib/chef/knife/environment_from_file.rb

@@ -30,9 +30,9 @@ class Chef
       banner "knife environment from file FILE [FILE..] (options)"
 
       option :all,
-      short: "-a",
-      long: "--all",
-      description: "Upload all environments."
+        short: "-a",
+        long: "--all",
+        description: "Upload all environments."
 
       def loader
         @loader ||= Knife::Core::ObjectLoader.new(Chef::Environment, ui)

data/lib/chef/knife/key_create_base.rb

@@ -25,24 +25,24 @@ class Chef
       def self.included(includer)
         includer.class_eval do
           option :public_key,
-                 short: "-p FILENAME",
-                 long: "--public-key FILENAME",
-                 description: "Public key for newly created key. If not passed, the server will create a key pair for you, but you must pass --key-name NAME in that case."
+            short: "-p FILENAME",
+            long: "--public-key FILENAME",
+            description: "Public key for newly created key. If not passed, the server will create a key pair for you, but you must pass --key-name NAME in that case."
 
           option :file,
-                 short: "-f FILE",
-                 long: "--file FILE",
-                 description: "Write the private key to a file, if you requested the server to create one."
+            short: "-f FILE",
+            long: "--file FILE",
+            description: "Write the private key to a file, if you requested the server to create one."
 
           option :key_name,
-                 short: "-k NAME",
-                 long: "--key-name NAME",
-                 description: "The name for your key. If you do not pass a name, you must pass --public-key, and the name will default to the fingerprint of the public key passed."
+            short: "-k NAME",
+            long: "--key-name NAME",
+            description: "The name for your key. If you do not pass a name, you must pass --public-key, and the name will default to the fingerprint of the public key passed."
 
           option :expiration_date,
-                 short: "-e DATE",
-                 long: "--expiration-date DATE",
-                 description: "Optionally pass the expiration date for the key in ISO 8601 fomatted string: YYYY-MM-DDTHH:MM:SSZ e.g. 2013-12-24T21:00:00Z. Defaults to infinity if not passed. UTC timezone assumed."
+            short: "-e DATE",
+            long: "--expiration-date DATE",
+            description: "Optionally pass the expiration date for the key in ISO 8601 fomatted string: YYYY-MM-DDTHH:MM:SSZ e.g. 2013-12-24T21:00:00Z. Defaults to infinity if not passed. UTC timezone assumed."
         end
       end
     end

data/lib/chef/knife/key_edit_base.rb

@@ -25,29 +25,29 @@ class Chef
       def self.included(includer)
         includer.class_eval do
           option :public_key,
-                 short: "-p FILENAME",
-                 long: "--public-key FILENAME",
-                 description: "Replace the public_key field from a file on disk. If not passed, the public_key field will not change."
+            short: "-p FILENAME",
+            long: "--public-key FILENAME",
+            description: "Replace the public_key field from a file on disk. If not passed, the public_key field will not change."
 
           option :create_key,
-                 short: "-c",
-                 long: "--create-key",
-                 description: "Replace the public_key field with a key generated by the server. The private key will be returned."
+            short: "-c",
+            long: "--create-key",
+            description: "Replace the public_key field with a key generated by the server. The private key will be returned."
 
           option :file,
-                 short: "-f FILE",
-                 long: "--file FILE",
-                 description: "Write the private key to a file, if you requested the server to create one via --create-key."
+            short: "-f FILE",
+            long: "--file FILE",
+            description: "Write the private key to a file, if you requested the server to create one via --create-key."
 
           option :key_name,
-                 short: "-k NAME",
-                 long: "--key-name NAME",
-                 description: "The new name for your key. Pass if you wish to update the name field of your key."
+            short: "-k NAME",
+            long: "--key-name NAME",
+            description: "The new name for your key. Pass if you wish to update the name field of your key."
 
           option :expiration_date,
-                 short: "-e DATE",
-                 long: "--expiration-date DATE",
-                 description: "Updates the expiration_date field of your key if passed. Pass in ISO 8601 fomatted string: YYYY-MM-DDTHH:MM:SSZ e.g. 2013-12-24T21:00:00Z or infinity. UTC timezone assumed."
+            short: "-e DATE",
+            long: "--expiration-date DATE",
+            description: "Updates the expiration_date field of your key if passed. Pass in ISO 8601 fomatted string: YYYY-MM-DDTHH:MM:SSZ e.g. 2013-12-24T21:00:00Z or infinity. UTC timezone assumed."
         end
       end
     end

data/lib/chef/knife/key_list.rb

@@ -70,7 +70,8 @@ class Chef
           keys.each do |key|
             next if !key["expired"] && @config[:only_expired]
             next if key["expired"] && @config[:only_non_expired]
-            display = "#{colorize(key['name'].ljust(max_length))} #{key['uri']}"
+
+            display = "#{colorize(key["name"].ljust(max_length))} #{key["uri"]}"
             display = "#{display} (expired)" if key["expired"]
             display_info(display)
           end
@@ -78,6 +79,7 @@ class Chef
           keys.each do |key|
             next if !key["expired"] && @config[:only_expired]
             next if key["expired"] && @config[:only_non_expired]
+
             display_info(key["name"])
           end
         end

data/lib/chef/knife/key_list_base.rb

@@ -25,19 +25,19 @@ class Chef
       def self.included(includer)
         includer.class_eval do
           option :with_details,
-                 short: "-w",
-                 long: "--with-details",
-                 description: "Show corresponding URIs and whether the key has expired or not."
+            short: "-w",
+            long: "--with-details",
+            description: "Show corresponding URIs and whether the key has expired or not."
 
           option :only_expired,
-                 short: "-e",
-                 long: "--only-expired",
-                 description: "Only show expired keys."
+            short: "-e",
+            long: "--only-expired",
+            description: "Only show expired keys."
 
           option :only_non_expired,
-                 short: "-n",
-                 long: "--only-non-expired",
-                 description: "Only show non-expired keys."
+            short: "-n",
+            long: "--only-non-expired",
+            description: "Only show non-expired keys."
         end
       end
     end

data/lib/chef/knife/list.rb

@@ -77,7 +77,7 @@ class Chef
 
         # Process directories
         if !config[:bare_directories]
-          dir_results = parallelize(all_results.select { |result| result.dir? }) do |result|
+          dir_results = parallelize(all_results.select(&:dir?)) do |result|
             add_dir_result(result)
           end.flatten(1)
 
@@ -97,7 +97,7 @@ class Chef
         end
 
         # Sort by path for happy output
-        results = results.sort_by { |result| result.path }
+        results = results.sort_by(&:path)
         dir_results = dir_results.sort_by { |result| result[0].path }
 
         # Print!
@@ -123,7 +123,7 @@ class Chef
 
       def add_dir_result(result)
         begin
-          children = result.children.sort_by { |child| child.name }
+          children = result.children.sort_by(&:name)
         rescue Chef::ChefFS::FileSystem::NotFoundError => e
           ui.error "#{format_path(e.entry)}: No such file or directory"
           return []
@@ -131,7 +131,7 @@ class Chef
 
         result = [ [ result, children ] ]
         if config[:recursive]
-          child_dirs = children.select { |child| child.dir? }
+          child_dirs = children.select(&:dir?)
           result += parallelize(child_dirs) { |child| add_dir_result(child) }.flatten(1).to_a
         end
         result
@@ -144,7 +144,7 @@ class Chef
       def print_results(results, indent)
         return if results.length == 0
 
-        print_space = results.map { |result| result.length }.max + 2
+        print_space = results.map(&:length).max + 2
         if config[:one_column] || !stdout.isatty
           columns = 0
         else

data/lib/chef/knife/node_bulk_delete.rb

@@ -40,6 +40,7 @@ class Chef
 
         all_nodes.each do |name, node|
           next unless name =~ matcher
+
           nodes_to_delete[name] = node
         end
 

data/lib/chef/knife/node_edit.rb

@@ -46,7 +46,7 @@ class Chef
 
         updated_node = node_editor.edit_node
         if updated_values = node_editor.updated?
-          ui.info "Saving updated #{updated_values.join(', ')} on node #{node.name}"
+          ui.info "Saving updated #{updated_values.join(", ")} on node #{node.name}"
           updated_node.save
         else
           ui.info "Node not updated, skipping node save"

data/lib/chef/knife/node_environment_set.rb

@@ -44,8 +44,7 @@ class Chef
 
         node.save
 
-        config[:attribute] = "chef_environment"
-
+        config[:environment] = @environment
         output(format_for_display(node))
       end
 

data/lib/chef/knife/node_run_list_add.rb

@@ -44,11 +44,11 @@ class Chef
         if @name_args.size > 2
           # 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
 
         if config[:after] && config[:before]

data/lib/chef/knife/node_run_list_remove.rb

@@ -35,11 +35,11 @@ class Chef
         if @name_args.size > 2
           # 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
 
         # iterate over the list of things to remove,

data/lib/chef/knife/node_run_list_set.rb

@@ -37,11 +37,11 @@ class Chef
         elsif @name_args.size > 2
           # 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
         node = Chef::Node.load(@name_args[0])
 

data/lib/chef/knife/null.rb

@@ -6,8 +6,7 @@ class Chef
       # setting the category to deprecated keeps it out of help
       category "deprecated"
 
-      def run
-      end
+      def run; end
     end
   end
 end

data/lib/chef/knife/role_bulk_delete.rb

@@ -41,6 +41,7 @@ class Chef
         roles_to_delete = {}
         all_roles.each do |name, role|
           next unless name =~ matcher
+
           roles_to_delete[role.name] = role
         end
 

data/lib/chef/knife/role_env_run_list_add.rb

@@ -69,11 +69,11 @@ class Chef
         if @name_args.size > 2
           # Check for nested lists and create a single plain one
           entries = @name_args[2..-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[2].split(",").map { |e| e.strip }
+          entries = @name_args[2].split(",").map(&:strip)
         end
 
         add_to_env_run_list(role, environment, entries, config[:after])

data/lib/chef/knife/role_env_run_list_set.rb

@@ -52,11 +52,11 @@ class Chef
         elsif @name_args.size > 2
           # Check for nested lists and create a single plain one
           entries = @name_args[2..-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[2].split(",").map { |e| e.strip }
+          entries = @name_args[2].split(",").map(&:strip)
         end
 
         set_env_run_list(role, environment, entries )