Layout/EmptyLineAfterGuardClause

This commit enables the Rubocop Layout/EmptyLineAfterGuardClause cop and
fixes all offenses.

Author: mhashizume

.rubocop_todo.yml

@@ -22,10 +22,6 @@ I18n/GetText/DecorateStringFormattingUsingPercent:
 I18n/RailsI18n/DecorateString:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Layout/EmptyLineAfterGuardClause:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 Layout/EmptyLineAfterMagicComment:
   Enabled: false

lib/puppet/agent/disabler.rb

@@ -41,6 +41,7 @@ def disable_message
     if data.has_key?(DISABLED_MESSAGE_JSON_KEY)
       return data[DISABLED_MESSAGE_JSON_KEY]
     end
+
     nil
   end
 

lib/puppet/application.rb

@@ -169,6 +169,7 @@ def clear?
     # Thus, long-running background processes can potentially finish their work before a restart.
     def controlled_run(&block)
       return unless clear?
+
       result = block.call
       Process.kill(:HUP, $PID) if restart_requested?
       result
@@ -303,6 +304,7 @@ def run_mode(mode_name = nil)
     # @api public
     def environment_mode(mode_name)
       raise Puppet::Error, _("Invalid environment mode '%{mode_name}'") % { mode_name: mode_name } unless [:local, :remote, :not_required].include?(mode_name)
+
       @environment_mode = mode_name
     end
 

lib/puppet/application/agent.rb

@@ -404,6 +404,7 @@ def log_config
 
     Puppet.settings.stringify_settings(:agent, :all).each_pair do |k,v|
       next if k.include?("password") || v.to_s.empty?
+
       Puppet.debug("Using setting: #{k}=#{v}")
     end
   end

lib/puppet/application/apply.rb

@@ -381,6 +381,7 @@ def get_facts()
   def get_node()
     node = Puppet::Node.indirection.find(Puppet[:node_name_value])
     raise _("Could not find node %{node}") % { node: Puppet[:node_name_value] } unless node
+
     node
   end
 
@@ -394,6 +395,7 @@ def get_manifest()
     else
       manifest = command_line.args.shift
       raise _("Could not find file %{manifest}") % { manifest: manifest } unless Puppet::FileSystem.exist?(manifest)
+
       Puppet.warning(_("Only one file can be applied per run.  Skipping %{files}") % { files: command_line.args.join(', ') }) if command_line.args.size > 0
     end
     manifest

lib/puppet/application/describe.rb

@@ -8,6 +8,7 @@ def initialize(width)
 
   def wrap(txt, opts)
     return "" unless txt && !txt.empty?
+
     work = (opts[:scrub] ? scrub(txt) : txt)
     indent = (opts[:indent] ? opts[:indent] : 0)
     textLen = @width - indent
@@ -56,6 +57,7 @@ def initialize
     Puppet::Type.loadall
     Puppet::Type.eachtype { |type|
       next if type.name == :component
+
       @types[type.name] = type
     }
   end

lib/puppet/application/device.rb

@@ -233,6 +233,7 @@ def main
     if options[:facts] and !options[:target]
       raise _("facts command requires target")
     end
+
     unless options[:apply].nil?
       raise _("missing argument: --target is required when using --apply") if options[:target].nil?
       raise _("%{file} does not exist, cannot apply") % { file: options[:apply] } unless File.file?(options[:apply])

lib/puppet/application/face_base.rb

@@ -158,6 +158,7 @@ def find_global_settings_argument(item)
     Puppet.settings.each do |_name, object|
       object.optparse_args.each do |arg|
         next unless arg =~ /^-/
+
         # sadly, we have to emulate some of optparse here...
         pattern = /^#{arg.sub('[no-]', '').sub(/[ =].*$/, '')}(?:[ =].*)?$/
         pattern.match item and return object
@@ -170,8 +171,10 @@ def find_application_argument(item)
     self.class.option_parser_commands.each do |options, _function|
       options.each do |option|
         next unless option =~ /^-/
+
         pattern = /^#{option.sub('[no-]', '').sub(/[ =].*$/, '')}(?:[ =].*)?$/
         next unless pattern.match(item)
+
         return {
           :argument => option =~ /[ =]/,
           :optional => option =~ /[ =]\[/

lib/puppet/application/filebucket.rb

@@ -213,6 +213,7 @@ def run_command
     @args = command_line.args
     command = args.shift
     return send(command) if %w{get backup restore diff list}.include? command
+
     help
   end
 
@@ -254,6 +255,7 @@ def restore
 
   def diff
     raise Puppet::Error, _("Need exactly two arguments: filebucket diff <file_a> <file_b>") unless args.count == 2
+
     left = args.shift
     right = args.shift
     if Puppet::FileSystem.exist?(left)

lib/puppet/application/lookup.rb

@@ -426,6 +426,7 @@ def retrieve_node_facts(node, given_facts)
     if facts.values.empty?
       raise _("No facts available for target node: %{node}") % { node: node}
     end
+
     facts
   end
 end