flip multiline function arguments aroundlcg/rubocop-0.37.2

no enforced trailing comma on arguments...

80 files changed, 331 insertions, 331 deletions

diff --git a/lib/chef/api_client.rb b/lib/chef/api_client.rb
index 27701c6b68..3c1ef7a2b6 100644
--- a/lib/chef/api_client.rb
+++ b/lib/chef/api_client.rb
@@ -53,7 +53,7 @@ class Chef
       set_or_return(
         :name,
         arg,
-        :regex => /^[\-[:alnum:]_\.]+$/,
+        :regex => /^[\-[:alnum:]_\.]+$/
       )
     end
 
@@ -65,7 +65,7 @@ class Chef
       set_or_return(
         :admin,
         arg,
-        :kind_of => [ TrueClass, FalseClass ],
+        :kind_of => [ TrueClass, FalseClass ]
       )
     end
 
@@ -77,7 +77,7 @@ class Chef
       set_or_return(
         :public_key,
         arg,
-        :kind_of => String,
+        :kind_of => String
       )
     end
 
@@ -90,7 +90,7 @@ class Chef
       set_or_return(
         :validator,
         arg,
-        :kind_of => [TrueClass, FalseClass],
+        :kind_of => [TrueClass, FalseClass]
       )
     end
 
@@ -102,7 +102,7 @@ class Chef
       set_or_return(
         :private_key,
         arg,
-        :kind_of => [String, FalseClass],
+        :kind_of => [String, FalseClass]
       )
     end
 
diff --git a/lib/chef/api_client/registration.rb b/lib/chef/api_client/registration.rb
index 8547b4afa4..b05bdcac31 100644
--- a/lib/chef/api_client/registration.rb
+++ b/lib/chef/api_client/registration.rb
@@ -152,7 +152,7 @@ class Chef
                                             :api_version => "0",
                                             :client_name => Chef::Config[:validation_client_name],
                                             :signing_key_filename => Chef::Config[:validation_key],
-                                          },
+                                          }
                                          )
       end
 
diff --git a/lib/chef/api_client_v1.rb b/lib/chef/api_client_v1.rb
index ce624ad671..47b0cd1c53 100644
--- a/lib/chef/api_client_v1.rb
+++ b/lib/chef/api_client_v1.rb
@@ -76,7 +76,7 @@ class Chef
       set_or_return(
         :name,
         arg,
-        :regex => /^[\-[:alnum:]_\.]+$/,
+        :regex => /^[\-[:alnum:]_\.]+$/
       )
     end
 
@@ -88,7 +88,7 @@ class Chef
       set_or_return(
         :admin,
         arg,
-        :kind_of => [ TrueClass, FalseClass ],
+        :kind_of => [ TrueClass, FalseClass ]
       )
     end
 
@@ -100,7 +100,7 @@ class Chef
       set_or_return(
         :public_key,
         arg,
-        :kind_of => String,
+        :kind_of => String
       )
     end
 
@@ -113,7 +113,7 @@ class Chef
       set_or_return(
         :validator,
         arg,
-        :kind_of => [TrueClass, FalseClass],
+        :kind_of => [TrueClass, FalseClass]
       )
     end
 
@@ -126,7 +126,7 @@ class Chef
       set_or_return(
         :private_key,
         arg,
-        :kind_of => [String, TrueClass, FalseClass],
+        :kind_of => [String, TrueClass, FalseClass]
       )
     end
 
@@ -138,7 +138,7 @@ class Chef
       set_or_return(
         :create_key,
         arg,
-        :kind_of => [ TrueClass, FalseClass ],
+        :kind_of => [ TrueClass, FalseClass ]
       )
     end
 
diff --git a/lib/chef/application.rb b/lib/chef/application.rb
index c2adcda524..cd3e7f8c24 100644
--- a/lib/chef/application.rb
+++ b/lib/chef/application.rb
@@ -215,7 +215,7 @@ class Chef
           @chef_client_json,
           override_runlist: override_runlist,
           specific_recipes: specific_recipes,
-          runlist: config[:runlist],
+          runlist: config[:runlist]
         )
         @chef_client_json = nil
 
diff --git a/lib/chef/application/windows_service.rb b/lib/chef/application/windows_service.rb
index a9f7664e4f..0328a65487 100644
--- a/lib/chef/application/windows_service.rb
+++ b/lib/chef/application/windows_service.rb
@@ -198,7 +198,7 @@ class Chef
           result = shell_out(
             "chef-client.bat #{config_params}",
             :timeout => Chef::Config[:windows_service][:watchdog_timeout],
-            :logger => Chef::Log,
+            :logger => Chef::Log
           )
           Chef::Log.debug "#{result.stdout}"
           Chef::Log.debug "#{result.stderr}"
diff --git a/lib/chef/application/windows_service_manager.rb b/lib/chef/application/windows_service_manager.rb
index 74ee395139..6f81dccc67 100644
--- a/lib/chef/application/windows_service_manager.rb
+++ b/lib/chef/application/windows_service_manager.rb
@@ -124,11 +124,11 @@ class Chef
               :binary_path_name   => cmd,
               :service_start_name => @service_start_name,
               :password           => @password,
-              :dependencies       => @dependencies,
+              :dependencies       => @dependencies
             )
             ::Win32::Service.configure(
               :service_name     => @service_name,
-              :delayed_start    => @delayed_start,
+              :delayed_start    => @delayed_start
             ) unless @delayed_start.nil?
             puts "Service '#{@service_name}' has successfully been installed."
           end
diff --git a/lib/chef/chef_fs/data_handler/acl_data_handler.rb b/lib/chef/chef_fs/data_handler/acl_data_handler.rb
index 91e48101c4..6c8833004a 100644
--- a/lib/chef/chef_fs/data_handler/acl_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/acl_data_handler.rb
@@ -12,7 +12,7 @@ class Chef
             "update" => {},
             "delete" => {},
             "grant" => {},
-            },)
+            })
           result.keys.each do |key|
             result[key] = normalize_hash(result[key], { "actors" => [], "groups" => [] })
             result[key]["actors"] = result[key]["actors"].sort
diff --git a/lib/chef/chef_fs/data_handler/container_data_handler.rb b/lib/chef/chef_fs/data_handler/container_data_handler.rb
index d1e8d2f3af..a2e277fc7a 100644
--- a/lib/chef/chef_fs/data_handler/container_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/container_data_handler.rb
@@ -8,7 +8,7 @@ class Chef
           normalize_hash(container, {
             "containername" => remove_dot_json(entry.name),
             "containerpath" => remove_dot_json(entry.name),
-          },)
+          })
         end
 
         def preserve_key?(key)
diff --git a/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb b/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb
index f75f96f773..156c1eef4e 100644
--- a/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb
@@ -16,11 +16,11 @@ class Chef
             "chef_type" => "cookbook_version",
             "frozen?" => false,
             "metadata" => {},
-          },)
+          })
           result["metadata"] = normalize_hash(result["metadata"], {
             "version" => version,
             "name" => name,
-          },)
+          })
         end
 
         def preserve_key?(key)
diff --git a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb
index 260666b65f..8ac9a520a4 100644
--- a/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb
@@ -14,7 +14,7 @@ class Chef
           # use those in knife-essentials.
           normalize_hash(data_bag_item, {
             "id" => remove_dot_json(entry.name),
-          },)
+          })
         end
 
         def normalize_for_post(data_bag_item, entry)
diff --git a/lib/chef/chef_fs/data_handler/environment_data_handler.rb b/lib/chef/chef_fs/data_handler/environment_data_handler.rb
index 3b9d5b4ec7..8d066764be 100644
--- a/lib/chef/chef_fs/data_handler/environment_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/environment_data_handler.rb
@@ -14,7 +14,7 @@ class Chef
             "override_attributes" => {},
             "json_class" => "Chef::Environment",
             "chef_type" => "environment",
-          },)
+          })
         end
 
         def preserve_key?(key)
diff --git a/lib/chef/chef_fs/data_handler/node_data_handler.rb b/lib/chef/chef_fs/data_handler/node_data_handler.rb
index fcec74d2fb..36a7bf545b 100644
--- a/lib/chef/chef_fs/data_handler/node_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/node_data_handler.rb
@@ -16,7 +16,7 @@ class Chef
             "default" => {},
             "automatic" => {},
             "run_list" => [],
-          },)
+          })
           result["run_list"] = normalize_run_list(result["run_list"])
           result
         end
diff --git a/lib/chef/chef_fs/data_handler/organization_data_handler.rb b/lib/chef/chef_fs/data_handler/organization_data_handler.rb
index d9f97b29ac..3e5528cc49 100644
--- a/lib/chef/chef_fs/data_handler/organization_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/organization_data_handler.rb
@@ -11,7 +11,7 @@ class Chef
             "org_type" => "Business",
             "clientname" => "#{entry.org}-validator",
             "billing_plan" => "platform-free",
-          },)
+          })
           result
         end
 
diff --git a/lib/chef/chef_fs/data_handler/role_data_handler.rb b/lib/chef/chef_fs/data_handler/role_data_handler.rb
index eb10f7bb4a..74533cff05 100644
--- a/lib/chef/chef_fs/data_handler/role_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/role_data_handler.rb
@@ -15,7 +15,7 @@ class Chef
             "override_attributes" => {},
             "run_list" => [],
             "env_run_lists" => {},
-          },)
+          })
           result["run_list"] = normalize_run_list(result["run_list"])
           result["env_run_lists"].each_pair do |env, run_list|
             result["env_run_lists"][env] = normalize_run_list(run_list)
diff --git a/lib/chef/chef_fs/data_handler/user_data_handler.rb b/lib/chef/chef_fs/data_handler/user_data_handler.rb
index 392e67f822..c2df4db49d 100644
--- a/lib/chef/chef_fs/data_handler/user_data_handler.rb
+++ b/lib/chef/chef_fs/data_handler/user_data_handler.rb
@@ -15,7 +15,7 @@ class Chef
             "salt" => nil,
             "password" => nil,
             "openid" => nil,
-          },)
+          })
         end
 
         def preserve_key?(key)
diff --git a/lib/chef/cookbook/metadata.rb b/lib/chef/cookbook/metadata.rb
index 7d14cea44f..1cad526b65 100644
--- a/lib/chef/cookbook/metadata.rb
+++ b/lib/chef/cookbook/metadata.rb
@@ -177,7 +177,7 @@ class Chef
         set_or_return(
           :maintainer,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -192,7 +192,7 @@ class Chef
         set_or_return(
           :maintainer_email,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -207,7 +207,7 @@ class Chef
         set_or_return(
           :license,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -222,7 +222,7 @@ class Chef
         set_or_return(
           :description,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -237,7 +237,7 @@ class Chef
         set_or_return(
           :long_description,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -268,7 +268,7 @@ class Chef
         set_or_return(
           :name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -492,7 +492,7 @@ class Chef
             :source_url => { :kind_of => String },
             :issues_url => { :kind_of => String },
             :privacy => { :kind_of => [ TrueClass, FalseClass ] },
-          },
+          }
         )
         options[:required] = remap_required_attribute(options[:required]) unless options[:required].nil?
         validate_choice_array(options)
@@ -509,7 +509,7 @@ class Chef
           {
             :title => { :kind_of => String },
             :description => { :kind_of => String },
-          },
+          }
         )
         @groupings[name] = options
         @groupings[name]
@@ -648,7 +648,7 @@ class Chef
         set_or_return(
           :source_url,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -663,7 +663,7 @@ class Chef
         set_or_return(
           :issues_url,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -680,7 +680,7 @@ class Chef
         set_or_return(
           :privacy,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
diff --git a/lib/chef/cookbook_manifest.rb b/lib/chef/cookbook_manifest.rb
index 6e7458aa28..d6de9dd029 100644
--- a/lib/chef/cookbook_manifest.rb
+++ b/lib/chef/cookbook_manifest.rb
@@ -195,7 +195,7 @@ class Chef
         :resources => Array.new,
         :providers => Array.new,
         :root_files => Array.new,
-      },)
+      })
       @checksums = {}
 
       if !root_paths || root_paths.size == 0
@@ -217,7 +217,7 @@ class Chef
             :path => path,
             :checksum => csum,
             :specificity => specificity,
-          },)
+          })
 
           manifest[segment] << rs
         end
diff --git a/lib/chef/data_bag.rb b/lib/chef/data_bag.rb
index fb6615d741..0444e2abbe 100644
--- a/lib/chef/data_bag.rb
+++ b/lib/chef/data_bag.rb
@@ -52,7 +52,7 @@ class Chef
       set_or_return(
         :name,
         arg,
-        :regex => VALID_NAME,
+        :regex => VALID_NAME
       )
     end
 
diff --git a/lib/chef/data_bag_item.rb b/lib/chef/data_bag_item.rb
index facaf6815b..0e3fa48e68 100644
--- a/lib/chef/data_bag_item.rb
+++ b/lib/chef/data_bag_item.rb
@@ -86,7 +86,7 @@ class Chef
       set_or_return(
         :data_bag,
         arg,
-        :regex => /^[\-[:alnum:]_]+$/,
+        :regex => /^[\-[:alnum:]_]+$/
       )
     end
 
diff --git a/lib/chef/dsl/declare_resource.rb b/lib/chef/dsl/declare_resource.rb
index 2e7dc934dc..9a59859d5a 100644
--- a/lib/chef/dsl/declare_resource.rb
+++ b/lib/chef/dsl/declare_resource.rb
@@ -100,7 +100,7 @@ class Chef
           run_context:         run_context,
           cookbook_name:       cookbook_name,
           recipe_name:         recipe_name,
-          enclosing_provider:  self.is_a?(Chef::Provider) ? self : nil,
+          enclosing_provider:  self.is_a?(Chef::Provider) ? self : nil
         ).build(&resource_attrs_block)
       end
     end
diff --git a/lib/chef/environment.rb b/lib/chef/environment.rb
index cd3bbd96ff..f6d22843d4 100644
--- a/lib/chef/environment.rb
+++ b/lib/chef/environment.rb
@@ -59,7 +59,7 @@ class Chef
       set_or_return(
         :name,
         arg,
-        { :regex => /^[\-[:alnum:]_]+$/, :kind_of => String },
+        { :regex => /^[\-[:alnum:]_]+$/, :kind_of => String }
       )
     end
 
@@ -67,7 +67,7 @@ class Chef
       set_or_return(
         :description,
         arg,
-        :kind_of => String,
+        :kind_of => String
       )
     end
 
@@ -75,7 +75,7 @@ class Chef
       set_or_return(
         :default_attributes,
         arg,
-        :kind_of => Hash,
+        :kind_of => Hash
       )
     end
 
@@ -87,7 +87,7 @@ class Chef
       set_or_return(
         :override_attributes,
         arg,
-        :kind_of => Hash,
+        :kind_of => Hash
       )
     end
 
@@ -104,7 +104,7 @@ class Chef
           :callbacks => {
             "should be a valid set of cookbook version requirements" => lambda { |cv| Chef::Environment.validate_cookbook_versions(cv) },
           },
-        },
+        }
       )
     end
 
@@ -115,7 +115,7 @@ class Chef
         :version => {
           :callbacks => { "should be a valid version requirement" => lambda { |v| Chef::Environment.validate_cookbook_version(v) } },
         },
-      },)
+      })
       @cookbook_versions[cookbook] = version
     end
 
diff --git a/lib/chef/event_loggers/windows_eventlog.rb b/lib/chef/event_loggers/windows_eventlog.rb
index 84aa906dc7..f8c3d346c5 100644
--- a/lib/chef/event_loggers/windows_eventlog.rb
+++ b/lib/chef/event_loggers/windows_eventlog.rb
@@ -50,7 +50,7 @@ class Chef
           :event_type => ::Win32::EventLog::INFO_TYPE,
           :source => SOURCE,
           :event_id => RUN_START_EVENT_ID,
-          :data => [version],
+          :data => [version]
         )
       end
 
@@ -60,7 +60,7 @@ class Chef
           :event_type => ::Win32::EventLog::INFO_TYPE,
           :source => SOURCE,
           :event_id => RUN_STARTED_EVENT_ID,
-          :data => [run_status.run_id],
+          :data => [run_status.run_id]
         )
       end
 
@@ -69,7 +69,7 @@ class Chef
           :event_type => ::Win32::EventLog::INFO_TYPE,
           :source => SOURCE,
           :event_id => RUN_COMPLETED_EVENT_ID,
-          :data => [@run_status.run_id, @run_status.elapsed_time.to_s],
+          :data => [@run_status.run_id, @run_status.elapsed_time.to_s]
         )
       end
 
@@ -92,7 +92,7 @@ class Chef
           :event_id => RUN_FAILED_EVENT_ID,
           :data => data + [e.class.name,
                            e.message,
-                           e.backtrace.join("\n")],
+                           e.backtrace.join("\n")]
         )
       end
 
diff --git a/lib/chef/file_cache.rb b/lib/chef/file_cache.rb
index b4f3de236a..b4beee4a66 100644
--- a/lib/chef/file_cache.rb
+++ b/lib/chef/file_cache.rb
@@ -48,7 +48,7 @@ class Chef
           {
             :path => { :kind_of => String },
             :contents => { :kind_of => String },
-          },
+          }
         )
 
         file_path_array = File.split(path)
@@ -74,7 +74,7 @@ class Chef
           {
             :file => { :kind_of => String },
             :path => { :kind_of => String },
-          },
+          }
         )
 
         file_path_array = File.split(path)
@@ -82,7 +82,7 @@ class Chef
         if File.exists?(file) && File.writable?(file)
           FileUtils.mv(
             file,
-            File.join(create_cache_path(File.join(file_path_array), true), file_name),
+            File.join(create_cache_path(File.join(file_path_array), true), file_name)
           )
         else
           raise RuntimeError, "Cannot move #{file} to #{path}!"
@@ -109,7 +109,7 @@ class Chef
           },
           {
             :path => { :kind_of => String },
-          },
+          }
         )
         cache_path = create_cache_path(path, false)
         raise Chef::Exceptions::FileNotFound, "Cannot find #{cache_path} for #{path}!" unless File.exists?(cache_path)
@@ -135,7 +135,7 @@ class Chef
           },
           {
             :path => { :kind_of => String },
-          },
+          }
         )
         cache_path = create_cache_path(path, false)
         if File.exists?(cache_path)
@@ -182,7 +182,7 @@ class Chef
           },
           {
             :path => { :kind_of => String },
-          },
+          }
         )
         full_path = create_cache_path(path, false)
         if File.exists?(full_path)
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index 280960f3c6..52fa177159 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -255,11 +255,11 @@ class Chef
         @client_builder = Chef::Knife::Bootstrap::ClientBuilder.new(
           chef_config: Chef::Config,
           knife_config: config,
-          ui: ui,
+          ui: ui
         )
         @chef_vault_handler = Chef::Knife::Bootstrap::ChefVaultHandler.new(
           knife_config: config,
-          ui: ui,
+          ui: ui
         )
       end
 
@@ -340,7 +340,7 @@ class Chef
           config,
           config[:run_list],
           Chef::Config,
-          secret,
+          secret
         )
       end
 
diff --git a/lib/chef/knife/data_bag_create.rb b/lib/chef/knife/data_bag_create.rb
index 3576ec7379..196278bb80 100644
--- a/lib/chef/knife/data_bag_create.rb
+++ b/lib/chef/knife/data_bag_create.rb
@@ -66,7 +66,7 @@ class Chef
                 Chef::EncryptedDataBagItem.encrypt_data_bag_item(output, read_secret)
               else
                 output
-              end,
+              end
             )
             item.data_bag(@data_bag_name)
             rest.post("data/#{@data_bag_name}", item)
diff --git a/lib/chef/log/winevt.rb b/lib/chef/log/winevt.rb
index 8411ad8af0..506d4c9a6c 100644
--- a/lib/chef/log/winevt.rb
+++ b/lib/chef/log/winevt.rb
@@ -54,7 +54,7 @@ class Chef
           :event_type => ::Win32::EventLog::INFO_TYPE,
           :source => SOURCE,
           :event_id => INFO_EVENT_ID,
-          :data => [msg],
+          :data => [msg]
         )
       end
 
@@ -63,7 +63,7 @@ class Chef
           :event_type => ::Win32::EventLog::WARN_TYPE,
           :source => SOURCE,
           :event_id => WARN_EVENT_ID,
-          :data => [msg],
+          :data => [msg]
         )
       end
 
@@ -72,7 +72,7 @@ class Chef
           :event_type => ::Win32::EventLog::INFO_TYPE,
           :source => SOURCE,
           :event_id => DEBUG_EVENT_ID,
-          :data => [msg],
+          :data => [msg]
         )
       end
 
@@ -81,7 +81,7 @@ class Chef
           :event_type => ::Win32::EventLog::ERROR_TYPE,
           :source => SOURCE,
           :event_id => ERROR_EVENT_ID,
-          :data => [msg],
+          :data => [msg]
         )
       end
 
@@ -90,7 +90,7 @@ class Chef
           :event_type => ::Win32::EventLog::ERROR_TYPE,
           :source => SOURCE,
           :event_id => FATAL_EVENT_ID,
-          :data => [msg],
+          :data => [msg]
         )
       end
 
diff --git a/lib/chef/mixin/powershell_out.rb b/lib/chef/mixin/powershell_out.rb
index 7fff958b78..74de85f86f 100644
--- a/lib/chef/mixin/powershell_out.rb
+++ b/lib/chef/mixin/powershell_out.rb
@@ -66,7 +66,7 @@ class Chef
         with_os_architecture(nil, architecture: arch) do
           shell_out(
             build_powershell_command(script),
-            options,
+            options
           )
         end
       end
diff --git a/lib/chef/mixin/securable.rb b/lib/chef/mixin/securable.rb
index 9cde53d66f..a88d534b37 100644
--- a/lib/chef/mixin/securable.rb
+++ b/lib/chef/mixin/securable.rb
@@ -24,7 +24,7 @@ class Chef
         set_or_return(
           :owner,
           arg,
-          :regex => Chef::Config[:user_valid_regex],
+          :regex => Chef::Config[:user_valid_regex]
         )
       end
 
@@ -34,7 +34,7 @@ class Chef
         set_or_return(
           :group,
           arg,
-          :regex => Chef::Config[:group_valid_regex],
+          :regex => Chef::Config[:group_valid_regex]
         )
       end
 
@@ -55,7 +55,7 @@ class Chef
                 Integer(m) <= 07777 && Integer(m) >= 0
               end
             },
-          },
+          }
         )
       end
 
@@ -156,7 +156,7 @@ class Chef
             set_or_return(
               name,
               rights,
-              {},
+              {}
             )
           end
         end
@@ -171,7 +171,7 @@ class Chef
           set_or_return(
             :inherits,
             arg,
-            :kind_of => [ TrueClass, FalseClass ],
+            :kind_of => [ TrueClass, FalseClass ]
           )
         end
       end
diff --git a/lib/chef/mixin/windows_env_helper.rb b/lib/chef/mixin/windows_env_helper.rb
index 47f1aeb865..65b4b33cf0 100644
--- a/lib/chef/mixin/windows_env_helper.rb
+++ b/lib/chef/mixin/windows_env_helper.rb
@@ -47,7 +47,7 @@ class Chef
           Chef::ReservedNames::Win32::Error.raise!
         end
         if  SendMessageTimeoutW(HWND_BROADCAST, WM_SETTINGCHANGE, 0, FFI::MemoryPointer.from_string(
-            utf8_to_wide("Environment"),
+            utf8_to_wide("Environment")
         ).address, flags, 5000, nil) == 0
           Chef::ReservedNames::Win32::Error.raise!
         end
diff --git a/lib/chef/monologger.rb b/lib/chef/monologger.rb
index a1dd594c7a..49f744e314 100644
--- a/lib/chef/monologger.rb
+++ b/lib/chef/monologger.rb
@@ -79,7 +79,7 @@ class MonoLogger < Logger
 
     def add_log_header(file)
       file.write(
-        "# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName],
+        "# Logfile created on %s by %s\n" % [Time.now.to_s, Logger::ProgName]
       )
     end
 
diff --git a/lib/chef/node.rb b/lib/chef/node.rb
index c7813eb2aa..294358f405 100644
--- a/lib/chef/node.rb
+++ b/lib/chef/node.rb
@@ -103,7 +103,7 @@ class Chef
         Chef::Config[:chef_server_url],
         client_name: Chef::Config[:node_name],
         signing_key_filename: Chef::Config[:client_key],
-        validate_utf8: false,
+        validate_utf8: false
       )
     end
 
@@ -115,7 +115,7 @@ class Chef
                  { :name => { :kind_of => String,
                               :cannot_be => :blank,
                               :regex => /^[\-[:alnum:]_:.]+$/ },
-                 },)
+                 })
         @name = arg
       else
         @name
@@ -126,7 +126,7 @@ class Chef
       set_or_return(
         :chef_environment,
         arg,
-        { :regex => /^[\-[:alnum:]_]+$/, :kind_of => String },
+        { :regex => /^[\-[:alnum:]_]+$/, :kind_of => String }
       )
     end
 
diff --git a/lib/chef/platform/provider_mapping.rb b/lib/chef/platform/provider_mapping.rb
index 1a5da902ef..3e90797802 100644
--- a/lib/chef/platform/provider_mapping.rb
+++ b/lib/chef/platform/provider_mapping.rb
@@ -124,7 +124,7 @@ class Chef
             :provider => {
               :kind_of => [ String, Symbol, Class ],
             },
-          },
+          }
         )
         if args.has_key?(:platform)
           if args.has_key?(:version)
diff --git a/lib/chef/platform/service_helpers.rb b/lib/chef/platform/service_helpers.rb
index 28c4c5ec59..87b87d4c72 100644
--- a/lib/chef/platform/service_helpers.rb
+++ b/lib/chef/platform/service_helpers.rb
@@ -105,7 +105,7 @@ class Chef
         def has_systemd_service_unit?(svc_name)
           %w{ /etc /usr/lib /lib /run }.any? do |load_path|
             ::File.exist?(
-              Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, '@')}.service"),
+              Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, '@')}.service")
             )
           end
         end
diff --git a/lib/chef/provider/dsc_resource.rb b/lib/chef/provider/dsc_resource.rb
index eac8a829bd..be752f269f 100644
--- a/lib/chef/provider/dsc_resource.rb
+++ b/lib/chef/provider/dsc_resource.rb
@@ -72,7 +72,7 @@ class Chef
       def local_configuration_manager
         @local_configuration_manager ||= Chef::Util::DSC::LocalConfigurationManager.new(
           node,
-          nil,
+          nil
         )
       end
 
@@ -158,7 +158,7 @@ class Chef
         cmdlet = Chef::Util::Powershell::Cmdlet.new(
           node,
           "Invoke-DscResource #{switches}",
-          output_format,
+          output_format
         )
         cmdlet.run!({}, { :timeout => new_resource.timeout })
       end
@@ -176,7 +176,7 @@ class Chef
       def create_reboot_resource
         @reboot_resource = Chef::Resource::Reboot.new(
           "Reboot for #{@new_resource.name}",
-          run_context,
+          run_context
         ).tap do |r|
           r.reason("Reboot for #{@new_resource.resource}.")
         end
diff --git a/lib/chef/provider/execute.rb b/lib/chef/provider/execute.rb
index 4e7d8e1454..45f0ad5488 100644
--- a/lib/chef/provider/execute.rb
+++ b/lib/chef/provider/execute.rb
@@ -117,7 +117,7 @@ class Chef
 
       def sentinel_file
         Pathname.new(Chef::Util::PathHelper.cleanpath(
-           ( cwd && creates_relative? ) ? ::File.join(cwd, creates) : creates,
+           ( cwd && creates_relative? ) ? ::File.join(cwd, creates) : creates
         ))
       end
     end
diff --git a/lib/chef/provider/http_request.rb b/lib/chef/provider/http_request.rb
index b52368f472..e1ee01d9b4 100644
--- a/lib/chef/provider/http_request.rb
+++ b/lib/chef/provider/http_request.rb
@@ -42,7 +42,7 @@ class Chef
         # and false for a "304 Not Modified" response
         modified = @http.head(
           "#{@new_resource.url}",
-          @new_resource.headers,
+          @new_resource.headers
         )
         Chef::Log.info("#{@new_resource} HEAD to #{@new_resource.url} successful")
         Chef::Log.debug("#{@new_resource} HEAD request response: #{modified}")
@@ -59,7 +59,7 @@ class Chef
           message = check_message(@new_resource.message)
           body = @http.get(
             "#{@new_resource.url}",
-            @new_resource.headers,
+            @new_resource.headers
           )
           Chef::Log.info("#{@new_resource} GET to #{@new_resource.url} successful")
           Chef::Log.debug("#{@new_resource} GET request response: #{body}")
@@ -73,7 +73,7 @@ class Chef
           body = @http.put(
             "#{@new_resource.url}",
             message,
-            @new_resource.headers,
+            @new_resource.headers
           )
           Chef::Log.info("#{@new_resource} PUT to #{@new_resource.url} successful")
           Chef::Log.debug("#{@new_resource} PUT request response: #{body}")
@@ -87,7 +87,7 @@ class Chef
           body = @http.post(
             "#{@new_resource.url}",
             message,
-            @new_resource.headers,
+            @new_resource.headers
           )
           Chef::Log.info("#{@new_resource} POST to #{@new_resource.url} message: #{message.inspect} successful")
           Chef::Log.debug("#{@new_resource} POST request response: #{body}")
@@ -99,7 +99,7 @@ class Chef
         converge_by("#{@new_resource} DELETE to #{@new_resource.url}") do
           body = @http.delete(
             "#{@new_resource.url}",
-            @new_resource.headers,
+            @new_resource.headers
           )
           @new_resource.updated_by_last_action(true)
           Chef::Log.info("#{@new_resource} DELETE to #{@new_resource.url} successful")
diff --git a/lib/chef/provider/ifconfig.rb b/lib/chef/provider/ifconfig.rb
index d00d5cd155..e73869d829 100644
--- a/lib/chef/provider/ifconfig.rb
+++ b/lib/chef/provider/ifconfig.rb
@@ -109,7 +109,7 @@ class Chef
             command = add_command
             converge_by ("run #{command} to add #{@new_resource}") do
               run_command(
-                :command => command,
+                :command => command
               )
               Chef::Log.info("#{@new_resource} added")
             end
@@ -127,7 +127,7 @@ class Chef
             command = enable_command
             converge_by ("run #{command} to enable #{@new_resource}") do
               run_command(
-                :command => command,
+                :command => command
               )
               Chef::Log.info("#{@new_resource} enabled")
             end
@@ -141,7 +141,7 @@ class Chef
           command = delete_command
           converge_by ("run #{command} to delete #{@new_resource}") do
             run_command(
-              :command => command,
+              :command => command
             )
             Chef::Log.info("#{@new_resource} deleted")
           end
@@ -158,7 +158,7 @@ class Chef
           command = disable_command
           converge_by ("run #{command} to disable #{@new_resource}") do
             run_command(
-              :command => command,
+              :command => command
             )
             Chef::Log.info("#{@new_resource} disabled")
           end
diff --git a/lib/chef/provider/link.rb b/lib/chef/provider/link.rb
index 85c46ada98..d184094bbb 100644
--- a/lib/chef/provider/link.rb
+++ b/lib/chef/provider/link.rb
@@ -52,7 +52,7 @@ class Chef
         if file_class.symlink?(@current_resource.target_file)
           @current_resource.link_type(:symbolic)
           @current_resource.to(
-            canonicalize(file_class.readlink(@current_resource.target_file)),
+            canonicalize(file_class.readlink(@current_resource.target_file))
           )
         else
           @current_resource.link_type(:hard)
diff --git a/lib/chef/provider/osx_profile.rb b/lib/chef/provider/osx_profile.rb
index f232dede83..3e37cbc9a5 100644
--- a/lib/chef/provider/osx_profile.rb
+++ b/lib/chef/provider/osx_profile.rb
@@ -40,7 +40,7 @@ class Chef
         all_profiles = get_installed_profiles
         @new_resource.profile(
           @new_resource.profile ||
-          @new_resource.profile_name,
+          @new_resource.profile_name
         )
 
         @new_profile_hash = get_profile_hash(@new_resource.profile)
@@ -141,7 +141,7 @@ class Chef
 
       def get_cache_dir
         cache_dir = Chef::FileCache.create_cache_path(
-          "profiles/#{@new_resource.cookbook_name}",
+          "profiles/#{@new_resource.cookbook_name}"
         )
       end
 
@@ -150,15 +150,15 @@ class Chef
           ::File.join(
             "profiles",
             @new_resource.cookbook_name,
-            ::File.dirname(cookbook_file),
-          ),
+            ::File.dirname(cookbook_file)
+          )
         )
         remote_file = Chef::Resource::CookbookFile.new(
           ::File.join(
             get_cache_dir,
-            "#{cookbook_file}.remote",
+            "#{cookbook_file}.remote"
           ),
-          run_context,
+          run_context
         )
         remote_file.cookbook_name = @new_resource.cookbook_name
         remote_file.source(cookbook_file)
@@ -179,7 +179,7 @@ class Chef
         # Make a UUID of the profile contents and return as string
         UUIDTools::UUID.sha1_create(
           UUIDTools::UUID_DNS_NAMESPACE,
-          profile.to_s,
+          profile.to_s
         ).to_s
       end
 
diff --git a/lib/chef/provider/package/chocolatey.rb b/lib/chef/provider/package/chocolatey.rb
index ad4db0c4e6..6804e99a13 100644
--- a/lib/chef/provider/package/chocolatey.rb
+++ b/lib/chef/provider/package/chocolatey.rb
@@ -155,14 +155,14 @@ EOS
           @choco_exe ||= ::File.join(
             choco_install_path,
             "bin",
-            "choco.exe",
+            "choco.exe"
             )
         end
 
         # lets us mock out an incorrect value for testing.
         def choco_install_path
           @choco_install_path ||= powershell_out!(
-            PATHFINDING_POWERSHELL_COMMAND,
+            PATHFINDING_POWERSHELL_COMMAND
             ).stdout.chomp
         end
 
diff --git a/lib/chef/provider/reboot.rb b/lib/chef/provider/reboot.rb
index 11039f8701..34eee9236d 100644
--- a/lib/chef/provider/reboot.rb
+++ b/lib/chef/provider/reboot.rb
@@ -40,7 +40,7 @@ class Chef
           :delay_mins => @new_resource.delay_mins,
           :reason => @new_resource.reason,
           :timestamp => Time.now,
-          :requested_by => @new_resource.name,
+          :requested_by => @new_resource.name
           )
       end
 
diff --git a/lib/chef/provider/service/gentoo.rb b/lib/chef/provider/service/gentoo.rb
index 1bfd46ef14..66f2f10f23 100644
--- a/lib/chef/provider/service/gentoo.rb
+++ b/lib/chef/provider/service/gentoo.rb
@@ -39,7 +39,7 @@ class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init
         readable = ::File.readable? file
         Chef::Log.debug "#{@new_resource} exists: #{exists}, readable: #{readable}"
         exists and readable
-      end,
+      end
     )
     Chef::Log.debug "#{@new_resource} enabled: #{@current_resource.enabled}"
 
diff --git a/lib/chef/provider/service/macosx.rb b/lib/chef/provider/service/macosx.rb
index cdd5d934ff..63485903c3 100644
--- a/lib/chef/provider/service/macosx.rb
+++ b/lib/chef/provider/service/macosx.rb
@@ -224,7 +224,7 @@ class Chef
           # plist files can come in XML or Binary formats. this command
           # will make sure we get XML every time.
           plist_xml = shell_out_with_systems_locale!(
-            "plutil -convert xml1 -o - #{@plist}",
+            "plutil -convert xml1 -o - #{@plist}"
           ).stdout
 
           plist_doc = REXML::Document.new(plist_xml)
@@ -236,7 +236,7 @@ class Chef
           plists = PLIST_DIRS.inject([]) do |results, dir|
             edir = ::File.expand_path(dir)
             entries = Dir.glob(
-              "#{edir}/*#{Chef::Util::PathHelper.escape_glob(@current_resource.service_name)}*.plist",
+              "#{edir}/*#{Chef::Util::PathHelper.escape_glob(@current_resource.service_name)}*.plist"
             )
             entries.any? ? results << entries : results
           end
diff --git a/lib/chef/provider/service/windows.rb b/lib/chef/provider/service/windows.rb
index 2705aa5c02..9bfd9238cd 100644
--- a/lib/chef/provider/service/windows.rb
+++ b/lib/chef/provider/service/windows.rb
@@ -306,7 +306,7 @@ class Chef::Provider::Service::Windows < Chef::Provider::Service
     Chef::Log.debug "#{@new_resource.name} setting start_type to #{type}"
     Win32::Service.configure(
       :service_name => @new_resource.service_name,
-      :start_type => allowed_types[type],
+      :start_type => allowed_types[type]
     )
     @new_resource.updated_by_last_action(true)
   end
diff --git a/lib/chef/provider/user/dscl.rb b/lib/chef/provider/user/dscl.rb
index 1659e324c0..fecfb73e2d 100644
--- a/lib/chef/provider/user/dscl.rb
+++ b/lib/chef/provider/user/dscl.rb
@@ -415,7 +415,7 @@ user password using shadow hash.")
                 salt,
                 iterations,
                 128,
-                OpenSSL::Digest::SHA512.new,
+                OpenSSL::Digest::SHA512.new
               )
             end
 
@@ -700,7 +700,7 @@ user password using shadow hash.")
             salt,
             current_resource.iterations,
             128,
-            OpenSSL::Digest::SHA512.new,
+            OpenSSL::Digest::SHA512.new
           ).unpack("H*").first == current_resource.password
         end
 
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index 032effe4db..21b2308688 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -173,7 +173,7 @@ class Chef
         arg.each do |action|
           validate(
             { action: action },
-            { action: { kind_of: Symbol, equal_to: allowed_actions } },
+            { action: { kind_of: Symbol, equal_to: allowed_actions } }
           )
         end
         @action = arg
diff --git a/lib/chef/resource/cron.rb b/lib/chef/resource/cron.rb
index 74fa6685f1..a76d454bf0 100644
--- a/lib/chef/resource/cron.rb
+++ b/lib/chef/resource/cron.rb
@@ -60,7 +60,7 @@ class Chef
         set_or_return(
           :minute,
           converted_arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -77,7 +77,7 @@ class Chef
         set_or_return(
           :hour,
           converted_arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -94,7 +94,7 @@ class Chef
         set_or_return(
           :day,
           converted_arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -111,7 +111,7 @@ class Chef
         set_or_return(
           :month,
           converted_arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -135,7 +135,7 @@ class Chef
         set_or_return(
           :weekday,
           converted_arg,
-          :kind_of => [String, Symbol],
+          :kind_of => [String, Symbol]
         )
       end
 
@@ -143,7 +143,7 @@ class Chef
         set_or_return(
           :time,
           arg,
-          :equal_to => Chef::Provider::Cron::SPECIAL_TIME_VALUES,
+          :equal_to => Chef::Provider::Cron::SPECIAL_TIME_VALUES
         )
       end
 
@@ -151,7 +151,7 @@ class Chef
         set_or_return(
           :mailto,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -159,7 +159,7 @@ class Chef
         set_or_return(
           :path,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -167,7 +167,7 @@ class Chef
         set_or_return(
           :home,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -175,7 +175,7 @@ class Chef
         set_or_return(
           :shell,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -183,7 +183,7 @@ class Chef
         set_or_return(
           :command,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -191,7 +191,7 @@ class Chef
         set_or_return(
           :user,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -199,7 +199,7 @@ class Chef
         set_or_return(
           :environment,
           arg,
-          :kind_of => Hash,
+          :kind_of => Hash
         )
       end
 
diff --git a/lib/chef/resource/deploy.rb b/lib/chef/resource/deploy.rb
index df301dd024..b8e6a26f97 100644
--- a/lib/chef/resource/deploy.rb
+++ b/lib/chef/resource/deploy.rb
@@ -103,7 +103,7 @@ class Chef
         set_or_return(
           :depth,
           arg,
-          :kind_of => [ Integer ],
+          :kind_of => [ Integer ]
         )
       end
 
@@ -112,7 +112,7 @@ class Chef
         set_or_return(
           :deploy_to,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -120,7 +120,7 @@ class Chef
         set_or_return(
           :repo,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
       alias :repository :repo
@@ -129,7 +129,7 @@ class Chef
         set_or_return(
           :remote,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -137,7 +137,7 @@ class Chef
         set_or_return(
           :role,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -146,7 +146,7 @@ class Chef
         set_or_return(
           :restart_command,
           arg,
-          :kind_of => [ String, Proc ],
+          :kind_of => [ String, Proc ]
         )
       end
       alias :restart :restart_command
@@ -155,7 +155,7 @@ class Chef
         set_or_return(
           :migrate,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -163,7 +163,7 @@ class Chef
         set_or_return(
           :migration_command,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -171,7 +171,7 @@ class Chef
         set_or_return(
           :rollback_on_error,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -179,7 +179,7 @@ class Chef
         set_or_return(
           :user,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -187,7 +187,7 @@ class Chef
         set_or_return(
           :group,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -195,7 +195,7 @@ class Chef
         set_or_return(
           :enable_submodules,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -203,7 +203,7 @@ class Chef
         set_or_return(
           :shallow_clone,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -211,7 +211,7 @@ class Chef
         set_or_return(
           :repository_cache,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -219,7 +219,7 @@ class Chef
         set_or_return(
           :copy_exclude,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -227,7 +227,7 @@ class Chef
         set_or_return(
           :revision,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
       alias :branch :revision
@@ -236,7 +236,7 @@ class Chef
         set_or_return(
           :git_ssh_wrapper,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
       alias :ssh_wrapper :git_ssh_wrapper
@@ -245,7 +245,7 @@ class Chef
         set_or_return(
           :svn_username,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -253,7 +253,7 @@ class Chef
         set_or_return(
           :svn_password,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -261,7 +261,7 @@ class Chef
         set_or_return(
           :svn_arguments,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -281,7 +281,7 @@ class Chef
         set_or_return(
           :scm_provider,
           klass,
-          :kind_of => [ Class ],
+          :kind_of => [ Class ]
         )
       end
 
@@ -295,7 +295,7 @@ class Chef
         set_or_return(
           :svn_force_export,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -308,7 +308,7 @@ class Chef
         set_or_return(
           :environment,
           arg,
-          :kind_of => [ Hash ],
+          :kind_of => [ Hash ]
         )
       end
 
@@ -328,7 +328,7 @@ class Chef
         set_or_return(
           :purge_before_symlink,
           arg,
-          :kind_of => Array,
+          :kind_of => Array
         )
       end
 
@@ -344,7 +344,7 @@ class Chef
         set_or_return(
           :create_dirs_before_symlink,
           arg,
-          :kind_of => Array,
+          :kind_of => Array
         )
       end
 
@@ -358,7 +358,7 @@ class Chef
         set_or_return(
           :symlinks,
           arg,
-          :kind_of => Hash,
+          :kind_of => Hash
         )
       end
 
@@ -373,7 +373,7 @@ class Chef
         set_or_return(
           :symlink_before_migrate,
           arg,
-          :kind_of => Hash,
+          :kind_of => Hash
         )
       end
 
@@ -405,7 +405,7 @@ class Chef
         set_or_return(
           :additional_remotes,
           arg,
-          :kind_of => Hash,
+          :kind_of => Hash
         )
       end
 
@@ -413,7 +413,7 @@ class Chef
         set_or_return(
           :enable_checkout,
           arg,
-          :kind_of => [TrueClass, FalseClass],
+          :kind_of => [TrueClass, FalseClass]
         )
       end
 
@@ -421,7 +421,7 @@ class Chef
         set_or_return(
           :checkout_branch,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -434,7 +434,7 @@ class Chef
         set_or_return(
           :timeout,
           arg,
-          :kind_of => Integer,
+          :kind_of => Integer
         )
       end
 
diff --git a/lib/chef/resource/directory.rb b/lib/chef/resource/directory.rb
index 07c29b48a6..faad659668 100644
--- a/lib/chef/resource/directory.rb
+++ b/lib/chef/resource/directory.rb
@@ -45,7 +45,7 @@ class Chef
         set_or_return(
           :recursive,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -53,7 +53,7 @@ class Chef
         set_or_return(
           :path,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
diff --git a/lib/chef/resource/dsc_resource.rb b/lib/chef/resource/dsc_resource.rb
index 4a55ce1d70..58594cce7b 100644
--- a/lib/chef/resource/dsc_resource.rb
+++ b/lib/chef/resource/dsc_resource.rb
@@ -103,7 +103,7 @@ class Chef
         set_or_return(
           :timeout,
           arg,
-          :kind_of => [ Integer ],
+          :kind_of => [ Integer ]
         )
       end
 
diff --git a/lib/chef/resource/dsc_script.rb b/lib/chef/resource/dsc_script.rb
index a8eeeb1d4f..7da29a651a 100644
--- a/lib/chef/resource/dsc_script.rb
+++ b/lib/chef/resource/dsc_script.rb
@@ -43,7 +43,7 @@ class Chef
         set_or_return(
           :code,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -54,7 +54,7 @@ class Chef
         set_or_return(
           :configuration_name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -65,7 +65,7 @@ class Chef
         set_or_return(
           :command,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -76,7 +76,7 @@ class Chef
         set_or_return(
           :configuration_data,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -87,7 +87,7 @@ class Chef
         set_or_return(
           :configuration_data_script,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -108,7 +108,7 @@ class Chef
         set_or_return(
           :flags,
           arg,
-          :kind_of => [ Hash ],
+          :kind_of => [ Hash ]
         )
       end
 
@@ -116,7 +116,7 @@ class Chef
         set_or_return(
           :cwd,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -124,7 +124,7 @@ class Chef
         set_or_return(
           :environment,
           arg,
-          :kind_of => [ Hash ],
+          :kind_of => [ Hash ]
         )
       end
 
@@ -132,7 +132,7 @@ class Chef
         set_or_return(
           :timeout,
           arg,
-          :kind_of => [ Integer ],
+          :kind_of => [ Integer ]
         )
       end
     end
diff --git a/lib/chef/resource/env.rb b/lib/chef/resource/env.rb
index a483b69ee5..7fac8af40b 100644
--- a/lib/chef/resource/env.rb
+++ b/lib/chef/resource/env.rb
@@ -41,7 +41,7 @@ class Chef
         set_or_return(
           :key_name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -49,7 +49,7 @@ class Chef
         set_or_return(
           :value,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -57,7 +57,7 @@ class Chef
         set_or_return(
           :delim,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
     end
diff --git a/lib/chef/resource/erl_call.rb b/lib/chef/resource/erl_call.rb
index 5b5273d31d..3e317676a5 100644
--- a/lib/chef/resource/erl_call.rb
+++ b/lib/chef/resource/erl_call.rb
@@ -44,7 +44,7 @@ class Chef
         set_or_return(
           :code,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -52,7 +52,7 @@ class Chef
         set_or_return(
           :cookie,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -60,7 +60,7 @@ class Chef
         set_or_return(
           :distributed,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -68,7 +68,7 @@ class Chef
         set_or_return(
           :name_type,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -76,7 +76,7 @@ class Chef
         set_or_return(
           :node_name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb
index b30cc245bd..1a56607267 100644
--- a/lib/chef/resource/execute.rb
+++ b/lib/chef/resource/execute.rb
@@ -56,7 +56,7 @@ class Chef
         set_or_return(
           :umask,
           arg,
-          :kind_of => [ String, Integer ],
+          :kind_of => [ String, Integer ]
         )
       end
 
@@ -64,7 +64,7 @@ class Chef
         set_or_return(
           :command,
           arg,
-          :kind_of => [ String, Array ],
+          :kind_of => [ String, Array ]
         )
       end
 
@@ -72,7 +72,7 @@ class Chef
         set_or_return(
           :creates,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -80,7 +80,7 @@ class Chef
         set_or_return(
           :cwd,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -88,7 +88,7 @@ class Chef
         set_or_return(
           :environment,
           arg,
-          :kind_of => [ Hash ],
+          :kind_of => [ Hash ]
         )
       end
 
@@ -98,7 +98,7 @@ class Chef
         set_or_return(
           :group,
           arg,
-          :kind_of => [ String, Integer ],
+          :kind_of => [ String, Integer ]
         )
       end
 
@@ -115,7 +115,7 @@ class Chef
         set_or_return(
           :path,
           arg,
-          :kind_of => [ Array ],
+          :kind_of => [ Array ]
         )
       end
 
@@ -123,7 +123,7 @@ class Chef
         set_or_return(
           :returns,
           arg,
-          :kind_of => [ Integer, Array ],
+          :kind_of => [ Integer, Array ]
         )
       end
 
@@ -131,7 +131,7 @@ class Chef
         set_or_return(
           :timeout,
           arg,
-          :kind_of => [ Integer, Float ],
+          :kind_of => [ Integer, Float ]
         )
       end
 
@@ -139,7 +139,7 @@ class Chef
         set_or_return(
           :user,
           arg,
-          :kind_of => [ String, Integer ],
+          :kind_of => [ String, Integer ]
         )
       end
 
@@ -164,7 +164,7 @@ class Chef
         :environment,
         :group,
         :user,
-        :umask,
+        :umask
       )
 
     end
diff --git a/lib/chef/resource/file/verification.rb b/lib/chef/resource/file/verification.rb
index 15ed27347f..e11035d33f 100644
--- a/lib/chef/resource/file/verification.rb
+++ b/lib/chef/resource/file/verification.rb
@@ -110,7 +110,7 @@ class Chef
           # is interpolated. Until `file` can be deprecated, interpolate both.
           Chef.log_deprecation(
             "%{file} is deprecated in verify command and will not be "\
-            "supported in Chef 13. Please use %{path} instead.",
+            "supported in Chef 13. Please use %{path} instead."
           ) if @command.include?("%{file}")
           command = @command % { :file => path, :path => path }
           interpreter = Chef::GuardInterpreter.for_resource(@parent_resource, command, @command_opts)
diff --git a/lib/chef/resource/git.rb b/lib/chef/resource/git.rb
index 0d3b1438bf..4799b54d3d 100644
--- a/lib/chef/resource/git.rb
+++ b/lib/chef/resource/git.rb
@@ -31,7 +31,7 @@ class Chef
         set_or_return(
           :additional_remotes,
           arg,
-          :kind_of => Hash,
+          :kind_of => Hash
         )
       end
 
diff --git a/lib/chef/resource/group.rb b/lib/chef/resource/group.rb
index aee4727baf..d3a4a1ce89 100644
--- a/lib/chef/resource/group.rb
+++ b/lib/chef/resource/group.rb
@@ -42,7 +42,7 @@ class Chef
         set_or_return(
           :group_name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -50,7 +50,7 @@ class Chef
         set_or_return(
           :gid,
           arg,
-          :kind_of => [ String, Integer ],
+          :kind_of => [ String, Integer ]
         )
       end
 
@@ -59,7 +59,7 @@ class Chef
         set_or_return(
           :members,
           converted_members,
-          :kind_of => [ Array ],
+          :kind_of => [ Array ]
         )
       end
 
@@ -70,7 +70,7 @@ class Chef
         set_or_return(
           :excluded_members,
           converted_members,
-          :kind_of => [ Array ],
+          :kind_of => [ Array ]
         )
       end
 
@@ -78,7 +78,7 @@ class Chef
         set_or_return(
           :append,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -86,7 +86,7 @@ class Chef
         set_or_return(
           :system,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -94,7 +94,7 @@ class Chef
         set_or_return(
           :non_unique,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
     end
diff --git a/lib/chef/resource/http_request.rb b/lib/chef/resource/http_request.rb
index be69e2f1df..fcc48470bc 100644
--- a/lib/chef/resource/http_request.rb
+++ b/lib/chef/resource/http_request.rb
@@ -40,7 +40,7 @@ class Chef
         set_or_return(
           :url,
           args,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -49,7 +49,7 @@ class Chef
         set_or_return(
           :message,
           args,
-          :kind_of => Object,
+          :kind_of => Object
         )
       end
 
@@ -57,7 +57,7 @@ class Chef
         set_or_return(
           :headers,
           args,
-          :kind_of => Hash,
+          :kind_of => Hash
         )
       end
 
diff --git a/lib/chef/resource/ifconfig.rb b/lib/chef/resource/ifconfig.rb
index 94362b1c73..fd523d9580 100644
--- a/lib/chef/resource/ifconfig.rb
+++ b/lib/chef/resource/ifconfig.rb
@@ -50,7 +50,7 @@ class Chef
         set_or_return(
           :target,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -58,7 +58,7 @@ class Chef
         set_or_return(
           :device,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -66,7 +66,7 @@ class Chef
         set_or_return(
           :hwaddr,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -74,7 +74,7 @@ class Chef
         set_or_return(
           :inet_addr,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -82,7 +82,7 @@ class Chef
         set_or_return(
           :bcast,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -90,7 +90,7 @@ class Chef
         set_or_return(
           :mask,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -98,7 +98,7 @@ class Chef
         set_or_return(
           :mtu,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -106,7 +106,7 @@ class Chef
         set_or_return(
           :metric,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -114,7 +114,7 @@ class Chef
         set_or_return(
           :onboot,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -122,7 +122,7 @@ class Chef
         set_or_return(
           :network,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -130,7 +130,7 @@ class Chef
         set_or_return(
           :bootproto,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -138,7 +138,7 @@ class Chef
         set_or_return(
           :onparent,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
     end
diff --git a/lib/chef/resource/link.rb b/lib/chef/resource/link.rb
index a85e9eb058..5717ec7bad 100644
--- a/lib/chef/resource/link.rb
+++ b/lib/chef/resource/link.rb
@@ -44,7 +44,7 @@ class Chef
         set_or_return(
           :to,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -52,7 +52,7 @@ class Chef
         set_or_return(
           :target_file,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -61,7 +61,7 @@ class Chef
         set_or_return(
           :link_type,
           real_arg,
-          :equal_to => [ :symbolic, :hard ],
+          :equal_to => [ :symbolic, :hard ]
         )
       end
 
@@ -69,7 +69,7 @@ class Chef
         set_or_return(
           :group,
           arg,
-          :regex => Chef::Config[:group_valid_regex],
+          :regex => Chef::Config[:group_valid_regex]
         )
       end
 
@@ -77,7 +77,7 @@ class Chef
         set_or_return(
           :owner,
           arg,
-          :regex => Chef::Config[:user_valid_regex],
+          :regex => Chef::Config[:user_valid_regex]
         )
       end
 
diff --git a/lib/chef/resource/log.rb b/lib/chef/resource/log.rb
index a9b288a210..8f7879872f 100644
--- a/lib/chef/resource/log.rb
+++ b/lib/chef/resource/log.rb
@@ -58,7 +58,7 @@ class Chef
         set_or_return(
           :message,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -67,7 +67,7 @@ class Chef
         set_or_return(
           :level,
           arg,
-          :equal_to => [ :debug, :info, :warn, :error, :fatal ],
+          :equal_to => [ :debug, :info, :warn, :error, :fatal ]
         )
       end
 
diff --git a/lib/chef/resource/macosx_service.rb b/lib/chef/resource/macosx_service.rb
index c2d05e5991..08c748bead 100644
--- a/lib/chef/resource/macosx_service.rb
+++ b/lib/chef/resource/macosx_service.rb
@@ -41,7 +41,7 @@ class Chef
         set_or_return(
           :plist,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -49,7 +49,7 @@ class Chef
         set_or_return(
           :session_type,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
diff --git a/lib/chef/resource/mdadm.rb b/lib/chef/resource/mdadm.rb
index efdd448101..061a0ef73e 100644
--- a/lib/chef/resource/mdadm.rb
+++ b/lib/chef/resource/mdadm.rb
@@ -46,7 +46,7 @@ class Chef
         set_or_return(
           :chunk,
           arg,
-          :kind_of => [ Integer ],
+          :kind_of => [ Integer ]
         )
       end
 
@@ -54,7 +54,7 @@ class Chef
         set_or_return(
           :devices,
           arg,
-          :kind_of => [ Array ],
+          :kind_of => [ Array ]
         )
       end
 
@@ -62,7 +62,7 @@ class Chef
         set_or_return(
           :exists,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -70,7 +70,7 @@ class Chef
         set_or_return(
           :level,
           arg,
-          :kind_of => [ Integer ],
+          :kind_of => [ Integer ]
         )
       end
 
@@ -78,7 +78,7 @@ class Chef
         set_or_return(
           :metadata,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -86,7 +86,7 @@ class Chef
         set_or_return(
           :bitmap,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -94,7 +94,7 @@ class Chef
         set_or_return(
           :raid_device,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
diff --git a/lib/chef/resource/mount.rb b/lib/chef/resource/mount.rb
index 7bbff57f50..44143d583c 100644
--- a/lib/chef/resource/mount.rb
+++ b/lib/chef/resource/mount.rb
@@ -52,7 +52,7 @@ class Chef
         set_or_return(
           :mount_point,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -60,7 +60,7 @@ class Chef
         set_or_return(
           :device,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -74,7 +74,7 @@ class Chef
         set_or_return(
           :device_type,
           real_arg,
-          :equal_to => valid_devices,
+          :equal_to => valid_devices
         )
       end
 
@@ -82,7 +82,7 @@ class Chef
         set_or_return(
           :fsck_device,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -90,7 +90,7 @@ class Chef
         set_or_return(
           :fstype,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -98,7 +98,7 @@ class Chef
         ret = set_or_return(
                             :options,
                             arg,
-                            :kind_of => [ Array, String ],
+                            :kind_of => [ Array, String ]
                             )
 
         if ret.is_a? String
@@ -112,7 +112,7 @@ class Chef
         set_or_return(
           :dump,
           arg,
-          :kind_of => [ Integer, FalseClass ],
+          :kind_of => [ Integer, FalseClass ]
         )
       end
 
@@ -120,7 +120,7 @@ class Chef
         set_or_return(
           :pass,
           arg,
-          :kind_of => [ Integer, FalseClass ],
+          :kind_of => [ Integer, FalseClass ]
         )
       end
 
@@ -128,7 +128,7 @@ class Chef
         set_or_return(
           :mounted,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -136,7 +136,7 @@ class Chef
         set_or_return(
           :enabled,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -154,7 +154,7 @@ class Chef
         set_or_return(
           :username,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -162,7 +162,7 @@ class Chef
         set_or_return(
           :password,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -170,7 +170,7 @@ class Chef
         set_or_return(
           :domain,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
diff --git a/lib/chef/resource/ohai.rb b/lib/chef/resource/ohai.rb
index 5211e2f3bc..09cd22efc5 100644
--- a/lib/chef/resource/ohai.rb
+++ b/lib/chef/resource/ohai.rb
@@ -37,7 +37,7 @@ class Chef
         set_or_return(
           :plugin,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -45,7 +45,7 @@ class Chef
         set_or_return(
           :name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
     end
diff --git a/lib/chef/resource/osx_profile.rb b/lib/chef/resource/osx_profile.rb
index 920d09a83a..8142e1fd96 100644
--- a/lib/chef/resource/osx_profile.rb
+++ b/lib/chef/resource/osx_profile.rb
@@ -41,7 +41,7 @@ class Chef
         set_or_return(
           :profile_name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -49,7 +49,7 @@ class Chef
         set_or_return(
           :profile,
           arg,
-          :kind_of => [ String, Hash ],
+          :kind_of => [ String, Hash ]
         )
       end
 
@@ -57,7 +57,7 @@ class Chef
         set_or_return(
           :identifier,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -65,7 +65,7 @@ class Chef
         set_or_return(
           :path,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
diff --git a/lib/chef/resource/powershell_script.rb b/lib/chef/resource/powershell_script.rb
index e66db9fa55..a530a9116c 100644
--- a/lib/chef/resource/powershell_script.rb
+++ b/lib/chef/resource/powershell_script.rb
@@ -31,7 +31,7 @@ class Chef
         set_or_return(
           :convert_boolean_return,
           arg,
-          :kind_of => [ FalseClass, TrueClass ],
+          :kind_of => [ FalseClass, TrueClass ]
         )
       end
 
diff --git a/lib/chef/resource/registry_key.rb b/lib/chef/resource/registry_key.rb
index 135e63d959..d11f826c38 100644
--- a/lib/chef/resource/registry_key.rb
+++ b/lib/chef/resource/registry_key.rb
@@ -71,7 +71,7 @@ class Chef
         set_or_return(
           :key,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -105,7 +105,7 @@ class Chef
         set_or_return(
           :recursive,
           arg,
-          :kind_of => [TrueClass, FalseClass],
+          :kind_of => [TrueClass, FalseClass]
         )
       end
 
@@ -113,7 +113,7 @@ class Chef
         set_or_return(
           :architecture,
           arg,
-          :kind_of => Symbol,
+          :kind_of => Symbol
         )
       end
 
diff --git a/lib/chef/resource/remote_directory.rb b/lib/chef/resource/remote_directory.rb
index 600ee5138e..6e2928f3eb 100644
--- a/lib/chef/resource/remote_directory.rb
+++ b/lib/chef/resource/remote_directory.rb
@@ -57,7 +57,7 @@ class Chef
         set_or_return(
           :source,
           args,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -65,7 +65,7 @@ class Chef
         set_or_return(
           :files_backup,
           arg,
-          :kind_of => [ Integer, FalseClass ],
+          :kind_of => [ Integer, FalseClass ]
         )
       end
 
@@ -73,7 +73,7 @@ class Chef
         set_or_return(
           :purge,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -81,7 +81,7 @@ class Chef
         set_or_return(
           :files_group,
           arg,
-          :regex => Chef::Config[:group_valid_regex],
+          :regex => Chef::Config[:group_valid_regex]
         )
       end
 
@@ -89,7 +89,7 @@ class Chef
         set_or_return(
           :files_mode,
           arg,
-          :regex => /^\d{3,4}$/,
+          :regex => /^\d{3,4}$/
         )
       end
 
@@ -97,7 +97,7 @@ class Chef
         set_or_return(
           :files_owner,
           arg,
-          :regex => Chef::Config[:user_valid_regex],
+          :regex => Chef::Config[:user_valid_regex]
         )
       end
 
@@ -105,7 +105,7 @@ class Chef
         set_or_return(
           :overwrite,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -113,7 +113,7 @@ class Chef
         set_or_return(
           :cookbook,
           args,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
diff --git a/lib/chef/resource/remote_file.rb b/lib/chef/resource/remote_file.rb
index 933092ec82..b42cf4ba5f 100644
--- a/lib/chef/resource/remote_file.rb
+++ b/lib/chef/resource/remote_file.rb
@@ -76,7 +76,7 @@ class Chef
         set_or_return(
           :checksum,
           args,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -92,7 +92,7 @@ class Chef
         set_or_return(
           :use_etag,
           args,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -102,7 +102,7 @@ class Chef
         set_or_return(
           :use_last_modified,
           args,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -110,7 +110,7 @@ class Chef
         set_or_return(
           :ftp_active_mode,
           args,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -118,7 +118,7 @@ class Chef
         set_or_return(
           :headers,
           args,
-          :kind_of => Hash,
+          :kind_of => Hash
         )
       end
 
diff --git a/lib/chef/resource/route.rb b/lib/chef/resource/route.rb
index bbfbada674..0117a8bfc0 100644
--- a/lib/chef/resource/route.rb
+++ b/lib/chef/resource/route.rb
@@ -48,7 +48,7 @@ class Chef
         set_or_return(
           :networking,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -56,7 +56,7 @@ class Chef
         set_or_return(
           :networking_ipv6,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -64,7 +64,7 @@ class Chef
         set_or_return(
           :hostname,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -72,7 +72,7 @@ class Chef
         set_or_return(
           :domainname,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -80,7 +80,7 @@ class Chef
         set_or_return(
           :domain,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -88,7 +88,7 @@ class Chef
         set_or_return(
           :target,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -96,7 +96,7 @@ class Chef
         set_or_return(
           :netmask,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -104,7 +104,7 @@ class Chef
         set_or_return(
           :gateway,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -112,7 +112,7 @@ class Chef
         set_or_return(
           :metric,
           arg,
-          :kind_of => Integer,
+          :kind_of => Integer
         )
       end
 
@@ -120,7 +120,7 @@ class Chef
         set_or_return(
           :device,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -129,7 +129,7 @@ class Chef
         set_or_return(
           :route_type,
           real_arg,
-          :equal_to => [ :host, :net ],
+          :equal_to => [ :host, :net ]
         )
       end
     end
diff --git a/lib/chef/resource/ruby_block.rb b/lib/chef/resource/ruby_block.rb
index 7bb433b330..0e3a980b11 100644
--- a/lib/chef/resource/ruby_block.rb
+++ b/lib/chef/resource/ruby_block.rb
@@ -45,7 +45,7 @@ class Chef
         set_or_return(
           :block_name,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
     end
diff --git a/lib/chef/resource/scm.rb b/lib/chef/resource/scm.rb
index 4ba31cd31b..1e8c71e59d 100644
--- a/lib/chef/resource/scm.rb
+++ b/lib/chef/resource/scm.rb
@@ -45,7 +45,7 @@ class Chef
         set_or_return(
           :destination,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -53,7 +53,7 @@ class Chef
         set_or_return(
           :repository,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -61,7 +61,7 @@ class Chef
         set_or_return(
           :revision,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -69,7 +69,7 @@ class Chef
         set_or_return(
           :user,
           arg,
-          :kind_of => [String, Integer],
+          :kind_of => [String, Integer]
         )
       end
 
@@ -77,7 +77,7 @@ class Chef
         set_or_return(
           :group,
           arg,
-          :kind_of => [String, Integer],
+          :kind_of => [String, Integer]
         )
       end
 
@@ -85,7 +85,7 @@ class Chef
         set_or_return(
           :svn_username,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -93,7 +93,7 @@ class Chef
         set_or_return(
           :svn_password,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -102,7 +102,7 @@ class Chef
         set_or_return(
           :svn_arguments,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -119,7 +119,7 @@ class Chef
         set_or_return(
           :depth,
           arg,
-          :kind_of => Integer,
+          :kind_of => Integer
         )
       end
 
@@ -127,7 +127,7 @@ class Chef
         set_or_return(
           :enable_submodules,
           arg,
-          :kind_of => [TrueClass, FalseClass],
+          :kind_of => [TrueClass, FalseClass]
         )
       end
 
@@ -135,7 +135,7 @@ class Chef
         set_or_return(
           :enable_checkout,
           arg,
-          :kind_of => [TrueClass, FalseClass],
+          :kind_of => [TrueClass, FalseClass]
         )
       end
 
@@ -143,7 +143,7 @@ class Chef
         set_or_return(
           :remote,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -151,7 +151,7 @@ class Chef
         set_or_return(
           :ssh_wrapper,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -159,7 +159,7 @@ class Chef
         set_or_return(
           :timeout,
           arg,
-          :kind_of => Integer,
+          :kind_of => Integer
         )
       end
 
@@ -167,7 +167,7 @@ class Chef
         set_or_return(
           :checkout_branch,
           arg,
-          :kind_of => String,
+          :kind_of => String
         )
       end
 
@@ -175,7 +175,7 @@ class Chef
         set_or_return(
           :environment,
           arg,
-          :kind_of => [ Hash ],
+          :kind_of => [ Hash ]
         )
       end
 
diff --git a/lib/chef/resource/script.rb b/lib/chef/resource/script.rb
index d80effbf67..5173a76542 100644
--- a/lib/chef/resource/script.rb
+++ b/lib/chef/resource/script.rb
@@ -49,7 +49,7 @@ class Chef
         set_or_return(
           :code,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -57,7 +57,7 @@ class Chef
         set_or_return(
           :interpreter,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -65,7 +65,7 @@ class Chef
         set_or_return(
           :flags,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
diff --git a/lib/chef/resource/service.rb b/lib/chef/resource/service.rb
index 5288e1b2be..849afebad0 100644
--- a/lib/chef/resource/service.rb
+++ b/lib/chef/resource/service.rb
@@ -52,7 +52,7 @@ class Chef
         set_or_return(
           :service_name,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -61,7 +61,7 @@ class Chef
         set_or_return(
           :pattern,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -70,7 +70,7 @@ class Chef
         set_or_return(
           :start_command,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -79,7 +79,7 @@ class Chef
         set_or_return(
           :stop_command,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -88,7 +88,7 @@ class Chef
         set_or_return(
           :status_command,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -97,7 +97,7 @@ class Chef
         set_or_return(
           :restart_command,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -105,7 +105,7 @@ class Chef
         set_or_return(
           :reload_command,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -118,7 +118,7 @@ class Chef
         set_or_return(
           :init_command,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -127,7 +127,7 @@ class Chef
         set_or_return(
           :enabled,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -136,7 +136,7 @@ class Chef
         set_or_return(
           :running,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -154,7 +154,7 @@ class Chef
         set_or_return(
           :priority,
           arg,
-          :kind_of => [ Integer, String, Hash ],
+          :kind_of => [ Integer, String, Hash ]
         )
       end
 
@@ -163,7 +163,7 @@ class Chef
         set_or_return(
           :timeout,
           arg,
-          :kind_of => Integer,
+          :kind_of => Integer
         )
       end
 
@@ -171,7 +171,7 @@ class Chef
         set_or_return(
           :parameters,
           arg,
-          :kind_of => [ Hash ],
+          :kind_of => [ Hash ]
         )
       end
 
diff --git a/lib/chef/resource/template.rb b/lib/chef/resource/template.rb
index 0b9d86f242..e33af3174b 100644
--- a/lib/chef/resource/template.rb
+++ b/lib/chef/resource/template.rb
@@ -45,7 +45,7 @@ class Chef
         set_or_return(
           :source,
           file,
-          :kind_of => [ String, Array ],
+          :kind_of => [ String, Array ]
         )
       end
 
@@ -53,7 +53,7 @@ class Chef
         set_or_return(
           :variables,
           args,
-          :kind_of => [ Hash ],
+          :kind_of => [ Hash ]
         )
       end
 
@@ -61,7 +61,7 @@ class Chef
         set_or_return(
           :cookbook,
           args,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -69,7 +69,7 @@ class Chef
         set_or_return(
           :local,
           args,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
diff --git a/lib/chef/resource/user.rb b/lib/chef/resource/user.rb
index 5aa94ae49e..012fa278f1 100644
--- a/lib/chef/resource/user.rb
+++ b/lib/chef/resource/user.rb
@@ -53,7 +53,7 @@ class Chef
         set_or_return(
           :username,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -61,7 +61,7 @@ class Chef
         set_or_return(
           :comment,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -69,7 +69,7 @@ class Chef
         set_or_return(
           :uid,
           arg,
-          :kind_of => [ String, Integer ],
+          :kind_of => [ String, Integer ]
         )
       end
 
@@ -77,7 +77,7 @@ class Chef
         set_or_return(
           :gid,
           arg,
-          :kind_of => [ String, Integer ],
+          :kind_of => [ String, Integer ]
         )
       end
 
@@ -87,7 +87,7 @@ class Chef
         set_or_return(
           :home,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -95,7 +95,7 @@ class Chef
         set_or_return(
           :shell,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -103,7 +103,7 @@ class Chef
         set_or_return(
           :password,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -111,7 +111,7 @@ class Chef
         set_or_return(
           :salt,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -119,7 +119,7 @@ class Chef
         set_or_return(
           :iterations,
           arg,
-          :kind_of => [ Integer ],
+          :kind_of => [ Integer ]
         )
       end
 
@@ -127,7 +127,7 @@ class Chef
         set_or_return(
           :system,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -135,7 +135,7 @@ class Chef
         set_or_return(
           :manage_home,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -143,7 +143,7 @@ class Chef
         set_or_return(
           :force,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
@@ -151,7 +151,7 @@ class Chef
         set_or_return(
           :non_unique,
           arg,
-          :kind_of => [ TrueClass, FalseClass ],
+          :kind_of => [ TrueClass, FalseClass ]
         )
       end
 
diff --git a/lib/chef/resource/windows_script.rb b/lib/chef/resource/windows_script.rb
index 44f1d8d652..7c39d9fba0 100644
--- a/lib/chef/resource/windows_script.rb
+++ b/lib/chef/resource/windows_script.rb
@@ -45,7 +45,7 @@ class Chef
         result = set_or_return(
           :architecture,
           arg,
-          :kind_of => Symbol,
+          :kind_of => Symbol
         )
       end
 
diff --git a/lib/chef/resource/windows_service.rb b/lib/chef/resource/windows_service.rb
index 635edbb389..405f7f6dbe 100644
--- a/lib/chef/resource/windows_service.rb
+++ b/lib/chef/resource/windows_service.rb
@@ -47,7 +47,7 @@ class Chef
         set_or_return(
           :startup_type,
           arg,
-          :equal_to => [ :automatic, :manual, :disabled ],
+          :equal_to => [ :automatic, :manual, :disabled ]
         )
       end
 
@@ -55,7 +55,7 @@ class Chef
         set_or_return(
           :run_as_user,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
 
@@ -63,7 +63,7 @@ class Chef
         set_or_return(
           :run_as_password,
           arg,
-          :kind_of => [ String ],
+          :kind_of => [ String ]
         )
       end
     end
diff --git a/lib/chef/role.rb b/lib/chef/role.rb
index bac054143e..ed22bc87e4 100644
--- a/lib/chef/role.rb
+++ b/lib/chef/role.rb
@@ -57,7 +57,7 @@ class Chef
       set_or_return(
         :name,
         arg,
-        :regex => /^[\-[:alnum:]_]+$/,
+        :regex => /^[\-[:alnum:]_]+$/
       )
     end
 
@@ -65,7 +65,7 @@ class Chef
       set_or_return(
         :description,
         arg,
-        :kind_of => String,
+        :kind_of => String
       )
     end
 
@@ -120,7 +120,7 @@ class Chef
       set_or_return(
         :default_attributes,
         arg,
-        :kind_of => Hash,
+        :kind_of => Hash
       )
     end
 
@@ -128,7 +128,7 @@ class Chef
       set_or_return(
         :override_attributes,
         arg,
-        :kind_of => Hash,
+        :kind_of => Hash
       )
     end