chef 14.2.0 → 14.3.37

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

@@ -24,7 +24,7 @@ class Chef
       # for the given command.
       #
       class HashedCommandLoader < Chef::Knife::SubcommandLoader
-        KEY = "_autogenerated_command_paths"
+        KEY = "_autogenerated_command_paths".freeze
 
         attr_accessor :manifest
         def initialize(chef_config_dir, plugin_manifest)

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

@@ -32,18 +32,18 @@ class Chef
         def self.included(includer)
           includer.class_eval do
             option :medium_output,
-              :short   => "-m",
-              :long    => "--medium",
-              :boolean => true,
-              :default => false,
-              :description => "Include normal attributes in the output"
+              short: "-m",
+              long: "--medium",
+              boolean: true,
+              default: false,
+              description: "Include normal attributes in the output"
 
             option :long_output,
-              :short   => "-l",
-              :long    => "--long",
-              :boolean => true,
-              :default => false,
-              :description => "Include all attributes in the output"
+              short: "-l",
+              long: "--long",
+              boolean: true,
+              default: false,
+              description: "Include all attributes in the output"
           end
         end
       end
@@ -98,49 +98,49 @@ class Chef
             # 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)}
+            summarized = <<~SUMMARY
+              #{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}
+              summarized << <<~POLICY
+                #{key('Policy Name:')}  #{node.policy_name}
+                #{key('Policy Group:')} #{node.policy_group}
 POLICY
             else
-              summarized << <<-ENV
-#{key('Environment:')} #{node.chef_environment}
+              summarized << <<~ENV
+                #{key('Environment:')} #{node.chef_environment}
 ENV
             end
-            summarized << <<-SUMMARY
-#{key('FQDN:')}        #{node[:fqdn]}
-#{key('IP:')}          #{ip}
-#{key('Run List:')}    #{node.run_list}
+            summarized << <<~SUMMARY
+              #{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(', ')}
+              summarized << <<~ROLES
+                #{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(', ')}
+            summarized << <<~SUMMARY
+              #{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:')}
-#{text_format(node.normal_attrs)}
+              summarized += <<~MORE
+                #{key('Attributes:')}
+                #{text_format(node.normal_attrs)}
 MORE
             end
             if config[:long_output]
-              summarized += <<-MOST
-#{key('Default Attributes:')}
-#{text_format(node.default_attrs)}
-#{key('Override Attributes:')}
-#{text_format(node.override_attrs)}
-#{key('Automatic Attributes (Ohai Data):')}
-#{text_format(node.automatic_attrs)}
+              summarized += <<~MOST
+                #{key('Default Attributes:')}
+                #{text_format(node.default_attrs)}
+                #{key('Override Attributes:')}
+                #{text_format(node.override_attrs)}
+                #{key('Automatic Attributes (Ohai Data):')}
+                #{text_format(node.automatic_attrs)}
 MOST
             end
             summarized

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

@@ -32,18 +32,18 @@ class Chef
         def self.included(includer)
           includer.class_eval do
             option :medium_output,
-              :short   => "-m",
-              :long    => "--medium",
-              :boolean => true,
-              :default => false,
-              :description => "Include normal attributes in the output"
+              short: "-m",
+              long: "--medium",
+              boolean: true,
+              default: false,
+              description: "Include normal attributes in the output"
 
             option :long_output,
-              :short   => "-l",
-              :long    => "--long",
-              :boolean => true,
-              :default => false,
-              :description => "Include all attributes in the output"
+              short: "-l",
+              long: "--long",
+              boolean: true,
+              default: false,
+              description: "Include all attributes in the output"
           end
         end
       end
@@ -101,7 +101,7 @@ class Chef
             fqdn = (node[:ec2] && node[:ec2][:public_hostname]) || node[:fqdn]
             name = node["name"] || node.name
 
-            run_list = "#{node['run_list']}" if config[:run_list]
+            run_list = (node["run_list"]).to_s if config[:run_list]
             line_parts = Array.new
 
             if node["ohai_time"]

data/lib/chef/knife/data_bag_from_file.rb

@@ -38,9 +38,9 @@ class Chef
       category "data bag"
 
       option :all,
-        :short => "-a",
-        :long  => "--all",
-        :description => "Upload all data bags or all items for specified data bags"
+        short: "-a",
+        long: "--all",
+        description: "Upload all data bags or all items for specified data bags"
 
       def loader
         @loader ||= Knife::Core::ObjectLoader.new(DataBagItem, ui)
@@ -84,7 +84,7 @@ class Chef
         items ||= find_all_data_bag_items(data_bag)
         item_paths = normalize_item_paths(items)
         item_paths.each do |item_path|
-          item = loader.load_from("#{data_bags_path}", data_bag, item_path)
+          item = loader.load_from((data_bags_path).to_s, data_bag, item_path)
           item = if encryption_secret_provided?
                    Chef::EncryptedDataBagItem.encrypt_data_bag_item(item, read_secret)
                  else

data/lib/chef/knife/data_bag_list.rb

@@ -30,9 +30,9 @@ class Chef
       category "data bag"
 
       option :with_uri,
-        :short => "-w",
-        :long => "--with-uri",
-        :description => "Show corresponding URIs"
+        short: "-w",
+        long: "--with-uri",
+        description: "Show corresponding URIs"
 
       def run
         output(format_list_for_display(Chef::DataBag.list))

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'",
+               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) }
+               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?
@@ -118,7 +118,7 @@ class Chef
       end
 
       def has_cl_secret?
-        Chef::Config[:knife].has_key?(:cl_secret)
+        Chef::Config[:knife].key?(:cl_secret)
       end
 
       def self.set_cl_secret(s)
@@ -126,7 +126,7 @@ class Chef
       end
 
       def has_cl_secret_file?
-        Chef::Config[:knife].has_key?(:cl_secret_file)
+        Chef::Config[:knife].key?(:cl_secret_file)
       end
 
       def self.set_cl_secret_file(sf)

data/lib/chef/knife/delete.rb

@@ -1,3 +1,19 @@
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require "chef/chef_fs/knife"
 
 class Chef
@@ -12,21 +28,21 @@ class Chef
       end
 
       option :recurse,
-        :short => "-r",
-        :long => "--[no-]recurse",
-        :boolean => true,
-        :default => false,
-        :description => "Delete directories recursively."
+        short: "-r",
+        long: "--[no-]recurse",
+        boolean: true,
+        default: false,
+        description: "Delete directories recursively."
       option :both,
-        :long => "--both",
-        :boolean => true,
-        :default => false,
-        :description => "Delete both the local and remote copies."
+        long: "--both",
+        boolean: true,
+        default: false,
+        description: "Delete both the local and remote copies."
       option :local,
-        :long => "--local",
-        :boolean => true,
-        :default => false,
-        :description => "Delete the local copy (leave the remote copy)."
+        long: "--local",
+        boolean: true,
+        default: false,
+        description: "Delete the local copy (leave the remote copy)."
 
       def run
         if name_args.length == 0

data/lib/chef/knife/deps.rb

@@ -1,3 +1,19 @@
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require "chef/chef_fs/knife"
 
 class Chef
@@ -13,17 +29,17 @@ class Chef
       end
 
       option :recurse,
-        :long => "--[no-]recurse",
-        :boolean => true,
-        :description => "List dependencies recursively (default: true). Only works with --tree."
+        long: "--[no-]recurse",
+        boolean: true,
+        description: "List dependencies recursively (default: true). Only works with --tree."
       option :tree,
-        :long => "--tree",
-        :boolean => true,
-        :description => "Show dependencies in a visual tree. May show duplicates."
+        long: "--tree",
+        boolean: true,
+        description: "Show dependencies in a visual tree. May show duplicates."
       option :remote,
-        :long => "--remote",
-        :boolean => true,
-        :description => "List dependencies on the server instead of the local filesystem"
+        long: "--remote",
+        boolean: true,
+        description: "List dependencies on the server instead of the local filesystem"
 
       attr_accessor :exit_code
 

data/lib/chef/knife/diff.rb

@@ -1,3 +1,19 @@
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require "chef/chef_fs/knife"
 
 class Chef
@@ -12,29 +28,29 @@ class Chef
       end
 
       option :recurse,
-        :long => "--[no-]recurse",
-        :boolean => true,
-        :default => true,
-        :description => "List directories recursively."
+        long: "--[no-]recurse",
+        boolean: true,
+        default: true,
+        description: "List directories recursively."
 
       option :name_only,
-        :long => "--name-only",
-        :boolean => true,
-        :description => "Only show names of modified files."
+        long: "--name-only",
+        boolean: true,
+        description: "Only show names of modified files."
 
       option :name_status,
-        :long => "--name-status",
-        :boolean => true,
-        :description => "Only show names and statuses of modified files: Added, Deleted, Modified, and Type Changed."
+        long: "--name-status",
+        boolean: true,
+        description: "Only show names and statuses of modified files: Added, Deleted, Modified, and Type Changed."
 
       option :diff_filter,
-        :long => "--diff-filter=[(A|D|M|T)...[*]]",
-        :description => "Select only files that are Added (A), Deleted (D), Modified (M), or have their type (i.e. regular file, directory) changed (T). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if
+        long: "--diff-filter=[(A|D|M|T)...[*]]",
+        description: "Select only files that are Added (A), Deleted (D), Modified (M), or have their type (i.e. regular file, directory) changed (T). Any combination of the filter characters (including none) can be used. When * (All-or-none) is added to the combination, all paths are selected if
            there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
 
       option :cookbook_version,
-        :long => "--cookbook-version VERSION",
-        :description => "Version of cookbook to download (if there are multiple versions and cookbook_versions is false)"
+        long: "--cookbook-version VERSION",
+        description: "Version of cookbook to download (if there are multiple versions and cookbook_versions is false)"
 
       def run
         if config[:name_only]

data/lib/chef/knife/download.rb

@@ -1,3 +1,19 @@
+#
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require "chef/chef_fs/knife"
 
 class Chef
@@ -12,39 +28,39 @@ class Chef
       end
 
       option :recurse,
-        :long => "--[no-]recurse",
-        :boolean => true,
-        :default => true,
-        :description => "List directories recursively."
+        long: "--[no-]recurse",
+        boolean: true,
+        default: true,
+        description: "List directories recursively."
 
       option :purge,
-        :long => "--[no-]purge",
-        :boolean => true,
-        :default => false,
-        :description => "Delete matching local files and directories that do not exist remotely."
+        long: "--[no-]purge",
+        boolean: true,
+        default: false,
+        description: "Delete matching local files and directories that do not exist remotely."
 
       option :force,
-        :long => "--[no-]force",
-        :boolean => true,
-        :default => false,
-        :description => "Force upload of files even if they match (quicker and harmless, but doesn't print out what it changed)"
+        long: "--[no-]force",
+        boolean: true,
+        default: false,
+        description: "Force upload of files even if they match (quicker and harmless, but doesn't print out what it changed)"
 
       option :dry_run,
-        :long => "--dry-run",
-        :short => "-n",
-        :boolean => true,
-        :default => false,
-        :description => "Don't take action, only print what would happen"
+        long: "--dry-run",
+        short: "-n",
+        boolean: true,
+        default: false,
+        description: "Don't take action, only print what would happen"
 
       option :diff,
-        :long => "--[no-]diff",
-        :boolean => true,
-        :default => true,
-        :description => "Turn off to avoid uploading existing files; only new (and possibly deleted) files with --no-diff"
+        long: "--[no-]diff",
+        boolean: true,
+        default: true,
+        description: "Turn off to avoid uploading existing files; only new (and possibly deleted) files with --no-diff"
 
       option :cookbook_version,
-        :long => "--cookbook-version VERSION",
-        :description => "Version of cookbook to download (if there are multiple versions and cookbook_versions is false)"
+        long: "--cookbook-version VERSION",
+        description: "Version of cookbook to download (if there are multiple versions and cookbook_versions is false)"
 
       def run
         if name_args.length == 0