Layout/EmptyLines

mhashizume · mhashizume · commit 101b11789d16 · 2023-12-19T13:25:56.000-08:00
This commit enables the Rubocop Layout/EmptyLines cop.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -30,10 +30,6 @@ Layout/EmptyLineAfterGuardClause:
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-Layout/EmptyLines:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: around, only_before
diff --git a/lib/puppet/agent/locker.rb b/lib/puppet/agent/locker.rb
@@ -43,5 +43,4 @@ def lockfile
   end
   private :lockfile
 
-
 end
diff --git a/lib/puppet/application/apply.rb b/lib/puppet/application/apply.rb
@@ -310,7 +310,6 @@ def setup
 
     Puppet.settings.use :main, :agent, :ssl
 
-
     if Puppet[:catalog_cache_terminus]
       Puppet::Resource::Catalog.indirection.cache_class = Puppet[:catalog_cache_terminus]
     end
diff --git a/lib/puppet/external/dot.rb b/lib/puppet/external/dot.rb
@@ -161,7 +161,6 @@ def each_option_pair
 
   end
 
-
   # This is used when we build nodes that have shape=record
   # ports don't have options :)
 
diff --git a/lib/puppet/face/epp.rb b/lib/puppet/face/epp.rb
@@ -102,7 +102,6 @@
     end
   end
 
-
   action(:dump) do
     summary _("Outputs a dump of the internal template parse tree for debugging")
     arguments "[--format <old|pn|json>] [--pretty] { -e <source> | [<templates> ...] } "
diff --git a/lib/puppet/face/module/list.rb b/lib/puppet/face/module/list.rb
@@ -106,7 +106,6 @@
     end
   end
 
-
   def unmet_dependencies(environment)
     error_types = [:non_semantic_version, :version_mismatch, :missing]
 
diff --git a/lib/puppet/face/parser.rb b/lib/puppet/face/parser.rb
@@ -100,7 +100,6 @@
     end
   end
 
-
   action(:dump) do
     summary _("Outputs a dump of the internal parse tree for debugging")
     arguments "[--format <old|pn|json>] [--pretty] { -e <source> | [<templates> ...] } "
diff --git a/lib/puppet/file_system/uniquefile.rb b/lib/puppet/file_system/uniquefile.rb
@@ -161,7 +161,6 @@ def tmpdir
     File.expand_path(tmp)
   end
 
-
   class << self
     # yields with locking for +tmpname+ and returns the result of the
     # block.
diff --git a/lib/puppet/file_system/windows.rb b/lib/puppet/file_system/windows.rb
@@ -144,7 +144,6 @@ def replace_file(path, mode = nil)
              raise ArgumentError, "#{mode} is invalid: Only modes 0644, 0640, 0660, and 0440 are allowed"
            end
 
-
     tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(path), Puppet::FileSystem.dir_string(path))
     begin
       tempdacl = Puppet::Util::Windows::AccessControlList.new
diff --git a/lib/puppet/functions/index.rb b/lib/puppet/functions/index.rb
@@ -121,7 +121,6 @@
     param 'Any', :match
   end
 
-
   def index_Hash_1(hash)
     hash.each_pair { |x, y| return x if yield(y)  }
     nil
diff --git a/lib/puppet/functions/max.rb b/lib/puppet/functions/max.rb
@@ -134,7 +134,6 @@
     repeated_param 'Any', :values
   end
 
-
   # All are Numeric - ok now, will be ok later
   def on_numeric(*args)
     assert_arg_count(args)
diff --git a/lib/puppet/functions/min.rb b/lib/puppet/functions/min.rb
@@ -133,7 +133,6 @@
     repeated_param 'Any', :values
   end
 
-
   # All are Numeric - ok now, will be ok later
   def on_numeric(*args)
     assert_arg_count(args)
diff --git a/lib/puppet/functions/size.rb b/lib/puppet/functions/size.rb
@@ -8,7 +8,6 @@
     param 'Variant[Collection, String, Binary]', :arg
   end
 
-
   def generic_size(arg)
     call_function('length', arg)
   end
diff --git a/lib/puppet/indirector/catalog/compiler.rb b/lib/puppet/indirector/catalog/compiler.rb
@@ -365,7 +365,6 @@ def compile(node, options)
       end
     end
 
-
     config
   end
 
@@ -384,7 +383,6 @@ def find_node(name, environment, transaction_uuid, configured_environment, facts
         raise Puppet::Error, message, detail.backtrace
       end
 
-
       # Add any external data to the node.
       if node
         add_node_data(node)
diff --git a/lib/puppet/interface.rb b/lib/puppet/interface.rb
@@ -16,7 +16,6 @@ class Puppet::Interface
   require_relative 'interface/option_builder'
   require_relative 'interface/option_manager'
 
-
   include FullDocs
 
   include Puppet::Interface::ActionManager
@@ -121,7 +120,6 @@ def find_action(name, action, version = :current)
   # splits out this should merge into a module that both the action and face
   # include. --daniel 2011-04-17
 
-
   # Returns the synopsis for the face. This shows basic usage and global
   # options.
   # @return [String] usage synopsis
@@ -130,7 +128,6 @@ def synopsis
     build_synopsis self.name, '<action>'
   end
 
-
   ########################################################################
 
   # The name of the face
diff --git a/lib/puppet/interface/action.rb b/lib/puppet/interface/action.rb
@@ -72,7 +72,6 @@ def synopsis
   ########################################################################
   # Support for rendering formats and all.
 
-
   # @api private
   def when_rendering(type)
     unless type.is_a? Symbol
@@ -139,7 +138,6 @@ def __render_method_name_for(type)
   end
   private :__render_method_name_for
 
-
   # @api private
   # @return [Symbol]
   attr_reader :render_as
@@ -194,7 +192,6 @@ def deprecated?
   #   @face.send(name, *args, &block)
   # end
 
-
   # We need to build an instance method as a wrapper, using normal code, to be
   # able to expose argument defaulting between the caller and definer in the
   # Ruby API.  An extra method is, sadly, required for Ruby 1.8 to work since
@@ -214,7 +211,6 @@ def deprecated?
   # idea how motivated we were to make this cleaner.  Sorry.
   # --daniel 2011-03-31
 
-
   # The arity of the action
   # @return [Integer]
   attr_reader :positional_arg_count
diff --git a/lib/puppet/network/formats.rb b/lib/puppet/network/formats.rb
@@ -143,7 +143,6 @@ def data_to_instance(klass, data)
 # This is really only ever going to be used for Catalogs.
 Puppet::Network::FormatHandler.create_serialized_formats(:dot, :required_methods => [:render_method])
 
-
 Puppet::Network::FormatHandler.create(:console,
                                       :mime   => 'text/x-console-text',
                                       :weight => 0) do
@@ -253,7 +252,6 @@ def render_multiple(data)
   end
 end
 
-
 Puppet::Network::FormatHandler.create(:rich_data_json, mime: 'application/vnd.puppet.rich+json', charset: Encoding::UTF_8, weight: 30) do
   def intern(klass, text)
     Puppet.override({:rich_data => true}) do
diff --git a/lib/puppet/node/facts.rb b/lib/puppet/node/facts.rb
@@ -5,7 +5,6 @@
 require_relative '../../puppet/indirector'
 require_relative '../../puppet/util/psych_support'
 
-
 # Manage a given node's facts.  This either accepts facts and stores them, or
 # returns facts for a given node.
 class Puppet::Node::Facts
diff --git a/lib/puppet/pops/evaluator/access_operator.rb b/lib/puppet/pops/evaluator/access_operator.rb
@@ -640,7 +640,6 @@ def access_PResourceType(o, scope, keys)
       return result_type_array ? result : result.pop
     end
 
-
     keys = [:no_title] if keys.size < 1 # if there was only a type_name and it was consumed
     result = keys.each_with_index.map do |t, i|
       unless t.is_a?(String) || t == :no_title
diff --git a/lib/puppet/pops/evaluator/evaluator_impl.rb b/lib/puppet/pops/evaluator/evaluator_impl.rb
@@ -106,7 +106,6 @@ def evaluate(target, scope)
         fail(Issues::RUNTIME_ERROR, target, {:detail => e.message}, e)
       end
 
-
     rescue Puppet::Error => e
       # PuppetError has the ability to wrap an exception, if so, use the wrapped exception's
       # call stack instead
diff --git a/lib/puppet/pops/loader/module_loaders.rb b/lib/puppet/pops/loader/module_loaders.rb
@@ -104,7 +104,6 @@ class AbstractPathBasedModuleLoader < BaseLoader
     # The name of the module, or nil, if this is a global "component", or "any module" if set to the `NAMESPACE_WILDCARD` (*)
     attr_reader :module_name
 
-
     # The path to the location of the module/component - semantics determined by subclass
     attr_reader :path
 
diff --git a/lib/puppet/pops/model/pn_transformer.rb b/lib/puppet/pops/model/pn_transformer.rb
@@ -4,7 +4,6 @@
 module Puppet::Pops
 module Model
 
-
 class PNTransformer
   extend Puppet::Concurrent::ThreadLocalSingleton
 
diff --git a/lib/puppet/pops/parser/heredoc_support.rb b/lib/puppet/pops/parser/heredoc_support.rb
@@ -9,7 +9,6 @@ module HeredocSupport
   #
   PATTERN_HEREDOC = %r{@\(([^:/\r\n\)]+)(?::[[:blank:]]*([a-z][a-zA-Z0-9_+]+)[[:blank:]]*)?(?:/((?:\w|[$])*)[[:blank:]]*)?\)}
 
-
   def heredoc
     scn = @scanner
     ctx = @lexing_context
@@ -94,7 +93,6 @@ def heredoc
         # Record position where next heredoc (from same line as current @()) should start scanning for content
         ctx[:newline_jump] = scn.pos
 
-
         # Process captured lines - remove leading, and trailing newline
         # get processed string and index of removed margin/leading size per line
         str, margin_per_line = heredoc_text(lines, leading, has_margin, remove_break)
diff --git a/lib/puppet/pops/parser/lexer2.rb b/lib/puppet/pops/parser/lexer2.rb
@@ -245,7 +245,6 @@ def initialize()
         emit(TOKEN_RBRACE, @scanner.pos)
       end,
 
-
       # TOKENS @, @@, @(
       '@' => lambda do
         scn = @scanner
diff --git a/lib/puppet/pops/parser/lexer_support.rb b/lib/puppet/pops/parser/lexer_support.rb
@@ -147,7 +147,6 @@ def to_s
     #
   end
 
-
   MM = Puppet::Util::MultiMatch
   MM_ANY = MM::NOT_NIL
 
diff --git a/lib/puppet/pops/types/types.rb b/lib/puppet/pops/types/types.rb
@@ -1367,7 +1367,6 @@ def eql?(o)
     self.class == o.class && @size_type == o.size_type
   end
 
-
   DEFAULT_SIZE = PIntegerType.new(0)
   ZERO_SIZE = PIntegerType.new(0, 0)
   NOT_EMPTY_SIZE = PIntegerType.new(1)
@@ -3193,7 +3192,6 @@ def _assignable?(o, guard)
 # For backward compatibility
 PHostClassType = PClassType
 
-
 # Represents a Resource Type in the Puppet Language
 # @api public
 #
diff --git a/lib/puppet/provider/package/dnfmodule.rb b/lib/puppet/provider/package/dnfmodule.rb
@@ -8,7 +8,6 @@
 #   flavor   => 'client',  # install a specific profile
 # }
 
-
 require_relative '../../../puppet/provider/package'
 
 Puppet::Type.type(:package).provide :dnfmodule, :parent => :dnf do
diff --git a/lib/puppet/provider/package/dpkg.rb b/lib/puppet/provider/package/dpkg.rb
@@ -92,7 +92,6 @@ def install
     end
     args = []
 
-
     if @resource[:configfiles] == :keep
       args << '--force-confold'
     else
diff --git a/lib/puppet/provider/package/macports.rb b/lib/puppet/provider/package/macports.rb
@@ -24,7 +24,6 @@
   has_feature :upgradeable
   has_feature :versionable
 
-
   def self.parse_installed_query_line(line)
     regex = /(\S+)\s+@(\S+)_(\d+).*\(active\)/
     fields = [:name, :ensure, :revision]
diff --git a/lib/puppet/provider/package/nim.rb b/lib/puppet/provider/package/nim.rb
@@ -27,8 +27,6 @@
 
   attr_accessor :latest_info
 
-
-
   def self.srclistcmd(source)
     [ command(:nimclient), "-o", "showres", "-a", "installp_flags=L", "-a", "resource=#{source}" ]
   end
@@ -91,7 +89,6 @@ def install(useversion = true)
     end
     output = Puppet::Util::Execution.execute(showres_command)
 
-
     if (version_specified)
       package_type = determine_package_type(output, pkg, version)
     else
@@ -146,7 +143,6 @@ def install(useversion = true)
     end
   end
 
-
   private
 
   ## UTILITY METHODS FOR PARSING `nimclient -o showres` output
@@ -181,7 +177,6 @@ def install(useversion = true)
   #   @@R:mypackage.foo-1.2.3-4 1.2.3-4
   #   @@R:mypackage.foo-1.2.3-8 1.2.3-8
 
-
   # Parse the output of a `nimclient -o showres` command.  Returns a two-dimensional
   # hash, where the first-level keys are package names, the second-level keys are
   # version number strings for all of the available version numbers for a package,
diff --git a/lib/puppet/provider/package/zypper.rb b/lib/puppet/provider/package/zypper.rb
@@ -122,7 +122,6 @@ def install
     inst_opts = []
     inst_opts = install_options if resource[:install_options]
 
-
     options = []
     options << quiet
     options << '--no-gpg-check' unless inst_opts.delete('--no-gpg-check').nil?
diff --git a/lib/puppet/provider/user/directoryservice.rb b/lib/puppet/provider/user/directoryservice.rb
@@ -239,7 +239,6 @@ def self.get_sha1(guid)
     password_hash
   end
 
-
   ##                   ##
   ## Ensurable Methods ##
   ##                   ##
@@ -467,7 +466,6 @@ def salt=(value)
     end
   end
 
-
   ##                ##
   ## Helper Methods ##
   ##                ##
diff --git a/lib/puppet/provider/user/pw.rb b/lib/puppet/provider/user/pw.rb
@@ -19,7 +19,6 @@
     value.split("-").reverse.join("-")
   }
 
-
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
diff --git a/lib/puppet/ssl/certificate.rb b/lib/puppet/ssl/certificate.rb
@@ -62,7 +62,6 @@ def custom_extensions
 
   private
 
-
   # Extract the extensions sequence from the wrapped certificate's raw ASN.1 form
   def exts_seq
     # See RFC-2459 section 4.1 (https://tools.ietf.org/html/rfc2459#section-4.1)
diff --git a/lib/puppet/ssl/oids.rb b/lib/puppet/ssl/oids.rb
@@ -187,7 +187,6 @@ def self.subtree_of?(first, second, exclusive = false)
     first_oid = OpenSSL::ASN1::ObjectId.new(first).oid
     second_oid = OpenSSL::ASN1::ObjectId.new(second).oid
 
-
     if exclusive and first_oid == second_oid
       false
     else
diff --git a/lib/puppet/test/test_helper.rb b/lib/puppet/test/test_helper.rb
@@ -196,7 +196,6 @@ def self.after_each_test()
       Puppet.rollback_context(ROLLBACK_MARK)
     end
 
-
     #########################################################################################
     # PRIVATE METHODS (not part of the public TestHelper API--do not call these from outside
     #  of this class!)
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
diff --git a/lib/puppet/type/exec.rb b/lib/puppet/type/exec.rb
diff --git a/lib/puppet/type/file/ensure.rb b/lib/puppet/type/file/ensure.rb
diff --git a/lib/puppet/type/file/mode.rb b/lib/puppet/type/file/mode.rb
diff --git a/lib/puppet/type/file/selcontext.rb b/lib/puppet/type/file/selcontext.rb
diff --git a/lib/puppet/type/notify.rb b/lib/puppet/type/notify.rb
diff --git a/lib/puppet/type/package.rb b/lib/puppet/type/package.rb
diff --git a/lib/puppet/type/service.rb b/lib/puppet/type/service.rb
diff --git a/lib/puppet/type/whit.rb b/lib/puppet/type/whit.rb
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
diff --git a/lib/puppet/util/constant_inflector.rb b/lib/puppet/util/constant_inflector.rb
diff --git a/lib/puppet/util/execution.rb b/lib/puppet/util/execution.rb
diff --git a/lib/puppet/util/log.rb b/lib/puppet/util/log.rb
diff --git a/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb b/lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
diff --git a/lib/puppet/util/windows/adsi.rb b/lib/puppet/util/windows/adsi.rb

-Original file line number
+Diff line change
   end
   private :lockfile
+-
 end