chef 14.2.0-universal-mingw32 → 14.3.37-universal-mingw32

data/lib/chef/knife/ssl_check.rb

@@ -151,25 +151,25 @@ class Chef
         debug_ssl_settings
         debug_chef_ssl_config
 
-        ui.warn(<<-BAD_CERTS)
-There are invalid certificates in your trusted_certs_dir.
-OpenSSL will not use the following certificates when verifying SSL connections:
+        ui.warn(<<~BAD_CERTS)
+          There are invalid certificates in your trusted_certs_dir.
+          OpenSSL will not use the following certificates when verifying SSL connections:
 
-#{cert_debug_msg}
+          #{cert_debug_msg}
 
-#{ui.color("TO FIX THESE WARNINGS:", :bold)}
+          #{ui.color("TO FIX THESE WARNINGS:", :bold)}
 
-We are working on documentation for resolving common issues uncovered here.
+          We are working on documentation for resolving common issues uncovered here.
 
-* If the certificate is generated by the server, you may try redownloading the
-server's certificate. By default, the certificate is stored in the following
-location on the host where your chef-server runs:
+          * If the certificate is generated by the server, you may try redownloading the
+          server's certificate. By default, the certificate is stored in the following
+          location on the host where your chef-server runs:
 
-  /var/opt/opscode/nginx/ca/SERVER_HOSTNAME.crt
+            /var/opt/opscode/nginx/ca/SERVER_HOSTNAME.crt
 
-Copy that file to your trusted_certs_dir (currently: #{configuration.trusted_certs_dir})
-using SSH/SCP or some other secure method, then re-run this command to confirm
-that the server's certificate is now trusted.
+          Copy that file to your trusted_certs_dir (currently: #{configuration.trusted_certs_dir})
+          using SSH/SCP or some other secure method, then re-run this command to confirm
+          that the server's certificate is now trusted.
 
 BAD_CERTS
         # @TODO: ^ needs URL once documentation is posted.
@@ -184,21 +184,21 @@ BAD_CERTS
         debug_ssl_settings
         debug_chef_ssl_config
 
-        ui.err(<<-ADVICE)
+        ui.err(<<~ADVICE)
 
-#{ui.color("TO FIX THIS ERROR:", :bold)}
+          #{ui.color("TO FIX THIS ERROR:", :bold)}
 
-If the server you are connecting to uses a self-signed certificate, you must
-configure chef to trust that server's certificate.
+          If the server you are connecting to uses a self-signed certificate, you must
+          configure chef to trust that server's certificate.
 
-By default, the certificate is stored in the following location on the host
-where your chef-server runs:
+          By default, the certificate is stored in the following location on the host
+          where your chef-server runs:
 
-  /var/opt/opscode/nginx/ca/SERVER_HOSTNAME.crt
+            /var/opt/opscode/nginx/ca/SERVER_HOSTNAME.crt
 
-Copy that file to your trusted_certs_dir (currently: #{configuration.trusted_certs_dir})
-using SSH/SCP or some other secure method, then re-run this command to confirm
-that the server's certificate is now trusted.
+          Copy that file to your trusted_certs_dir (currently: #{configuration.trusted_certs_dir})
+          using SSH/SCP or some other secure method, then re-run this command to confirm
+          that the server's certificate is now trusted.
 
 ADVICE
       end
@@ -211,17 +211,17 @@ ADVICE
 
         ui.error("You are attempting to connect to:   '#{host}'")
         ui.error("The server's certificate belongs to '#{cn}'")
-        ui.err(<<-ADVICE)
+        ui.err(<<~ADVICE)
 
-#{ui.color("TO FIX THIS ERROR:", :bold)}
+          #{ui.color("TO FIX THIS ERROR:", :bold)}
 
-The solution for this issue depends on your networking configuration. If you
-are able to connect to this server using the hostname #{cn}
-instead of #{host}, then you can resolve this issue by updating chef_server_url
-in your configuration file.
+          The solution for this issue depends on your networking configuration. If you
+          are able to connect to this server using the hostname #{cn}
+          instead of #{host}, then you can resolve this issue by updating chef_server_url
+          in your configuration file.
 
-If you are not able to connect to the server using the hostname #{cn}
-you will have to update the certificate on the server to use the correct hostname.
+          If you are not able to connect to the server using the hostname #{cn}
+          you will have to update the certificate on the server to use the correct hostname.
 ADVICE
       end
 

data/lib/chef/knife/ssl_fetch.rb

@@ -130,12 +130,12 @@ class Chef
 
       def run
         validate_uri
-        ui.warn(<<-TRUST_TRUST)
-Certificates from #{host} will be fetched and placed in your trusted_cert
-directory (#{trusted_certs_dir}).
+        ui.warn(<<~TRUST_TRUST)
+          Certificates from #{host} will be fetched and placed in your trusted_cert
+          directory (#{trusted_certs_dir}).
 
-Knife has no means to verify these are the correct certificates. You should
-verify the authenticity of these certificates after downloading.
+          Knife has no means to verify these are the correct certificates. You should
+          verify the authenticity of these certificates after downloading.
 
 TRUST_TRUST
         remote_cert_chain.each do |cert|

data/lib/chef/knife/status.rb

@@ -32,23 +32,23 @@ class Chef
       banner "knife status QUERY (options)"
 
       option :run_list,
-        :short => "-r",
-        :long => "--run-list",
-        :description => "Show the run list"
+        short: "-r",
+        long: "--run-list",
+        description: "Show the run list"
 
       option :sort_reverse,
-        :short => "-s",
-        :long => "--sort-reverse",
-        :description => "Sort the status list by last run time descending"
+        short: "-s",
+        long: "--sort-reverse",
+        description: "Sort the status list by last run time descending"
 
       option :hide_healthy,
-        :short => "-H",
-        :long => "--hide-healthy",
-        :description => "Hide nodes that have run chef in the last hour. [DEPRECATED] Use --hide-by-mins MINS instead"
+        short: "-H",
+        long: "--hide-healthy",
+        description: "Hide nodes that have run chef in the last hour. [DEPRECATED] Use --hide-by-mins MINS instead"
 
       option :hide_by_mins,
-        :long => "--hide-by-mins MINS",
-        :description => "Hide nodes that have run chef in the last MINS minutes"
+        long: "--hide-by-mins MINS",
+        description: "Hide nodes that have run chef in the last MINS minutes"
 
       def append_to_query(term)
         @query << " AND " unless @query.empty?

data/lib/chef/knife/upload.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,41 +28,41 @@ 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 for many files). Will overwrite frozen cookbooks."
+        long: "--[no-]force",
+        boolean: true,
+        default: false,
+        description: "Force upload of files even if they match (quicker for many files). Will overwrite frozen cookbooks."
 
       option :freeze,
-        :long => "--[no-]freeze",
-        :boolean => true,
-        :default => false,
-        :description => "Freeze cookbooks that get uploaded."
+        long: "--[no-]freeze",
+        boolean: true,
+        default: false,
+        description: "Freeze cookbooks that get uploaded."
 
       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"
 
       def run
         if name_args.length == 0

data/lib/chef/knife/user_create.rb

@@ -32,31 +32,31 @@ class Chef
       end
 
       option :file,
-        :short => "-f FILE",
-        :long  => "--file FILE",
-        :description => "Write the private key to a file if the server generated one."
+        short: "-f FILE",
+        long: "--file FILE",
+        description: "Write the private key to a file if the server generated one."
 
       option :user_key,
-        :long => "--user-key FILENAME",
-        :description => "Set the initial default key for the user from a file on disk (cannot pass with --prevent-keygen)."
+        long: "--user-key FILENAME",
+        description: "Set the initial default key for the user from a file on disk (cannot pass with --prevent-keygen)."
 
       option :prevent_keygen,
-        :short => "-k",
-        :long  => "--prevent-keygen",
-        :description => "API V1 (Chef Server 12.1+) only. Prevent server from generating a default key pair for you. Cannot be passed with --user-key.",
-        :boolean => true
+        short: "-k",
+        long: "--prevent-keygen",
+        description: "API V1 (Chef Server 12.1+) only. Prevent server from generating a default key pair for you. Cannot be passed with --user-key.",
+        boolean: true
 
       option :admin,
-        :short => "-a",
-        :long  => "--admin",
-        :description => "DEPRECATED: Open Source Chef 11 only. Create the user as an admin.",
-        :boolean => true
+        short: "-a",
+        long: "--admin",
+        description: "DEPRECATED: Open Source Chef 11 only. Create the user as an admin.",
+        boolean: true
 
       option :user_password,
-        :short => "-p PASSWORD",
-        :long => "--password PASSWORD",
-        :description => "DEPRECATED: Open Source Chef 11 only. Password for newly created user.",
-        :default => ""
+        short: "-p PASSWORD",
+        long: "--password PASSWORD",
+        description: "DEPRECATED: Open Source Chef 11 only. Password for newly created user.",
+        default: ""
 
       banner "knife user create USERNAME DISPLAY_NAME FIRST_NAME LAST_NAME EMAIL PASSWORD (options)"
 
@@ -69,17 +69,17 @@ class Chef
       end
 
       def osc_11_warning
-        <<-EOF
-IF YOU ARE USING CHEF SERVER 12+, PLEASE FOLLOW THE INSTRUCTIONS UNDER knife user create --help.
-You only passed a single argument to knife user create.
-For backwards compatibility, when only a single argument is passed,
-knife user create assumes you want Open Source 11 Server user creation.
-knife user create for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife osc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user create.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
-NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
-in Chef 15 which will be released April 2019.
+        <<~EOF
+          IF YOU ARE USING CHEF SERVER 12+, PLEASE FOLLOW THE INSTRUCTIONS UNDER knife user create --help.
+          You only passed a single argument to knife user create.
+          For backwards compatibility, when only a single argument is passed,
+          knife user create assumes you want Open Source 11 Server user creation.
+          knife user create for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife osc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user create.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 

data/lib/chef/knife/user_delete.rb

@@ -30,15 +30,15 @@ class Chef
       banner "knife user delete USER (options)"
 
       def osc_11_warning
-        <<-EOF
-The Chef Server you are using does not support the username field.
-This means it is an Open Source 11 Server.
-knife user delete for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife osc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user delete.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
-NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
-in Chef 15 which will be released April 2019.
+        <<~EOF
+          The Chef Server you are using does not support the username field.
+          This means it is an Open Source 11 Server.
+          knife user delete for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife osc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user delete.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 

data/lib/chef/knife/user_edit.rb

@@ -30,15 +30,15 @@ class Chef
       banner "knife user edit USER (options)"
 
       def osc_11_warning
-        <<-EOF
-The Chef Server you are using does not support the username field.
-This means it is an Open Source 11 Server.
-knife user edit for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife oc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user edit.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
-NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
-in Chef 15 which will be released April 2019.
+        <<~EOF
+          The Chef Server you are using does not support the username field.
+          This means it is an Open Source 11 Server.
+          knife user edit for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife oc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user edit.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 

data/lib/chef/knife/user_list.rb

@@ -32,9 +32,9 @@ class Chef
       banner "knife user list (options)"
 
       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::UserV1.list))

data/lib/chef/knife/user_reregister.rb

@@ -30,15 +30,15 @@ class Chef
       banner "knife user reregister USER (options)"
 
       def osc_11_warning
-        <<-EOF
-The Chef Server you are using does not support the username field.
-This means it is an Open Source 11 Server.
-knife user reregister for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife osc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user reregister.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
-NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
-in Chef 15 which will be released April 2019.
+        <<~EOF
+          The Chef Server you are using does not support the username field.
+          This means it is an Open Source 11 Server.
+          knife user reregister for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife osc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user reregister.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 
@@ -50,9 +50,9 @@ EOF
       end
 
       option :file,
-        :short => "-f FILE",
-        :long  => "--file FILE",
-        :description => "Write the private key to a file"
+        short: "-f FILE",
+        long: "--file FILE",
+        description: "Write the private key to a file"
 
       def run
         @user_name = @name_args[0]

data/lib/chef/knife/user_show.rb

@@ -32,15 +32,15 @@ class Chef
       banner "knife user show USER (options)"
 
       def osc_11_warning
-        <<-EOF
-The Chef Server you are using does not support the username field.
-This means it is an Open Source 11 Server.
-knife user show for Open Source 11 Server is being deprecated.
-Open Source 11 Server user commands now live under the knife osc_user namespace.
-For backwards compatibility, we will forward this request to knife osc_user show.
-If you are using an Open Source 11 Server, please use that command to avoid this warning.
-NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
-in Chef 15 which will be released April 2019.
+        <<~EOF
+          The Chef Server you are using does not support the username field.
+          This means it is an Open Source 11 Server.
+          knife user show for Open Source 11 Server is being deprecated.
+          Open Source 11 Server user commands now live under the knife osc_user namespace.
+          For backwards compatibility, we will forward this request to knife osc_user show.
+          If you are using an Open Source 11 Server, please use that command to avoid this warning.
+          NOTE: Backwards compatibility for Open Source 11 Server in these commands will be removed
+          in Chef 15 which will be released April 2019.
 EOF
       end
 

data/lib/chef/knife/xargs.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
@@ -14,61 +30,61 @@ class Chef
 
       # TODO modify to remote-only / local-only pattern (more like delete)
       option :local,
-        :long => "--local",
-        :boolean => true,
-        :description => "Xargs local files instead of remote"
+        long: "--local",
+        boolean: true,
+        description: "Xargs local files instead of remote"
 
       option :patterns,
-        :long => "--pattern [PATTERN]",
-        :short => "-p [PATTERN]",
-        :description => "Pattern on command line (if these are not specified, a list of patterns is expected on standard input). Multiple patterns may be passed in this way.",
-        :arg_arity => [1, -1]
+        long: "--pattern [PATTERN]",
+        short: "-p [PATTERN]",
+        description: "Pattern on command line (if these are not specified, a list of patterns is expected on standard input). Multiple patterns may be passed in this way.",
+        arg_arity: [1, -1]
 
       option :diff,
-        :long => "--[no-]diff",
-        :default => true,
-        :boolean => true,
-        :description => "Whether to show a diff when files change (default: true)"
+        long: "--[no-]diff",
+        default: true,
+        boolean: true,
+        description: "Whether to show a diff when files change (default: true)"
 
       option :dry_run,
-        :long => "--dry-run",
-        :boolean => true,
-        :description => "Prevents changes from actually being uploaded to the server."
+        long: "--dry-run",
+        boolean: true,
+        description: "Prevents changes from actually being uploaded to the server."
 
       option :force,
-        :long => "--[no-]force",
-        :boolean => true,
-        :default => false,
-        :description => "Force upload of files even if they are not changed (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 are not changed (quicker and harmless, but doesn't print out what it changed)"
 
       option :replace_first,
-        :long => "--replace-first REPLACESTR",
-        :short => "-J REPLACESTR",
-        :description => "String to replace with filenames. -J will only replace the FIRST occurrence of the replacement string."
+        long: "--replace-first REPLACESTR",
+        short: "-J REPLACESTR",
+        description: "String to replace with filenames. -J will only replace the FIRST occurrence of the replacement string."
 
       option :replace_all,
-        :long => "--replace REPLACESTR",
-        :short => "-I REPLACESTR",
-        :description => "String to replace with filenames. -I will replace ALL occurrence of the replacement string."
+        long: "--replace REPLACESTR",
+        short: "-I REPLACESTR",
+        description: "String to replace with filenames. -I will replace ALL occurrence of the replacement string."
 
       option :max_arguments_per_command,
-        :long => "--max-args MAXARGS",
-        :short => "-n MAXARGS",
-        :description => "Maximum number of arguments per command line."
+        long: "--max-args MAXARGS",
+        short: "-n MAXARGS",
+        description: "Maximum number of arguments per command line."
 
       option :max_command_line,
-        :long => "--max-chars LENGTH",
-        :short => "-s LENGTH",
-        :description => "Maximum size of command line, in characters"
+        long: "--max-chars LENGTH",
+        short: "-s LENGTH",
+        description: "Maximum size of command line, in characters"
 
       option :verbose_commands,
-        :short => "-t",
-        :description => "Print command to be run on the command line"
+        short: "-t",
+        description: "Print command to be run on the command line"
 
       option :null_separator,
-        :short => "-0",
-        :boolean => true,
-        :description => "Use the NULL character (\0) as a separator, instead of whitespace"
+        short: "-0",
+        boolean: true,
+        description: "Use the NULL character (\0) as a separator, instead of whitespace"
 
       def run
         error = false
@@ -159,7 +175,7 @@ class Chef
           # Create the temporary files
           files.each do |file|
             tempfile = Tempfile.new(file.name)
-            tempfiles[tempfile] = { :file => file }
+            tempfiles[tempfile] = { file: file }
           end
         rescue
           destroy_tempfiles(files)