Layout/EmptyLineBetweenDefs

mhashizume · mhashizume · commit 00592c4ac047 · 2023-12-19T13:25:56.000-08:00
This commit enables the Rubocop Layout/EmptyLineBetweenDefs cop.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -30,11 +30,6 @@ Layout/EmptyLineAfterGuardClause:
 Layout/EmptyLineAfterMagicComment:
   Enabled: false
 
-# This cop supports safe auto-correction (--auto-correct).
-# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
-Layout/EmptyLineBetweenDefs:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 Layout/EmptyLines:
   Enabled: false
diff --git a/lib/puppet/agent/disabler.rb b/lib/puppet/agent/disabler.rb
@@ -44,7 +44,6 @@ def disable_message
     nil
   end
 
-
   def disable_lockfile
     @disable_lockfile ||= Puppet::Util::JsonLockfile.new(Puppet[:agent_disabled_lockfile])
 
diff --git a/lib/puppet/application/device.rb b/lib/puppet/application/device.rb
@@ -227,7 +227,6 @@ def help
       HELP
   end
 
-
   def main
     if options[:resource] and !options[:target]
       raise _("resource command requires target")
diff --git a/lib/puppet/application/face_base.rb b/lib/puppet/application/face_base.rb
@@ -205,7 +205,6 @@ def setup
     self.render_as ||= (@action.render_as || :console)
   end
 
-
   def main
     status = false
 
diff --git a/lib/puppet/application/filebucket.rb b/lib/puppet/application/filebucket.rb
@@ -209,7 +209,6 @@ def help
     HELP
   end
 
-
   def run_command
     @args = command_line.args
     command = args.shift
diff --git a/lib/puppet/face/module/list.rb b/lib/puppet/face/module/list.rb
@@ -147,7 +147,6 @@ def unmet_dependencies(environment)
     unmet_deps
   end
 
-
   def warn_unmet_dependencies(environment)
     @unmet_deps = unmet_dependencies(environment)
 
diff --git a/lib/puppet/functions.rb b/lib/puppet/functions.rb
@@ -386,7 +386,6 @@ def self.init_dispatch(a_closure)
     end
   end
 
-
   # Public api methods of the DispatcherBuilder are available within dispatch()
   # blocks declared in a Puppet::Function.create_function() call.
   #
@@ -599,7 +598,6 @@ def internal_type_parse(type_string, loader)
     private :internal_type_parse
   end
 
-
   # The LocalTypeAliasBuilder is used by the 'local_types' method to collect the individual
   # type aliases given by the function's author.
   #
@@ -801,7 +799,6 @@ def self.from_to_names(func_info)
     end
   end
 
-
   # Injection and Weaving of parameters
   # ---
   # It is possible to inject and weave a set of well known parameters into a call.
diff --git a/lib/puppet/generate/type.rb b/lib/puppet/generate/type.rb
@@ -138,6 +138,7 @@ def self.find_inputs(format = :pcore, environment = Puppet.lookup(:current_envir
       def self.bad_input?
         @bad_input
       end
+
       # Generates files for the given inputs.
       # If a file is up to date (newer than input) it is kept.
       # If a file is out of date it is regenerated.
diff --git a/lib/puppet/http/pool.rb b/lib/puppet/http/pool.rb
@@ -71,7 +71,6 @@ def start(site, verifier, http)
     end
   end
 
-
   # Safely close a persistent connection.
   # Don't try to close a connection that's already closed.
   #
diff --git a/lib/puppet/interface/option.rb b/lib/puppet/interface/option.rb
@@ -102,13 +102,14 @@ def optparse_to_name(declaration)
     name.to_sym
   end
 
-
   def takes_argument?
     !!@argument
   end
+
   def optional_argument?
     !!@optional_argument
   end
+
   def required?
     !!@required
   end
diff --git a/lib/puppet/module/plan.rb b/lib/puppet/module/plan.rb
@@ -34,8 +34,10 @@ def initialize(msg)
 
     class InvalidPlan < Error
     end
+
     class InvalidMetadata < Error
     end
+
     class PlanNotFound < Error
       def initialize(plan_name, module_name)
         msg = _("Plan %{plan_name} not found in module %{module_name}.") %
diff --git a/lib/puppet/module/task.rb b/lib/puppet/module/task.rb
@@ -35,8 +35,10 @@ def initialize(msg)
 
     class InvalidTask < Error
     end
+
     class InvalidMetadata < Error
     end
+
     class TaskNotFound < Error
       def initialize(task_name, module_name)
         msg = _("Task %{task_name} not found in module %{module_name}.") %
diff --git a/lib/puppet/network/formats.rb b/lib/puppet/network/formats.rb
@@ -247,6 +247,7 @@ def render(datum)
     end
     Puppet::Util::Json.dump(datum, :pretty => true, :quirks_mode => true)
   end
+
   def render_multiple(data)
     data.collect(&:render).join("\n")
   end
diff --git a/lib/puppet/network/http_pool.rb b/lib/puppet/network/http_pool.rb
@@ -15,6 +15,7 @@ module Puppet::Network::HttpPool
   def self.http_client_class
     @http_client_class
   end
+
   def self.http_client_class=(klass)
     @http_client_class = klass
   end
diff --git a/lib/puppet/pal/catalog_compiler.rb b/lib/puppet/pal/catalog_compiler.rb
@@ -63,7 +63,6 @@ def evaluate(ast)
       end
     end
 
-
     # Compiles the result of additional evaluation taking place in a PAL catalog compilation.
     # This will evaluate all lazy constructs until all have been evaluated, and will the validate
     # the result.
diff --git a/lib/puppet/parameter.rb b/lib/puppet/parameter.rb
@@ -332,7 +332,6 @@ def version
     resource.version
   end
 
-
   # Initializes the parameter with a required resource reference and optional attribute settings.
   # The option `:resource` must be specified or an exception is raised. Any additional options passed
   # are used to initialize the attributes of this parameter by treating each key in the `options` hash as
diff --git a/lib/puppet/parameter/path.rb b/lib/puppet/parameter/path.rb
@@ -12,6 +12,7 @@ class Puppet::Parameter::Path < Puppet::Parameter
   def self.accept_arrays(bool = true)
     @accept_arrays = !!bool
   end
+
   def self.arrays?
     @accept_arrays
   end
diff --git a/lib/puppet/parser/ast/pops_bridge.rb b/lib/puppet/parser/ast/pops_bridge.rb
@@ -66,6 +66,7 @@ def evaluate(scope)
       end
     end
   end
+
   # Bridges the top level "Program" produced by the pops parser.
   # Its main purpose is to give one point where all definitions are instantiated (actually defined since the
   # Puppet 3x terminology is somewhat misleading - the definitions are instantiated, but instances of the created types
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
@@ -264,7 +264,6 @@ def to_hash
     end
   end
 
-
   # Returns true if the variable of the given name has a non nil value.
   # TODO: This has vague semantics - does the variable exist or not?
   #       use ['name'] to get nil or value, and if nil check with exist?('name')
@@ -1036,7 +1035,6 @@ def find_defined_resource_type(type)
     raise Puppet::DevError, _("Scope#find_defined_resource_type() is no longer supported, use Puppet::Pops::Evaluator::Runtime3ResourceSupport instead")
   end
 
-
   def method_missing(method, *args, &block)
     method.to_s =~ /^function_(.*)$/
     name = $1
diff --git a/lib/puppet/pops.rb b/lib/puppet/pops.rb
@@ -61,6 +61,7 @@ module Model
     module Resource
       require_relative 'pops/resource/resource_type_impl'
     end
+
     module Evaluator
       require_relative 'pops/evaluator/literal_evaluator'
       require_relative 'pops/evaluator/callable_signature'
diff --git a/lib/puppet/pops/evaluator/access_operator.rb b/lib/puppet/pops/evaluator/access_operator.rb
@@ -126,7 +126,6 @@ def access_Array(o, scope, keys)
     end
   end
 
-
   # Evaluates <hsh>[] with support for one or more arguments. If more than one argument is used, the result
   # is an array with each lookup.
   # @note
diff --git a/lib/puppet/pops/evaluator/compare_operator.rb b/lib/puppet/pops/evaluator/compare_operator.rb
@@ -114,7 +114,6 @@ def cmp_Object(a, b)
     raise ArgumentError.new(_('Only Strings, Numbers, Timespans, Timestamps, and Versions are comparable'))
   end
 
-
   def equals_Object(a, b)
     a == b
   end
diff --git a/lib/puppet/pops/evaluator/evaluator_impl.rb b/lib/puppet/pops/evaluator/evaluator_impl.rb
@@ -390,7 +390,6 @@ def eval_ArithmeticExpression(o, scope)
     result
   end
 
-
   # Handles binary expression where lhs and rhs are array/hash or numeric and operator is +, - , *, % / << >>
   #
   def calculate(left, right, bin_expr, scope)
@@ -1098,7 +1097,6 @@ def eval_ConcatenatedString o, scope
     o.segments.collect {|expr| string(evaluate(expr, scope), scope)}.join
   end
 
-
   # If the wrapped expression is a QualifiedName, it is taken as the name of a variable in scope.
   # Note that this is different from the 3.x implementation, where an initial qualified name
   # is accepted. (e.g. `"---${var + 1}---"` is legal. This implementation requires such concrete
diff --git a/lib/puppet/pops/loader/loader.rb b/lib/puppet/pops/loader/loader.rb
@@ -202,7 +202,6 @@ def inspect
     self.to_s
   end
 
-
   # An entry for one entity loaded by the loader.
   #
   class NamedEntry
diff --git a/lib/puppet/pops/model/ast.rb b/lib/puppet/pops/model/ast.rb
@@ -28,6 +28,7 @@ def self.create
   def initialize
     @hash = 2270595461303489901
   end
+
   def _pcore_init_hash
     {}
   end
diff --git a/lib/puppet/pops/model/ast_transformer.rb b/lib/puppet/pops/model/ast_transformer.rb
@@ -79,7 +79,6 @@ def hostname(o)
     @@hostname_transform_visitor.visit_this_0(self, o)
   end
 
-
   # Ensures transformation fails if a 3.1 non supported object is encountered in a query expression
   #
   def query_Object(o)
diff --git a/lib/puppet/pops/model/model_label_provider.rb b/lib/puppet/pops/model/model_label_provider.rb
@@ -117,7 +117,6 @@ def label_Resource o
     'Resource Statement'
   end
 
-
   def label_Class o
     if o <= Types::PAnyType
       simple_name = o.name.split('::').last
diff --git a/lib/puppet/pops/types/string_converter.rb b/lib/puppet/pops/types/string_converter.rb
@@ -226,6 +226,7 @@ def self.type_rank(t)
         0
       end
     end
+
     # Returns an array with a delimiter pair derived from the format.
     # If format does not contain a delimiter specification the given default is returned
     #
diff --git a/lib/puppet/pops/types/type_formatter.rb b/lib/puppet/pops/types/type_formatter.rb
@@ -97,7 +97,6 @@ def ruby_string(ref_ctor, indent, t)
     end
   end
 
-
   def append_default
     @bld << 'default'
   end
@@ -332,7 +331,6 @@ def string_PPatternType(t)
     append_array('Pattern', t.patterns.empty?) { append_strings(t.patterns.map(&:regexp)) }
   end
 
-
   # @api private
   def string_PCollectionType(t)
     range = range_array_part(t.size_type)
diff --git a/lib/puppet/pops/types/types.rb b/lib/puppet/pops/types/types.rb
@@ -1680,7 +1680,6 @@ def self.register_ptype(loader, ir)
                  })
   end
 
-
   # Returns a new function that produces a Regexp instance
   #
   def self.new_function(type)
@@ -3172,6 +3171,7 @@ def initialize(class_name)
   def hash
     11 ^ @class_name.hash
   end
+
   def eql?(o)
     self.class == o.class && @class_name == o.class_name
   end
diff --git a/lib/puppet/provider/nameservice/directoryservice.rb b/lib/puppet/provider/nameservice/directoryservice.rb
@@ -37,6 +37,7 @@ def self.post_resource_eval
   #     be actively maintained.  There may also be collisions with different
   #     types (Users, Groups, Mounts, Hosts, etc...)
   def ds_to_ns_attribute_map; self.class.ds_to_ns_attribute_map; end
+
   def self.ds_to_ns_attribute_map
     {
       'RecordName' => :name,
@@ -55,6 +56,7 @@ def self.ds_to_ns_attribute_map
 
   # JJM The same table as above, inverted.
   def ns_to_ds_attribute_map; self.class.ns_to_ds_attribute_map end
+
   def self.ns_to_ds_attribute_map
     @ns_to_ds_attribute_map ||= ds_to_ns_attribute_map.invert
   end
@@ -301,7 +303,6 @@ def self.next_system_id(id_type, min_id=20)
     end
   end
 
-
   def ensure=(ensure_value)
     super
     # We need to loop over all valid properties for the type we're
diff --git a/lib/puppet/provider/service/launchd.rb b/lib/puppet/provider/service/launchd.rb
@@ -289,7 +289,6 @@ def start
     self.disable if did_enable_job and resource[:enable] == :false
   end
 
-
   def stop
     if resource[:stop]
       service_command(:stop)
diff --git a/lib/puppet/provider/service/upstart.rb b/lib/puppet/provider/service/upstart.rb
@@ -67,7 +67,6 @@ def self.excludes
     excludes
   end
 
-
   def self.get_services(exclude=[])
     instances = []
     execpipe("#{command(:initctl)} list") { |process|
diff --git a/lib/puppet/provider/user/user_role_add.rb b/lib/puppet/provider/user/user_role_add.rb
@@ -166,7 +166,6 @@ def keys=(keys_hash)
     run([command(:modify)] + build_keys_cmd(keys_hash) << @resource[:name], "modify attribute key pairs")
   end
 
-
   # This helper makes it possible to test this on stub data without having to
   # do too many crazy things!
   def target_file_path
diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb
@@ -574,7 +574,6 @@ def self.type_and_title(type, title)
     [type, title]
   end
 
-
   def self.extract_type_and_title(argtype, argtitle)
     if (argtype.nil? || argtype == :component || argtype == :whit) &&
           argtitle =~ /^([^\[\]]+)\[(.+)\]$/m                  then [ $1,                 $2            ]
diff --git a/lib/puppet/settings.rb b/lib/puppet/settings.rb
@@ -382,7 +382,6 @@ def self.clean_opt(opt, val)
     [opt, val]
   end
 
-
   def app_defaults_initialized?
     @app_defaults_initialized
   end
diff --git a/lib/puppet/settings/errors.rb b/lib/puppet/settings/errors.rb
@@ -6,6 +6,7 @@ class Puppet::Settings
   class SettingsError < Puppet::Error ; end
   class ValidationError < SettingsError ; end
   class InterpolationError < SettingsError ; end
+
   class ParseError < SettingsError
     include Puppet::ExternalFileError
   end
diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb
@@ -1218,7 +1218,6 @@ def self.hash2resource(hash)
     resource
   end
 
-
   # Returns an array of strings representing the containment hierarchy
   # (types/classes) that make up the path to the resource from the root
   # of the catalog.  This is mostly used for logging purposes.
diff --git a/lib/puppet/type/file/target.rb b/lib/puppet/type/file/target.rb
@@ -71,7 +71,6 @@ def insync?(currentvalue)
       end
     end
 
-
     def retrieve
       stat = @resource.stat
       if stat
diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb
diff --git a/lib/puppet/util/package/version/range/eq.rb b/lib/puppet/util/package/version/range/eq.rb
diff --git a/lib/puppet/util/package/version/range/gt.rb b/lib/puppet/util/package/version/range/gt.rb
diff --git a/lib/puppet/util/package/version/range/gt_eq.rb b/lib/puppet/util/package/version/range/gt_eq.rb
diff --git a/lib/puppet/util/package/version/range/lt.rb b/lib/puppet/util/package/version/range/lt.rb
diff --git a/lib/puppet/util/package/version/range/lt_eq.rb b/lib/puppet/util/package/version/range/lt_eq.rb
diff --git a/lib/puppet/util/package/version/range/min_max.rb b/lib/puppet/util/package/version/range/min_max.rb
diff --git a/lib/puppet/util/windows.rb b/lib/puppet/util/windows.rb
diff --git a/lib/puppet/util/windows/adsi.rb b/lib/puppet/util/windows/adsi.rb
diff --git a/util/rspec_runner b/util/rspec_runner

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ def start(site, verifier, http)`
`71`	`71`	`end`
`72`	`72`	`end`
`73`	`73`
`74`		`-`
`75`	`74`	`# Safely close a persistent connection.`
`76`	`75`	`# Don't try to close a connection that's already closed.`
`77`	`76`	`#`