chef 14.2.0 → 14.3.37

data/lib/chef/knife/osc_user_list.rb

@@ -35,9 +35,9 @@ class Chef
       banner "knife osc_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::User.list))

data/lib/chef/knife/osc_user_reregister.rb

@@ -35,9 +35,9 @@ class Chef
       banner "knife osc_user reregister USER (options)"
 
       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/raw.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/knife"
 require "chef/http"
 
@@ -17,27 +33,27 @@ class Chef
       end
 
       option :method,
-        :long => "--method METHOD",
-        :short => "-m METHOD",
-        :default => "GET",
-        :description => "Request method (GET, POST, PUT or DELETE). Default: GET"
+        long: "--method METHOD",
+        short: "-m METHOD",
+        default: "GET",
+        description: "Request method (GET, POST, PUT or DELETE). Default: GET"
 
       option :pretty,
-        :long => "--[no-]pretty",
-        :boolean => true,
-        :default => true,
-        :description => "Pretty-print JSON output. Default: true"
+        long: "--[no-]pretty",
+        boolean: true,
+        default: true,
+        description: "Pretty-print JSON output. Default: true"
 
       option :input,
-        :long => "--input FILE",
-        :short => "-i FILE",
-        :description => "Name of file to use for PUT or POST"
+        long: "--input FILE",
+        short: "-i FILE",
+        description: "Name of file to use for PUT or POST"
 
       option :proxy_auth,
-        :long => "--proxy-auth",
-        :boolean => true,
-        :default => false,
-        :description => "Use webui proxy authentication. Client key must be the webui key."
+        long: "--proxy-auth",
+        boolean: true,
+        default: false,
+        description: "Use webui proxy authentication. Client key must be the webui key."
 
       # We need a custom HTTP client class here because we don't want to even
       # try to decode the body, in case we get back corrupted JSON or whatnot.
@@ -89,7 +105,7 @@ class Chef
               result = Chef::JSONCompat.to_json_pretty(result)
             end
           else
-            chef_rest = RawInputServerAPI.new(:raw_output => true)
+            chef_rest = RawInputServerAPI.new(raw_output: true)
             result = chef_rest.request(method, name_args[0], headers, data)
           end
           output result

data/lib/chef/knife/role_create.rb

@@ -30,9 +30,9 @@ class Chef
       banner "knife role create ROLE (options)"
 
       option :description,
-        :short => "-d DESC",
-        :long => "--description DESC",
-        :description => "The role description"
+        short: "-d DESC",
+        long: "--description DESC",
+        description: "The role description"
 
       def run
         @role_name = @name_args[0]

data/lib/chef/knife/role_env_run_list_add.rb

@@ -1,3 +1,4 @@
+#
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: William Albenzi (<walbenzi@gmail.com>)
 # Copyright:: Copyright 2009-2016, Chef Software Inc.
@@ -30,9 +31,9 @@ class Chef
       banner "knife role env_run_list add [ROLE] [ENVIRONMENT] [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"
 
       def add_to_env_run_list(role, environment, entries, after = nil)
         if after

data/lib/chef/knife/role_env_run_list_remove.rb

@@ -33,9 +33,9 @@ class Chef
         nlist = []
         role.run_list_for(environment).each do |entry|
           nlist << entry unless entry == item_to_remove
-          #unless entry == @name_args[2]
+          # unless entry == @name_args[2]
           #  nlist << entry
-          #end
+          # end
         end
         role.env_run_lists_add(environment => nlist)
       end

data/lib/chef/knife/role_env_run_list_replace.rb

@@ -1,3 +1,4 @@
+#
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: William Albenzi (<walbenzi@gmail.com>)
 # Copyright:: Copyright 2009-2016, Chef Software Inc.

data/lib/chef/knife/role_list.rb

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

data/lib/chef/knife/role_run_list_add.rb

@@ -1,3 +1,4 @@
+#
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: William Albenzi (<walbenzi@gmail.com>)
 # Copyright:: Copyright 2009-2016, Chef Software Inc.
@@ -30,9 +31,9 @@ class Chef
       banner "knife role run_list add [ROLE] [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"
 
       def add_to_env_run_list(role, environment, entries, after = nil)
         if after

data/lib/chef/knife/role_run_list_remove.rb

@@ -33,9 +33,9 @@ class Chef
         nlist = []
         role.run_list_for(environment).each do |entry|
           nlist << entry unless entry == item_to_remove
-          #unless entry == @name_args[2]
+          # unless entry == @name_args[2]
           #  nlist << entry
-          #end
+          # end
         end
         role.env_run_lists_add(environment => nlist)
       end

data/lib/chef/knife/role_run_list_replace.rb

@@ -1,3 +1,4 @@
+#
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: William Albenzi (<walbenzi@gmail.com>)
 # Copyright:: Copyright 2009-2016, Chef Software Inc.

data/lib/chef/knife/search.rb

@@ -38,38 +38,38 @@ class Chef
       banner "knife search INDEX QUERY (options)"
 
       option :start,
-        :short => "-b ROW",
-        :long => "--start ROW",
-        :description => "The row to start returning results at",
-        :default => 0,
-        :proc => lambda { |i| i.to_i }
+        short: "-b ROW",
+        long: "--start ROW",
+        description: "The row to start returning results at",
+        default: 0,
+        proc: lambda { |i| i.to_i }
 
       option :rows,
-        :short => "-R INT",
-        :long => "--rows INT",
-        :description => "The number of rows to return",
-        :default => nil,
-        :proc => lambda { |i| i.to_i }
+        short: "-R INT",
+        long: "--rows INT",
+        description: "The number of rows to return",
+        default: nil,
+        proc: lambda { |i| i.to_i }
 
       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 :id_only,
-        :short => "-i",
-        :long => "--id-only",
-        :description => "Show only the ID of matching objects"
+        short: "-i",
+        long: "--id-only",
+        description: "Show only the ID of matching objects"
 
       option :query,
-        :short => "-q QUERY",
-        :long => "--query QUERY",
-        :description => "The search query; useful to protect queries starting with -"
+        short: "-q QUERY",
+        long: "--query QUERY",
+        description: "The search query; useful to protect queries starting with -"
 
       option :filter_result,
-        :short => "-f FILTER",
-        :long => "--filter-result FILTER",
-        :description => "Only return specific attributes of the matching objects; for example: \"ServerName=name, Kernel=kernel.version\""
+        short: "-f FILTER",
+        long: "--filter-result FILTER",
+        description: "Only return specific attributes of the matching objects; for example: \"ServerName=name, Kernel=kernel.version\""
 
       def run
         read_cli_args
@@ -116,7 +116,7 @@ class Chef
         end
 
         if ui.interchange?
-          output({ :results => result_count, :rows => result_items })
+          output({ results: result_count, rows: result_items })
         else
           ui.log "#{result_count} items found"
           ui.log("\n")

data/lib/chef/knife/serve.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/knife"
 require "chef/local_mode"
 
@@ -8,16 +24,16 @@ class Chef
       banner "knife serve (options)"
 
       option :repo_mode,
-        :long => "--repo-mode MODE",
-        :description => "Specifies the local repository layout. Values: static (only environments/roles/data_bags/cookbooks), everything (includes nodes/clients/users), hosted_everything (includes acls/groups/etc. for Enterprise/Hosted Chef). Default: everything/hosted_everything"
+        long: "--repo-mode MODE",
+        description: "Specifies the local repository layout. Values: static (only environments/roles/data_bags/cookbooks), everything (includes nodes/clients/users), hosted_everything (includes acls/groups/etc. for Enterprise/Hosted Chef). Default: everything/hosted_everything"
 
       option :chef_repo_path,
-        :long => "--chef-repo-path PATH",
-        :description => "Overrides the location of chef repo. Default is specified by chef_repo_path in the config"
+        long: "--chef-repo-path PATH",
+        description: "Overrides the location of chef repo. Default is specified by chef_repo_path in the config"
 
       option :chef_zero_host,
-        :long => "--chef-zero-host IP",
-        :description => "Overrides the host upon which chef-zero listens. Default is 127.0.0.1."
+        long: "--chef-zero-host IP",
+        description: "Overrides the host upon which chef-zero listens. Default is 127.0.0.1."
 
       def configure_chef
         super

data/lib/chef/knife/show.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/ssh.rb

@@ -40,105 +40,105 @@ class Chef
       banner "knife ssh QUERY COMMAND (options)"
 
       option :concurrency,
-        :short => "-C NUM",
-        :long => "--concurrency NUM",
-        :description => "The number of concurrent connections",
-        :default => nil,
-        :proc => lambda { |o| o.to_i }
+        short: "-C NUM",
+        long: "--concurrency NUM",
+        description: "The number of concurrent connections",
+        default: nil,
+        proc: lambda { |o| o.to_i }
 
       option :ssh_attribute,
-        :short => "-a ATTR",
-        :long => "--attribute ATTR",
-        :description => "The attribute to use for opening the connection - default depends on the context"
+        short: "-a ATTR",
+        long: "--attribute ATTR",
+        description: "The attribute to use for opening the connection - default depends on the context"
 
       option :manual,
-        :short => "-m",
-        :long => "--manual-list",
-        :boolean => true,
-        :description => "QUERY is a space separated list of servers",
-        :default => false
+        short: "-m",
+        long: "--manual-list",
+        boolean: true,
+        description: "QUERY is a space separated list of servers",
+        default: false
 
       option :prefix_attribute,
-        :long => "--prefix-attribute ATTR",
-        :description => "The attribute to use for prefixing the ouput - default depends on the context"
+        long: "--prefix-attribute ATTR",
+        description: "The attribute to use for prefixing the ouput - default depends on the context"
 
       option :ssh_user,
-        :short => "-x USERNAME",
-        :long => "--ssh-user USERNAME",
-        :description => "The ssh username"
+        short: "-x USERNAME",
+        long: "--ssh-user USERNAME",
+        description: "The ssh username"
 
       option :ssh_password_ng,
-        :short => "-P [PASSWORD]",
-        :long => "--ssh-password [PASSWORD]",
-        :description => "The ssh password - will prompt if flag is specified but no password is given",
+        short: "-P [PASSWORD]",
+        long: "--ssh-password [PASSWORD]",
+        description: "The ssh password - will prompt if flag is specified but no password is given",
         # default to a value that can not be a password (boolean)
         # so we can effectively test if this parameter was specified
         # without a value
-        :default => false
+        default: false
 
       option :ssh_port,
-        :short => "-p PORT",
-        :long => "--ssh-port PORT",
-        :description => "The ssh port",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_port] = key.strip }
+        short: "-p PORT",
+        long: "--ssh-port PORT",
+        description: "The ssh port",
+        proc: Proc.new { |key| Chef::Config[:knife][:ssh_port] = key.strip }
 
       option :ssh_timeout,
-        :short => "-t SECONDS",
-        :long => "--ssh-timeout SECONDS",
-        :description => "The ssh connection timeout",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_timeout] = key.strip.to_i },
-        :default => 120
+        short: "-t SECONDS",
+        long: "--ssh-timeout SECONDS",
+        description: "The ssh connection timeout",
+        proc: Proc.new { |key| Chef::Config[:knife][:ssh_timeout] = key.strip.to_i },
+        default: 120
 
       option :ssh_gateway,
-        :short => "-G GATEWAY",
-        :long => "--ssh-gateway GATEWAY",
-        :description => "The ssh gateway",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key.strip }
+        short: "-G GATEWAY",
+        long: "--ssh-gateway GATEWAY",
+        description: "The ssh gateway",
+        proc: Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key.strip }
 
       option :ssh_gateway_identity,
-        :long => "--ssh-gateway-identity SSH_GATEWAY_IDENTITY",
-        :description => "The SSH identity file used for gateway authentication"
+        long: "--ssh-gateway-identity SSH_GATEWAY_IDENTITY",
+        description: "The SSH identity file used for gateway authentication"
 
       option :forward_agent,
-        :short => "-A",
-        :long => "--forward-agent",
-        :description => "Enable SSH agent forwarding",
-        :boolean => true
+        short: "-A",
+        long: "--forward-agent",
+        description: "Enable SSH agent forwarding",
+        boolean: true
 
       option :ssh_identity_file,
-        :short => "-i IDENTITY_FILE",
-        :long => "--ssh-identity-file IDENTITY_FILE",
-        :description => "The SSH identity file used for authentication"
+        short: "-i IDENTITY_FILE",
+        long: "--ssh-identity-file IDENTITY_FILE",
+        description: "The SSH identity file used for authentication"
 
       option :host_key_verify,
-        :long => "--[no-]host-key-verify",
-        :description => "Verify host key, enabled by default.",
-        :boolean => true,
-        :default => true
+        long: "--[no-]host-key-verify",
+        description: "Verify host key, enabled by default.",
+        boolean: true,
+        default: true
 
       option :on_error,
-        :short => "-e",
-        :long => "--exit-on-error",
-        :description => "Immediately exit if an error is encountered",
-        :boolean => true,
-        :default => false
+        short: "-e",
+        long: "--exit-on-error",
+        description: "Immediately exit if an error is encountered",
+        boolean: true,
+        default: false
 
       option :duplicated_fqdns,
-        :long => "--duplicated-fqdns",
-        :description => "Behavior if FQDNs are duplicated, ignored by default",
-        :proc => Proc.new { |key| Chef::Config[:knife][:duplicated_fqdns] = key.strip.to_sym },
-        :default => :ignore
+        long: "--duplicated-fqdns",
+        description: "Behavior if FQDNs are duplicated, ignored by default",
+        proc: Proc.new { |key| Chef::Config[:knife][:duplicated_fqdns] = key.strip.to_sym },
+        default: :ignore
 
       option :tmux_split,
-        :long => "--tmux-split",
-        :description => "Split tmux window.",
-        :boolean => true,
-        :default => false
+        long: "--tmux-split",
+        description: "Split tmux window.",
+        boolean: true,
+        default: false
 
       def session
         ssh_error_handler = Proc.new do |server|
           if config[:on_error]
-            #Net::SSH::Multi magic to force exception to be re-raised.
+            # Net::SSH::Multi magic to force exception to be re-raised.
             throw :go, :raise
           else
             ui.warn "Failed to connect to #{server.host} -- #{$!.class.name}: #{$!.message}"
@@ -146,7 +146,7 @@ class Chef
           end
         end
 
-        @session ||= Net::SSH::Multi.start(:concurrent_connections => config[:concurrency], :on_error => ssh_error_handler)
+        @session ||= Net::SSH::Multi.start(concurrent_connections: config[:concurrency], on_error: ssh_error_handler)
       end
 
       def configure_gateway
@@ -505,18 +505,18 @@ class Chef
         end
 
         Appscript.app("/Applications/Utilities/Terminal.app").windows.first.activate
-        Appscript.app("System Events").application_processes["Terminal.app"].keystroke("n", :using => :command_down)
+        Appscript.app("System Events").application_processes["Terminal.app"].keystroke("n", using: :command_down)
         term = Appscript.app("Terminal")
         window = term.windows.first.get
 
         (session.servers_for.size - 1).times do |i|
           window.activate
-          Appscript.app("System Events").application_processes["Terminal.app"].keystroke("t", :using => :command_down)
+          Appscript.app("System Events").application_processes["Terminal.app"].keystroke("t", using: :command_down)
         end
 
         session.servers_for.each_with_index do |server, tab_number|
           cmd = "unset PROMPT_COMMAND; echo -e \"\\033]0;#{server.host}\\007\"; ssh #{server.user ? "#{server.user}@#{server.host}" : server.host}"
-          Appscript.app("Terminal").do_script(cmd, :in => window.tabs[tab_number + 1].get)
+          Appscript.app("Terminal").do_script(cmd, in: window.tabs[tab_number + 1].get)
         end
       end
 
@@ -561,7 +561,7 @@ class Chef
       # use ssh_password_ng to determine if we're coming from knife ssh or from the other utilities.  The other utilties can
       # also be patched to use ssh_password_ng easily as long they follow the convention that the default is false.
       def configure_password
-        if config.has_key?(:ssh_password_ng) && config[:ssh_password_ng].nil?
+        if config.key?(:ssh_password_ng) && config[:ssh_password_ng].nil?
           # If the parameter is called on the command line with no value
           # it will set :ssh_password_ng = nil
           # This is where we want to trigger a prompt for password
@@ -571,7 +571,7 @@ class Chef
           # using an old config[:ssh_password].  this is backwards compatibility.  all knife cloud plugins should
           # be updated to use ssh_password_ng with a default of false and ssh_password should be retired, (but
           # we'll still need to use the ssh_password out of knife.rb if we find that).
-          ssh_password = config.has_key?(:ssh_password_ng) ? config[:ssh_password_ng] : config[:ssh_password]
+          ssh_password = config.key?(:ssh_password_ng) ? config[:ssh_password_ng] : config[:ssh_password]
           # Otherwise, the password has either been specified on the command line,
           # in knife.rb, or key based auth will be attempted
           config[:ssh_password] = get_stripped_unfrozen_value(ssh_password ||