Style/EmptyMethod

Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>

36 files changed, 183 insertions, 366 deletions

diff --git a/chef-config/lib/chef-config/logger.rb b/chef-config/lib/chef-config/logger.rb
index 69d7889f88..3fc389f54b 100644
--- a/chef-config/lib/chef-config/logger.rb
+++ b/chef-config/lib/chef-config/logger.rb
@@ -21,32 +21,23 @@ module ChefConfig
   # logger for `ChefConfig.logger`
   class NullLogger
 
-    def <<(_msg)
-    end
+    def <<(_msg); end
 
-    def add(_severity, _message = nil, _progname = nil)
-    end
+    def add(_severity, _message = nil, _progname = nil); end
 
-    def trace(_progname = nil, &block)
-    end
+    def trace(_progname = nil, &block); end
 
-    def debug(_progname = nil, &block)
-    end
+    def debug(_progname = nil, &block); end
 
-    def info(_progname = nil, &block)
-    end
+    def info(_progname = nil, &block); end
 
-    def warn(_progname = nil, &block)
-    end
+    def warn(_progname = nil, &block); end
 
-    def deprecation(_progname = nil, &block)
-    end
+    def deprecation(_progname = nil, &block); end
 
-    def error(_progname = nil, &block)
-    end
+    def error(_progname = nil, &block); end
 
-    def fatal(_progname = nil, &block)
-    end
+    def fatal(_progname = nil, &block); end
 
   end
 
diff --git a/lib/chef/event_dispatch/base.rb b/lib/chef/event_dispatch/base.rb
index be51cf362f..cb1cc80017 100644
--- a/lib/chef/event_dispatch/base.rb
+++ b/lib/chef/event_dispatch/base.rb
@@ -29,268 +29,206 @@ class Chef
     class Base
 
       # Called at the very start of a Chef Run
-      def run_start(version, run_status)
-      end
+      def run_start(version, run_status); end
 
-      def run_started(run_status)
-      end
+      def run_started(run_status); end
 
       # Called at the end a successful Chef run.
-      def run_completed(node, run_status)
-      end
+      def run_completed(node, run_status); end
 
       # Called at the end of a failed Chef run.
-      def run_failed(exception, run_status)
-      end
+      def run_failed(exception, run_status); end
 
       # Called right after ohai runs.
       # NOTE: the node object here is always nil because of when it is called
-      def ohai_completed(node)
-      end
+      def ohai_completed(node); end
 
       # Announce that we're not going to register the client. Generally because
       # we already have the private key, or because we're deliberately not using
       # a key.
-      def skipping_registration(node_name, config)
-      end
+      def skipping_registration(node_name, config); end
 
       # About to attempt to create a private key registered to the server with
       # client +node_name+.
-      def registration_start(node_name, config)
-      end
+      def registration_start(node_name, config); end
 
       # Successfully created the private key and registered this client with the
       # server.
-      def registration_completed
-      end
+      def registration_completed; end
 
       # Failed to register this client with the server.
-      def registration_failed(node_name, exception, config)
-      end
+      def registration_failed(node_name, exception, config); end
 
       # Called before Chef client loads the node data from the server
-      def node_load_start(node_name, config)
-      end
+      def node_load_start(node_name, config); end
 
       # TODO: def node_run_list_overridden(*args)
 
       # Called once the node is loaded by the policy builder
-      def node_load_success(node)
-      end
+      def node_load_success(node); end
 
       # Failed to load node data from the server
-      def node_load_failed(node_name, exception, config)
-      end
+      def node_load_failed(node_name, exception, config); end
 
       # Error expanding the run list
-      def run_list_expand_failed(node, exception)
-      end
+      def run_list_expand_failed(node, exception); end
 
       # Called after Chef client has loaded the node data.
       # Default and override attrs from roles have been computed, but not yet applied.
       # Normal attrs from JSON have been added to the node.
-      def node_load_completed(node, expanded_run_list, config)
-      end
+      def node_load_completed(node, expanded_run_list, config); end
 
       # Called after the Policyfile was loaded. This event only occurs when
       # chef is in policyfile mode.
-      def policyfile_loaded(policy)
-      end
+      def policyfile_loaded(policy); end
 
       # Called before the cookbook collection is fetched from the server.
-      def cookbook_resolution_start(expanded_run_list)
-      end
+      def cookbook_resolution_start(expanded_run_list); end
 
       # Called when there is an error getting the cookbook collection from the
       # server.
-      def cookbook_resolution_failed(expanded_run_list, exception)
-      end
+      def cookbook_resolution_failed(expanded_run_list, exception); end
 
       # Called when the cookbook collection is returned from the server.
-      def cookbook_resolution_complete(cookbook_collection)
-      end
+      def cookbook_resolution_complete(cookbook_collection); end
 
       # Called before unneeded cookbooks are removed
-      def cookbook_clean_start
-      end
+      def cookbook_clean_start; end
 
       # Called after the file at +path+ is removed. It may be removed if the
       # cookbook containing it was removed from the run list, or if the file was
       # removed from the cookbook.
-      def removed_cookbook_file(path)
-      end
+      def removed_cookbook_file(path); end
 
       # Called when cookbook cleaning is finished.
-      def cookbook_clean_complete
-      end
+      def cookbook_clean_complete; end
 
       # Called before cookbook sync starts
-      def cookbook_sync_start(cookbook_count)
-      end
+      def cookbook_sync_start(cookbook_count); end
 
       # Called when cookbook +cookbook+ has been sync'd
-      def synchronized_cookbook(cookbook_name, cookbook)
-      end
+      def synchronized_cookbook(cookbook_name, cookbook); end
 
       # Called when an individual file in a cookbook has been updated
-      def updated_cookbook_file(cookbook_name, path)
-      end
+      def updated_cookbook_file(cookbook_name, path); end
 
       # Called when an error occurs during cookbook sync
-      def cookbook_sync_failed(cookbooks, exception)
-      end
+      def cookbook_sync_failed(cookbooks, exception); end
 
       # Called after all cookbooks have been sync'd.
-      def cookbook_sync_complete
-      end
+      def cookbook_sync_complete; end
 
       # Called when starting to collect gems from the cookbooks
-      def cookbook_gem_start(gems)
-      end
+      def cookbook_gem_start(gems); end
 
       # Called when the result of installing the bundle is to install the gem
-      def cookbook_gem_installing(gem, version)
-      end
+      def cookbook_gem_installing(gem, version); end
 
       # Called when the result of installing the bundle is to use the gem
-      def cookbook_gem_using(gem, version)
-      end
+      def cookbook_gem_using(gem, version); end
 
       # Called when finished installing cookbook gems
-      def cookbook_gem_finished
-      end
+      def cookbook_gem_finished; end
 
       # Called when cookbook gem installation fails
-      def cookbook_gem_failed(exception)
-      end
+      def cookbook_gem_failed(exception); end
 
       ## TODO: add cookbook name to the API for file load callbacks
 
       ## TODO: add callbacks for overall cookbook eval start and complete.
 
       # Called immediately after creating the run_context and before any cookbook compilation happens
-      def cookbook_compilation_start(run_context)
-      end
+      def cookbook_compilation_start(run_context); end
 
       # Called when library file loading starts
-      def library_load_start(file_count)
-      end
+      def library_load_start(file_count); end
 
       # Called when library file has been loaded
-      def library_file_loaded(path)
-      end
+      def library_file_loaded(path); end
 
       # Called when a library file has an error on load.
-      def library_file_load_failed(path, exception)
-      end
+      def library_file_load_failed(path, exception); end
 
       # Called when library file loading has finished
-      def library_load_complete
-      end
+      def library_load_complete; end
 
       # Called when LWRP loading starts
-      def lwrp_load_start(lwrp_file_count)
-      end
+      def lwrp_load_start(lwrp_file_count); end
 
       # Called after a LWR or LWP has been loaded
-      def lwrp_file_loaded(path)
-      end
+      def lwrp_file_loaded(path); end
 
       # Called after a LWR or LWP file errors on load
-      def lwrp_file_load_failed(path, exception)
-      end
+      def lwrp_file_load_failed(path, exception); end
 
       # Called when LWRPs are finished loading
-      def lwrp_load_complete
-      end
+      def lwrp_load_complete; end
 
       # Called when an ohai plugin file loading starts
-      def ohai_plugin_load_start(file_count)
-      end
+      def ohai_plugin_load_start(file_count); end
 
       # Called when an ohai plugin file has been loaded
-      def ohai_plugin_file_loaded(path)
-      end
+      def ohai_plugin_file_loaded(path); end
 
       # Called when an ohai plugin file has an error on load.
-      def ohai_plugin_file_load_failed(path, exception)
-      end
+      def ohai_plugin_file_load_failed(path, exception); end
 
       # Called when an ohai plugin file loading has finished
-      def ohai_plugin_load_complete
-      end
+      def ohai_plugin_load_complete; end
 
       # Called before attribute files are loaded
-      def attribute_load_start(attribute_file_count)
-      end
+      def attribute_load_start(attribute_file_count); end
 
       # Called after the attribute file is loaded
-      def attribute_file_loaded(path)
-      end
+      def attribute_file_loaded(path); end
 
       # Called when an attribute file fails to load.
-      def attribute_file_load_failed(path, exception)
-      end
+      def attribute_file_load_failed(path, exception); end
 
       # Called when attribute file loading is finished
-      def attribute_load_complete
-      end
+      def attribute_load_complete; end
 
       # Called before resource definitions are loaded
-      def definition_load_start(definition_file_count)
-      end
+      def definition_load_start(definition_file_count); end
 
       # Called when a resource definition has been loaded
-      def definition_file_loaded(path)
-      end
+      def definition_file_loaded(path); end
 
       # Called when a resource definition file fails to load
-      def definition_file_load_failed(path, exception)
-      end
+      def definition_file_load_failed(path, exception); end
 
       # Called when resource definitions are done loading
-      def definition_load_complete
-      end
+      def definition_load_complete; end
 
       # Called before recipes are loaded
-      def recipe_load_start(recipe_count)
-      end
+      def recipe_load_start(recipe_count); end
 
       # Called after the recipe has been loaded
-      def recipe_file_loaded(path, recipe)
-      end
+      def recipe_file_loaded(path, recipe); end
 
       # Called after a recipe file fails to load
-      def recipe_file_load_failed(path, exception, recipe)
-      end
+      def recipe_file_load_failed(path, exception, recipe); end
 
       # Called when a recipe cannot be resolved
-      def recipe_not_found(exception)
-      end
+      def recipe_not_found(exception); end
 
       # Called when recipes have been loaded.
-      def recipe_load_complete
-      end
+      def recipe_load_complete; end
 
       # This is called after all cookbook compilation phases are completed.
-      def cookbook_compilation_complete(run_context)
-      end
+      def cookbook_compilation_complete(run_context); end
 
       # Called before convergence starts
-      def converge_start(run_context)
-      end
+      def converge_start(run_context); end
 
       # Callback hook for handlers to register their interest in the action_collection
-      def action_collection_registration(action_collection)
-      end
+      def action_collection_registration(action_collection); end
 
       # Called when the converge phase is finished.
-      def converge_complete
-      end
+      def converge_complete; end
 
       # Called if the converge phase fails
-      def converge_failed(exception)
-      end
+      def converge_failed(exception); end
 
       # TODO: need events for notification resolve?
       # def notifications_resolved
@@ -320,112 +258,88 @@ class Chef
       #
 
       # Called before action is executed on a resource.
-      def resource_action_start(resource, action, notification_type = nil, notifier = nil)
-      end
+      def resource_action_start(resource, action, notification_type = nil, notifier = nil); end
 
       # Called when a resource action has been skipped b/c of a conditional
-      def resource_skipped(resource, action, conditional)
-      end
+      def resource_skipped(resource, action, conditional); end
 
       # Called after #load_current_resource has run.
-      def resource_current_state_loaded(resource, action, current_resource)
-      end
+      def resource_current_state_loaded(resource, action, current_resource); end
 
       # Called when resource current state load is skipped due to the provider
       # not supporting whyrun mode.
-      def resource_current_state_load_bypassed(resource, action, current_resource)
-      end
+      def resource_current_state_load_bypassed(resource, action, current_resource); end
 
       # Called when evaluating a resource that does not support whyrun in whyrun mode
-      def resource_bypassed(resource, action, current_resource)
-      end
+      def resource_bypassed(resource, action, current_resource); end
 
       # Called when a change has been made to a resource. May be called multiple
       # times per resource, e.g., a file may have its content updated, and then
       # its permissions updated.
-      def resource_update_applied(resource, action, update)
-      end
+      def resource_update_applied(resource, action, update); end
 
       # Called when a progress notification should be sent to the user to
       # indicate the overall progress of a long running operation, such as
       # a large file download.
-      def resource_update_progress(resource, current, total, interval)
-      end
+      def resource_update_progress(resource, current, total, interval); end
 
       # Called when a resource fails, but will retry.
-      def resource_failed_retriable(resource, action, retry_count, exception)
-      end
+      def resource_failed_retriable(resource, action, retry_count, exception); end
 
       # Called when a resource fails and will not be retried.
-      def resource_failed(resource, action, exception)
-      end
+      def resource_failed(resource, action, exception); end
 
       # Called after a resource has been completely converged, but only if
       # modifications were made.
-      def resource_updated(resource, action)
-      end
+      def resource_updated(resource, action); end
 
       # Called when a resource has no converge actions, e.g., it was already correct.
-      def resource_up_to_date(resource, action)
-      end
+      def resource_up_to_date(resource, action); end
 
       # Called when a resource action has been completed
-      def resource_completed(resource)
-      end
+      def resource_completed(resource); end
 
       # A stream has opened.
-      def stream_opened(stream, options = {})
-      end
+      def stream_opened(stream, options = {}); end
 
       # A stream has closed.
-      def stream_closed(stream, options = {})
-      end
+      def stream_closed(stream, options = {}); end
 
       # A chunk of data from a stream.  The stream is managed by "stream," which
       # can be any tag whatsoever.  Data in different "streams" may not be placed
       # on the same line or even sent to the same console.
-      def stream_output(stream, output, options = {})
-      end
+      def stream_output(stream, output, options = {}); end
 
       # Called before handlers run
-      def handlers_start(handler_count)
-      end
+      def handlers_start(handler_count); end
 
       # Called after an individual handler has run
-      def handler_executed(handler)
-      end
+      def handler_executed(handler); end
 
       # Called after all handlers have executed
-      def handlers_completed
-      end
+      def handlers_completed; end
 
       # Called when an assertion declared by a provider fails
-      def provider_requirement_failed(action, resource, exception, message)
-      end
+      def provider_requirement_failed(action, resource, exception, message); end
 
       # Called when a provider makes an assumption after a failed assertion
       # in whyrun mode, in order to allow execution to continue
-      def whyrun_assumption(action, resource, message)
-      end
+      def whyrun_assumption(action, resource, message); end
 
       # Emit a message about something being deprecated.
-      def deprecation(message, location = caller(2..2)[0])
-      end
+      def deprecation(message, location = caller(2..2)[0]); end
 
-      def run_list_expanded(run_list_expansion)
-      end
+      def run_list_expanded(run_list_expansion); end
 
       # An uncategorized message. This supports the case that a user needs to
       # pass output that doesn't fit into one of the callbacks above. Note that
       # there's no semantic information about the content or importance of the
       # message. That means that if you're using this too often, you should add a
       # callback for it.
-      def msg(message)
-      end
+      def msg(message); end
 
       # Called when an attribute is changed by simple assignment
-      def attribute_changed(precedence, keys, value)
-      end
+      def attribute_changed(precedence, keys, value); end
     end
   end
 end
diff --git a/lib/chef/formatters/base.rb b/lib/chef/formatters/base.rb
index a295e1390d..95170936a6 100644
--- a/lib/chef/formatters/base.rb
+++ b/lib/chef/formatters/base.rb
@@ -146,8 +146,7 @@ class Chef
       # Formatters::Base can implement #file_loaded to do the same thing for
       # every kind of file that Chef loads from a recipe instead of
       # implementing all the per-filetype callbacks.
-      def file_loaded(path)
-      end
+      def file_loaded(path); end
 
       # Generic callback for any attribute/library/lwrp/recipe file throwing an
       # exception when loaded. Default behavior is to use CompileErrorInspector
diff --git a/lib/chef/formatters/doc.rb b/lib/chef/formatters/doc.rb
index 43498cba1a..fa98c8ee37 100644
--- a/lib/chef/formatters/doc.rb
+++ b/lib/chef/formatters/doc.rb
@@ -93,23 +93,19 @@ class Chef
       end
 
       # Called right after ohai runs.
-      def ohai_completed(node)
-      end
+      def ohai_completed(node); end
 
       # Already have a client key, assuming this node has registered.
-      def skipping_registration(node_name, config)
-      end
+      def skipping_registration(node_name, config); end
 
       # About to attempt to register as +node_name+
       def registration_start(node_name, config)
         puts_line "Creating a new client identity for #{node_name} using the validator key."
       end
 
-      def registration_completed
-      end
+      def registration_completed; end
 
-      def node_load_start(node_name, config)
-      end
+      def node_load_start(node_name, config); end
 
       # Failed to load node data from the server
       def node_load_failed(node_name, exception, config)
@@ -118,8 +114,7 @@ class Chef
 
       # Default and override attrs from roles have been computed, but not yet applied.
       # Normal attrs from JSON have been added to the node.
-      def node_load_completed(node, expanded_run_list, config)
-      end
+      def node_load_completed(node, expanded_run_list, config); end
 
       def policyfile_loaded(policy)
         puts_line "Using policy '#{policy["name"]}' at revision '#{policy["revision_id"]}'"
@@ -137,22 +132,18 @@ class Chef
       end
 
       # Called when the cookbook collection is returned from the server.
-      def cookbook_resolution_complete(cookbook_collection)
-      end
+      def cookbook_resolution_complete(cookbook_collection); end
 
       # Called before unneeded cookbooks are removed
-      def cookbook_clean_start
-      end
+      def cookbook_clean_start; end
 
       # Called after the file at +path+ is removed. It may be removed if the
       # cookbook containing it was removed from the run list, or if the file was
       # removed from the cookbook.
-      def removed_cookbook_file(path)
-      end
+      def removed_cookbook_file(path); end
 
       # Called when cookbook cleaning is finished.
-      def cookbook_clean_complete
-      end
+      def cookbook_clean_complete; end
 
       # Called before cookbook sync starts
       def cookbook_sync_start(cookbook_count)
@@ -166,8 +157,7 @@ class Chef
       end
 
       # Called when an individual file in a cookbook has been updated
-      def updated_cookbook_file(cookbook_name, path)
-      end
+      def updated_cookbook_file(cookbook_name, path); end
 
       # Called after all cookbooks have been sync'd.
       def cookbook_sync_complete
@@ -206,12 +196,10 @@ class Chef
       end
 
       # Called after a file in a cookbook is loaded.
-      def file_loaded(path)
-      end
+      def file_loaded(path); end
 
       # Called when recipes have been loaded.
-      def recipe_load_complete
-      end
+      def recipe_load_complete; end
 
       # Called before convergence starts
       def converge_start(run_context)
@@ -263,8 +251,7 @@ class Chef
       end
 
       # Called when a resource fails, but will retry.
-      def resource_failed_retriable(resource, action, retry_count, exception)
-      end
+      def resource_failed_retriable(resource, action, retry_count, exception); end
 
       # Called when a resource fails and will not be retried.
       def resource_failed(resource, action, exception)
@@ -281,8 +268,7 @@ class Chef
       end
 
       # Called after #load_current_resource has run.
-      def resource_current_state_loaded(resource, action, current_resource)
-      end
+      def resource_current_state_loaded(resource, action, current_resource); end
 
       # Called when a resource has no converge actions, e.g., it was already correct.
       def resource_up_to_date(resource, action)
@@ -296,8 +282,7 @@ class Chef
         unindent
       end
 
-      def output_record(line)
-      end
+      def output_record(line); end
 
       # Called when a change has been made to a resource. May be called multiple
       # times per resource, e.g., a file may have its content updated, and then
diff --git a/lib/chef/formatters/minimal.rb b/lib/chef/formatters/minimal.rb
index 272a89bad0..a35a7e8057 100644
--- a/lib/chef/formatters/minimal.rb
+++ b/lib/chef/formatters/minimal.rb
@@ -44,36 +44,29 @@ class Chef
       end
 
       # Called right after ohai runs.
-      def ohai_completed(node)
-      end
+      def ohai_completed(node); end
 
       # Already have a client key, assuming this node has registered.
-      def skipping_registration(node_name, config)
-      end
+      def skipping_registration(node_name, config); end
 
       # About to attempt to register as +node_name+
-      def registration_start(node_name, config)
-      end
+      def registration_start(node_name, config); end
 
-      def registration_completed
-      end
+      def registration_completed; end
 
       # Failed to register this client with the server.
       def registration_failed(node_name, exception, config)
         super
       end
 
-      def node_load_start(node_name, config)
-      end
+      def node_load_start(node_name, config); end
 
       # Failed to load node data from the server
-      def node_load_failed(node_name, exception, config)
-      end
+      def node_load_failed(node_name, exception, config); end
 
       # Default and override attrs from roles have been computed, but not yet applied.
       # Normal attrs from JSON have been added to the node.
-      def node_load_completed(node, expanded_run_list, config)
-      end
+      def node_load_completed(node, expanded_run_list, config); end
 
       # Called before the cookbook collection is fetched from the server.
       def cookbook_resolution_start(expanded_run_list)
@@ -82,28 +75,23 @@ class Chef
 
       # Called when there is an error getting the cookbook collection from the
       # server.
-      def cookbook_resolution_failed(expanded_run_list, exception)
-      end
+      def cookbook_resolution_failed(expanded_run_list, exception); end
 
       # Called when the cookbook collection is returned from the server.
-      def cookbook_resolution_complete(cookbook_collection)
-      end
+      def cookbook_resolution_complete(cookbook_collection); end
 
       # Called before unneeded cookbooks are removed
       #--
       # TODO: Should be called in CookbookVersion.sync_cookbooks
-      def cookbook_clean_start
-      end
+      def cookbook_clean_start; end
 
       # Called after the file at +path+ is removed. It may be removed if the
       # cookbook containing it was removed from the run list, or if the file was
       # removed from the cookbook.
-      def removed_cookbook_file(path)
-      end
+      def removed_cookbook_file(path); end
 
       # Called when cookbook cleaning is finished.
-      def cookbook_clean_complete
-      end
+      def cookbook_clean_complete; end
 
       # Called before cookbook sync starts
       def cookbook_sync_start(cookbook_count)
@@ -116,8 +104,7 @@ class Chef
       end
 
       # Called when an individual file in a cookbook has been updated
-      def updated_cookbook_file(cookbook_name, path)
-      end
+      def updated_cookbook_file(cookbook_name, path); end
 
       # Called after all cookbooks have been sync'd.
       def cookbook_sync_complete
@@ -168,16 +155,13 @@ class Chef
       end
 
       # Called before action is executed on a resource.
-      def resource_action_start(resource, action, notification_type = nil, notifier = nil)
-      end
+      def resource_action_start(resource, action, notification_type = nil, notifier = nil); end
 
       # Called when a resource fails, but will retry.
-      def resource_failed_retriable(resource, action, retry_count, exception)
-      end
+      def resource_failed_retriable(resource, action, retry_count, exception); end
 
       # Called when a resource fails and will not be retried.
-      def resource_failed(resource, action, exception)
-      end
+      def resource_failed(resource, action, exception); end
 
       # Called when a resource action has been skipped b/c of a conditional
       def resource_skipped(resource, action, conditional)
@@ -185,8 +169,7 @@ class Chef
       end
 
       # Called after #load_current_resource has run.
-      def resource_current_state_loaded(resource, action, current_resource)
-      end
+      def resource_current_state_loaded(resource, action, current_resource); end
 
       # Called when a resource has no converge actions, e.g., it was already correct.
       def resource_up_to_date(resource, action)
@@ -211,24 +194,20 @@ class Chef
       end
 
       # Called before handlers run
-      def handlers_start(handler_count)
-      end
+      def handlers_start(handler_count); end
 
       # Called after an individual handler has run
-      def handler_executed(handler)
-      end
+      def handler_executed(handler); end
 
       # Called after all handlers have executed
-      def handlers_completed
-      end
+      def handlers_completed; end
 
       # An uncategorized message. This supports the case that a user needs to
       # pass output that doesn't fit into one of the callbacks above. Note that
       # there's no semantic information about the content or importance of the
       # message. That means that if you're using this too often, you should add a
       # callback for it.
-      def msg(message)
-      end
+      def msg(message); end
 
     end
   end
diff --git a/lib/chef/handler.rb b/lib/chef/handler.rb
index 6fabe98d1f..115110ce91 100644
--- a/lib/chef/handler.rb
+++ b/lib/chef/handler.rb
@@ -234,8 +234,7 @@ class Chef
 
     # The main entry point for report handling. Subclasses should override this
     # method with their own report handling logic.
-    def report
-    end
+    def report; end
 
     # Runs the report handler, rescuing and logging any errors it may cause.
     # This ensures that all handlers get a chance to run even if one fails.
diff --git a/lib/chef/http/api_versions.rb b/lib/chef/http/api_versions.rb
index e1eae4b468..a0486c934f 100644
--- a/lib/chef/http/api_versions.rb
+++ b/lib/chef/http/api_versions.rb
@@ -24,8 +24,7 @@ class Chef
     # and maximum supported API versions.
     class APIVersions
 
-      def initialize(options = {})
-      end
+      def initialize(options = {}); end
 
       def handle_request(method, url, headers = {}, data = false)
         [method, url, headers, data]
diff --git a/lib/chef/http/remote_request_id.rb b/lib/chef/http/remote_request_id.rb
index d4fb8eb115..95ce68a2d4 100644
--- a/lib/chef/http/remote_request_id.rb
+++ b/lib/chef/http/remote_request_id.rb
@@ -21,8 +21,7 @@ class Chef
   class HTTP
     class RemoteRequestID
 
-      def initialize(opts = {})
-      end
+      def initialize(opts = {}); end
 
       def handle_request(method, url, headers = {}, data = false)
         headers["X-REMOTE-REQUEST-ID"] = Chef::RequestID.instance.request_id
diff --git a/lib/chef/http/validate_content_length.rb b/lib/chef/http/validate_content_length.rb
index e5e514459f..d1585f7991 100644
--- a/lib/chef/http/validate_content_length.rb
+++ b/lib/chef/http/validate_content_length.rb
@@ -41,8 +41,7 @@ class Chef
         end
       end
 
-      def initialize(opts = {})
-      end
+      def initialize(opts = {}); end
 
       def handle_request(method, url, headers = {}, data = false)
         [method, url, headers, data]
diff --git a/lib/chef/knife/bootstrap.rb b/lib/chef/knife/bootstrap.rb
index ea0ff2d064..927b47ee0a 100644
--- a/lib/chef/knife/bootstrap.rb
+++ b/lib/chef/knife/bootstrap.rb
@@ -656,8 +656,7 @@ class Chef
         end
       end
 
-      def handle_ssh_error(e)
-      end
+      def handle_ssh_error(e); end
 
       # url values override CLI flags, if you provide both
       # we'll use the one that you gave in the URL.
@@ -787,16 +786,14 @@ class Chef
       # Plugins that subclass bootstrap, e.g. knife-ec2, can use this method to create connection objects
       #
       # @return [TrueClass] If instance successfully created, or exits
-      def plugin_setup!
-      end
+      def plugin_setup!; end
 
       # Perform any teardown or cleanup necessary by the plugin
       #
       # Plugins that subclass bootstrap, e.g. knife-ec2, can use this method to display a message or perform any cleanup
       #
       # @return [void]
-      def plugin_finalize
-      end
+      def plugin_finalize; end
 
       # If session_timeout is too short, it is likely
       # a holdover from "--winrm-session-timeout" which used
diff --git a/lib/chef/knife/null.rb b/lib/chef/knife/null.rb
index d3abbea4e9..7221eee9f5 100644
--- a/lib/chef/knife/null.rb
+++ b/lib/chef/knife/null.rb
@@ -6,8 +6,7 @@ class Chef
       # setting the category to deprecated keeps it out of help
       category "deprecated"
 
-      def run
-      end
+      def run; end
     end
   end
 end
diff --git a/lib/chef/log/syslog.rb b/lib/chef/log/syslog.rb
index dbc30da0e6..80efb8ab93 100644
--- a/lib/chef/log/syslog.rb
+++ b/lib/chef/log/syslog.rb
@@ -40,8 +40,7 @@ class Chef
         ::Logger::Syslog.const_set :SYSLOG, SYSLOG
       end
 
-      def close
-      end
+      def close; end
     end
   end
 end
diff --git a/lib/chef/log/winevt.rb b/lib/chef/log/winevt.rb
index 4affef78a3..dcc13a77e4 100644
--- a/lib/chef/log/winevt.rb
+++ b/lib/chef/log/winevt.rb
@@ -47,8 +47,7 @@ class Chef
         @eventlog = eventlog || ::Win32::EventLog.open("Application")
       end
 
-      def close
-      end
+      def close; end
 
       def info(msg)
         @eventlog.report_event(
diff --git a/lib/chef/null_logger.rb b/lib/chef/null_logger.rb
index 5781d8e055..16ff33ba80 100644
--- a/lib/chef/null_logger.rb
+++ b/lib/chef/null_logger.rb
@@ -27,29 +27,21 @@ class Chef
   # probably expected a real logger and not this "fake" one.
   class NullLogger
 
-    def fatal(message, &block)
-    end
+    def fatal(message, &block); end
 
-    def error(message, &block)
-    end
+    def error(message, &block); end
 
-    def warn(message, &block)
-    end
+    def warn(message, &block); end
 
-    def info(message, &block)
-    end
+    def info(message, &block); end
 
-    def debug(message, &block)
-    end
+    def debug(message, &block); end
 
-    def trace(message, &block)
-    end
+    def trace(message, &block); end
 
-    def add(severity, message = nil, progname = nil)
-    end
+    def add(severity, message = nil, progname = nil); end
 
-    def <<(message)
-    end
+    def <<(message); end
 
     def fatal?
       false
diff --git a/lib/chef/provider.rb b/lib/chef/provider.rb
index a95056d70c..641d8559d8 100644
--- a/lib/chef/provider.rb
+++ b/lib/chef/provider.rb
@@ -135,8 +135,7 @@ class Chef
       new_resource.cookbook_name
     end
 
-    def check_resource_semantics!
-    end
+    def check_resource_semantics!; end
 
     # a simple placeholder method that will be called / raise if a resource tries to
     # use current_resource without defining a load_current_resource method.
@@ -144,11 +143,9 @@ class Chef
       raise Chef::Exceptions::Override, "You must override load_current_resource in #{self}"
     end
 
-    def define_resource_requirements
-    end
+    def define_resource_requirements; end
 
-    def cleanup_after_converge
-    end
+    def cleanup_after_converge; end
 
     # the :nothing action which is available on all resources by default
     def action_nothing
diff --git a/lib/chef/provider/apt_preference.rb b/lib/chef/provider/apt_preference.rb
index 7a5f3fbf79..0e655cf0c0 100644
--- a/lib/chef/provider/apt_preference.rb
+++ b/lib/chef/provider/apt_preference.rb
@@ -28,8 +28,7 @@ class Chef
 
       APT_PREFERENCE_DIR = "/etc/apt/preferences.d".freeze
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :add do
         preference = build_pref(
diff --git a/lib/chef/provider/apt_repository.rb b/lib/chef/provider/apt_repository.rb
index 9065a7d9dc..85fac1d2da 100644
--- a/lib/chef/provider/apt_repository.rb
+++ b/lib/chef/provider/apt_repository.rb
@@ -32,8 +32,7 @@ class Chef
 
       LIST_APT_KEY_FINGERPRINTS = %w{apt-key adv --list-public-keys --with-fingerprint --with-colons}.freeze
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :add do
         if new_resource.key.nil?
diff --git a/lib/chef/provider/apt_update.rb b/lib/chef/provider/apt_update.rb
index d20cf12d0d..7ba7c16b9f 100644
--- a/lib/chef/provider/apt_update.rb
+++ b/lib/chef/provider/apt_update.rb
@@ -28,8 +28,7 @@ class Chef
       APT_CONF_DIR = "/etc/apt/apt.conf.d".freeze
       STAMP_DIR = "/var/lib/apt/periodic".freeze
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :periodic do
         if !apt_up_to_date?
diff --git a/lib/chef/provider/dsc_resource.rb b/lib/chef/provider/dsc_resource.rb
index b7785a6660..94d3b31d0a 100644
--- a/lib/chef/provider/dsc_resource.rb
+++ b/lib/chef/provider/dsc_resource.rb
@@ -42,8 +42,7 @@ class Chef
         end
       end
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       def define_resource_requirements
         requirements.assert(:run) do |a|
diff --git a/lib/chef/provider/lwrp_base.rb b/lib/chef/provider/lwrp_base.rb
index 80cb4a34a8..37ea5d9647 100644
--- a/lib/chef/provider/lwrp_base.rb
+++ b/lib/chef/provider/lwrp_base.rb
@@ -42,8 +42,7 @@ class Chef
       # no-op `load_current_resource`. Allows simple LWRP providers to work
       # without defining this method explicitly (silences
       # Chef::Exceptions::Override exception)
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       # class methods
       class <<self
diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index 72ba0ac088..0205bdbf82 100644
--- a/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
@@ -233,8 +233,7 @@ class Chef
       end
 
       # Subclasses will override this to a method and provide a preseed file path
-      def prepare_for_installation
-      end
+      def prepare_for_installation; end
 
       # @todo use composition rather than inheritance
 
diff --git a/lib/chef/provider/service/systemd.rb b/lib/chef/provider/service/systemd.rb
index d587b0f589..565668c081 100644
--- a/lib/chef/provider/service/systemd.rb
+++ b/lib/chef/provider/service/systemd.rb
@@ -62,8 +62,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
   end
 
   # systemd supports user services just fine
-  def user_services_requirements
-  end
+  def user_services_requirements; end
 
   def define_resource_requirements
     shared_resource_requirements
diff --git a/lib/chef/provider/yum_repository.rb b/lib/chef/provider/yum_repository.rb
index f70ec2bbd9..9ae3bad29c 100644
--- a/lib/chef/provider/yum_repository.rb
+++ b/lib/chef/provider/yum_repository.rb
@@ -30,8 +30,7 @@ class Chef
         which "yum"
       end
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :create do
         declare_resource(:template, "/etc/yum.repos.d/#{new_resource.repositoryid}.repo") do
diff --git a/lib/chef/provider/zypper_repository.rb b/lib/chef/provider/zypper_repository.rb
index 46d81430dd..291a545843 100644
--- a/lib/chef/provider/zypper_repository.rb
+++ b/lib/chef/provider/zypper_repository.rb
@@ -28,8 +28,7 @@ class Chef
     class ZypperRepository < Chef::Provider
       provides :zypper_repository, platform_family: "suse"
 
-      def load_current_resource
-      end
+      def load_current_resource; end
 
       action :create do
         if new_resource.gpgautoimportkeys
diff --git a/spec/integration/recipes/provider_choice.rb b/spec/integration/recipes/provider_choice.rb
index 1895d93891..dea58230db 100644
--- a/spec/integration/recipes/provider_choice.rb
+++ b/spec/integration/recipes/provider_choice.rb
@@ -16,8 +16,7 @@ describe "Recipe DSL methods" do
     context "And class Chef::Provider::ProviderThingy with no provides" do
       before :context do
         class Chef::Provider::ProviderThingy < Chef::Provider
-          def load_current_resource
-          end
+          def load_current_resource; end
 
           def action_create
             Chef::Log.warn("hello from #{self.class.name}")
diff --git a/spec/integration/recipes/recipe_dsl_spec.rb b/spec/integration/recipes/recipe_dsl_spec.rb
index 6c0cc305f9..29ac41fdce 100644
--- a/spec/integration/recipes/recipe_dsl_spec.rb
+++ b/spec/integration/recipes/recipe_dsl_spec.rb
@@ -28,8 +28,7 @@ describe "Recipe DSL methods" do
           Provider
         end
         class Provider < Chef::Provider
-          def load_current_resource
-          end
+          def load_current_resource; end
 
           def action_create
             BaseThingy.created_name = new_resource.name
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index adfb262637..ac5f68b484 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -311,14 +311,11 @@ require "thread"
 module WEBrick
   module Utils
     class TimeoutHandler
-      def initialize
-      end
+      def initialize; end
 
-      def register(*args)
-      end
+      def register(*args); end
 
-      def cancel(*args)
-      end
+      def cancel(*args); end
     end
   end
 end
diff --git a/spec/support/platforms/win32/spec_service.rb b/spec/support/platforms/win32/spec_service.rb
index 5548a79afc..5b30c567cc 100644
--- a/spec/support/platforms/win32/spec_service.rb
+++ b/spec/support/platforms/win32/spec_service.rb
@@ -39,17 +39,13 @@ class SpecService < ::Win32::Daemon
   # Control Signal Callback Methods
   ################################################################################
 
-  def service_stop
-  end
+  def service_stop; end
 
-  def service_pause
-  end
+  def service_pause; end
 
-  def service_resume
-  end
+  def service_resume; end
 
-  def service_shutdown
-  end
+  def service_shutdown; end
 end
 
 # To run this file as a service, it must be called as a script from within
diff --git a/spec/unit/application/knife_spec.rb b/spec/unit/application/knife_spec.rb
index f8f5560597..ea5083ac15 100644
--- a/spec/unit/application/knife_spec.rb
+++ b/spec/unit/application/knife_spec.rb
@@ -28,8 +28,7 @@ describe Chef::Application::Knife do
         long: "-optwithdefault VALUE",
         default: "default-value"
 
-      def run
-      end
+      def run; end
     end
   end
 
diff --git a/spec/unit/cookbook_site_streaming_uploader_spec.rb b/spec/unit/cookbook_site_streaming_uploader_spec.rb
index 87ff7abdd7..af714094d0 100644
--- a/spec/unit/cookbook_site_streaming_uploader_spec.rb
+++ b/spec/unit/cookbook_site_streaming_uploader_spec.rb
@@ -25,8 +25,7 @@ class FakeTempfile
     @basename = basename
   end
 
-  def close
-  end
+  def close; end
 
   def path
     "#{@basename}.ZZZ"
diff --git a/spec/unit/mixin/template_spec.rb b/spec/unit/mixin/template_spec.rb
index 96b983a9dd..04071988ad 100644
--- a/spec/unit/mixin/template_spec.rb
+++ b/spec/unit/mixin/template_spec.rb
@@ -242,17 +242,13 @@ describe Chef::Mixin::Template, "render_template" do
 
       it "emits a warning when overriding 'core' methods" do
         mod = Module.new do
-          def render
-          end
+          def render; end
 
-          def node
-          end
+          def node; end
 
-          def render_template
-          end
+          def render_template; end
 
-          def render_template_from_string
-          end
+          def render_template_from_string; end
         end
         %w{node render render_template render_template_from_string}.each do |method_name|
           expect(Chef::Log).to receive(:warn).with(/^Core template method `#{method_name}' overridden by extension module/)
diff --git a/spec/unit/mixin/unformatter_spec.rb b/spec/unit/mixin/unformatter_spec.rb
index b2b57c150c..3c8dba1962 100644
--- a/spec/unit/mixin/unformatter_spec.rb
+++ b/spec/unit/mixin/unformatter_spec.rb
@@ -22,8 +22,7 @@ require "chef/mixin/unformatter"
 class Chef::UnformatterTest
   include Chef::Mixin::Unformatter
 
-  def foo
-  end
+  def foo; end
 
 end
 
diff --git a/spec/unit/mixin/user_context_spec.rb b/spec/unit/mixin/user_context_spec.rb
index 896241f173..31e182d042 100644
--- a/spec/unit/mixin/user_context_spec.rb
+++ b/spec/unit/mixin/user_context_spec.rb
@@ -56,8 +56,7 @@ describe "a class that mixes in user_context" do
 
       let(:block_object) do
         class BlockClass
-          def block_method
-          end
+          def block_method; end
         end
         BlockClass.new
       end
diff --git a/spec/unit/provider_spec.rb b/spec/unit/provider_spec.rb
index 496871614a..d7db8e8c1c 100644
--- a/spec/unit/provider_spec.rb
+++ b/spec/unit/provider_spec.rb
@@ -24,8 +24,7 @@ class NoWhyrunDemonstrator < Chef::Provider
     false
   end
 
-  def load_current_resource
-  end
+  def load_current_resource; end
 
   def action_foo
     @system_state_altered = true
@@ -39,8 +38,7 @@ class ConvergeActionDemonstrator < Chef::Provider
     true
   end
 
-  def load_current_resource
-  end
+  def load_current_resource; end
 
   def action_foo
     converge_by("running a state changing action") do
diff --git a/spec/unit/resource/file/verification_spec.rb b/spec/unit/resource/file/verification_spec.rb
index f0ec999019..57c58249eb 100644
--- a/spec/unit/resource/file/verification_spec.rb
+++ b/spec/unit/resource/file/verification_spec.rb
@@ -128,8 +128,7 @@ describe Chef::Resource::File::Verification do
       before(:each) do
         class Chef::Resource::File::Verification::Turtle < Chef::Resource::File::Verification
           provides :cats
-          def verify(path, opts)
-          end
+          def verify(path, opts); end
         end
         allow(Chef::Resource::File::Verification::Turtle).to receive(:new).and_return(registered_verification)
       end
diff --git a/spec/unit/shell_spec.rb b/spec/unit/shell_spec.rb
index 8ba1afa72a..aa573706b1 100644
--- a/spec/unit/shell_spec.rb
+++ b/spec/unit/shell_spec.rb
@@ -30,8 +30,7 @@ ObjectTestHarness = Proc.new do
   end
 
   desc "rspecin'"
-  def rspec_method
-  end
+  def rspec_method; end
 end
 
 class TestJobManager