chef 14.2.0 → 14.3.37

data/lib/chef/knife/edit.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,9 +29,9 @@ class Chef
       end
 
       option :local,
-        :long => "--local",
-        :boolean => true,
-        :description => "Show local files instead of remote"
+        long: "--local",
+        boolean: true,
+        description: "Show local files instead of remote"
 
       def run
         # Get the matches (recursively)

data/lib/chef/knife/environment_compare.rb

@@ -29,16 +29,16 @@ class Chef
       banner "knife environment compare [ENVIRONMENT..] (options)"
 
       option :all,
-        :short => "-a",
-        :long => "--all",
-        :description => "Show all cookbooks",
-        :boolean => true
+        short: "-a",
+        long: "--all",
+        description: "Show all cookbooks",
+        boolean: true
 
       option :mismatch,
-        :short => "-m",
-        :long => "--mismatch",
-        :description => "Only show mismatching versions",
-        :boolean => true
+        short: "-m",
+        long: "--mismatch",
+        description: "Only show mismatching versions",
+        boolean: true
 
       def run
         # Get the commandline environments or all if none are provided.

data/lib/chef/knife/environment_create.rb

@@ -30,9 +30,9 @@ class Chef
       banner "knife environment create ENVIRONMENT (options)"
 
       option :description,
-        :short => "-d DESCRIPTION",
-        :long => "--description DESCRIPTION",
-        :description => "The environment description"
+        short: "-d DESCRIPTION",
+        long: "--description DESCRIPTION",
+        description: "The environment description"
 
       def run
         env_name = @name_args[0]

data/lib/chef/knife/environment_from_file.rb

@@ -16,6 +16,8 @@
 # limitations under the License.
 #
 
+require "chef/knife"
+
 class Chef
   class Knife
     class EnvironmentFromFile < Knife
@@ -28,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/environment_list.rb

@@ -30,9 +30,9 @@ class Chef
       banner "knife environment 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::Environment.list))

data/lib/chef/knife/exec.rb

@@ -24,15 +24,15 @@ class Chef::Knife::Exec < Chef::Knife
   banner "knife exec [SCRIPT] (options)"
 
   option :exec,
-    :short => "-E CODE",
-    :long => "--exec CODE",
-    :description => "a string of Chef code to execute"
+    short: "-E CODE",
+    long: "--exec CODE",
+    description: "a string of Chef code to execute"
 
   option :script_path,
-    :short => "-p PATH:PATH",
-    :long => "--script-path PATH:PATH",
-    :description => "A colon-separated path to look for scripts in",
-    :proc => lambda { |o| o.split(":") }
+    short: "-p PATH:PATH",
+    long: "--script-path PATH:PATH",
+    description: "A colon-separated path to look for scripts in",
+    proc: lambda { |o| o.split(":") }
 
   deps do
     require "chef/shell/ext"

data/lib/chef/knife/key_create.rb

@@ -40,10 +40,10 @@ class Chef
       end
 
       def public_key_or_key_name_error_msg
-        <<EOS
-You must pass either --public-key or --key-name, or both.
-If you only pass --public-key, a key name will be generated from the fingerprint of your key.
-If you only pass --key-name, a key pair will be generated by the server.
+        <<~EOS
+          You must pass either --public-key or --key-name, or both.
+          If you only pass --public-key, a key name will be generated from the fingerprint of your key.
+          If you only pass --key-name, a key pair will be generated by the server.
 EOS
       end
 

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.rb

@@ -41,11 +41,11 @@ class Chef
       end
 
       def public_key_and_create_key_error_msg
-        <<EOS
-You passed both --public-key and --create-key. Only pass one, or the other, or neither.
-Do not pass either if you do not want to change the public_key field of your key.
-Pass --public-key if you want to update the public_key field of your key from a specific public key.
-Pass --create-key if you want the server to generate a new key and use that to update the public_key field of your key.
+        <<~EOS
+          You passed both --public-key and --create-key. Only pass one, or the other, or neither.
+          Do not pass either if you do not want to change the public_key field of your key.
+          Pass --public-key if you want to update the public_key field of your key from a specific public key.
+          Pass --create-key if you want the server to generate a new key and use that to update the public_key field of your key.
 EOS
       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

@@ -40,9 +40,9 @@ class Chef
       end
 
       def expired_and_non_expired_msg
-        <<EOS
-You cannot pass both --only-expired and --only-non-expired.
-Please pass one or none.
+        <<~EOS
+          You cannot pass both --only-expired and --only-non-expired.
+          Please pass one or none.
 EOS
       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

@@ -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,30 +29,30 @@ class Chef
       end
 
       option :recursive,
-        :short => "-R",
-        :boolean => true,
-        :description => "List directories recursively"
+        short: "-R",
+        boolean: true,
+        description: "List directories recursively"
       option :bare_directories,
-        :short => "-d",
-        :boolean => true,
-        :description => "When directories match the pattern, do not show the directories' children"
+        short: "-d",
+        boolean: true,
+        description: "When directories match the pattern, do not show the directories' children"
       option :local,
-        :long => "--local",
-        :boolean => true,
-        :description => "List local directory instead of remote"
+        long: "--local",
+        boolean: true,
+        description: "List local directory instead of remote"
       option :flat,
-        :short => "-f",
-        :long => "--flat",
-        :boolean => true,
-        :description => "Show a list of filenames rather than the prettified ls-like output normally produced"
+        short: "-f",
+        long: "--flat",
+        boolean: true,
+        description: "Show a list of filenames rather than the prettified ls-like output normally produced"
       option :one_column,
-        :short => "-1",
-        :boolean => true,
-        :description => "Show only one column of results"
+        short: "-1",
+        boolean: true,
+        description: "Show only one column of results"
       option :trailing_slashes,
-        :short => "-p",
-        :boolean => true,
-        :description => "Show trailing slashes after directories"
+        short: "-p",
+        boolean: true,
+        description: "Show trailing slashes after directories"
 
       attr_accessor :exit_code
 

data/lib/chef/knife/node_edit.rb

@@ -32,10 +32,10 @@ class Chef
       banner "knife node edit NODE (options)"
 
       option :all_attributes,
-        :short => "-a",
-        :long => "--all",
-        :boolean => true,
-        :description => "Display all attributes when editing"
+        short: "-a",
+        long: "--all",
+        boolean: true,
+        description: "Display all attributes when editing"
 
       def run
         if node_name.nil?

data/lib/chef/knife/node_list.rb

@@ -30,9 +30,9 @@ class Chef
       banner "knife node 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
         env = Chef::Config[:environment]

data/lib/chef/knife/node_run_list_add.rb

@@ -30,14 +30,14 @@ class Chef
       banner "knife node run_list add [NODE] [ENTRY [ENTRY]] (options)"
 
       option :after,
-        :short => "-a ITEM",
-        :long  => "--after ITEM",
-        :description => "Place the ENTRY in the run list after ITEM"
+        short: "-a ITEM",
+        long: "--after ITEM",
+        description: "Place the ENTRY in the run list after ITEM"
 
       option :before,
-             :short => "-b ITEM",
-             :long  => "--before ITEM",
-             :description => "Place the ENTRY in the run list before ITEM"
+             short: "-b ITEM",
+             long: "--before ITEM",
+             description: "Place the ENTRY in the run list before ITEM"
 
       def run
         node = Chef::Node.load(@name_args[0])

data/lib/chef/knife/node_show.rb

@@ -34,14 +34,14 @@ class Chef
       banner "knife node show NODE (options)"
 
       option :run_list,
-        :short => "-r",
-        :long => "--run-list",
-        :description => "Show only the run list"
+        short: "-r",
+        long: "--run-list",
+        description: "Show only the run list"
 
       option :environment,
-        :short        => "-E",
-        :long         => "--environment",
-        :description  => "Show only the Chef environment"
+        short: "-E",
+        long: "--environment",
+        description: "Show only the Chef environment"
 
       def run
         ui.use_presenter Knife::Core::NodePresenter

data/lib/chef/knife/osc_user_create.rb

@@ -32,25 +32,25 @@ class Chef
       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"
 
       option :admin,
-        :short => "-a",
-        :long  => "--admin",
-        :description => "Create the user as an admin",
-        :boolean => true
+        short: "-a",
+        long: "--admin",
+        description: "Create the user as an admin",
+        boolean: true
 
       option :user_password,
-        :short => "-p PASSWORD",
-        :long => "--password PASSWORD",
-        :description => "Password for newly created user",
-        :default => ""
+        short: "-p PASSWORD",
+        long: "--password PASSWORD",
+        description: "Password for newly created user",
+        default: ""
 
       option :user_key,
-        :long => "--user-key FILENAME",
-        :description => "Public key for newly created user. By default a key will be created for you."
+        long: "--user-key FILENAME",
+        description: "Public key for newly created user. By default a key will be created for you."
 
       banner "knife osc_user create USER (options)"