Merge pull request #9029 from tvpartytonight/PUP-11770-handle_lint_cops_DuplicateMethods

(PUP-11770) Eliminate duplicate methods reported by rubocop

Author: AriaXLi

.rubocop_todo.yml

@@ -596,9 +596,6 @@ Lint/DeprecatedOpenSSLConstant:
     - 'lib/puppet/util/checksums.rb'
     - 'lib/puppet/x509/cert_provider.rb'
 
-Lint/DuplicateMethods:
-  Enabled: false
-
 # This cop supports safe auto-correction (--auto-correct).
 Lint/ElseLayout:
   Exclude:

lib/puppet/application/face_base.rb

@@ -27,7 +27,8 @@ class Puppet::Application::FaceBase < Puppet::Application
     exit(0)
   end
 
-  attr_accessor :face, :action, :type, :arguments, :render_as
+  attr_reader :render_as
+  attr_accessor :face, :action, :type, :arguments
 
   def render_as=(format)
     @render_as = Puppet::Network::FormatHandler.format(format)

lib/puppet/interface/action.rb

@@ -141,7 +141,7 @@ def __render_method_name_for(type)
 
   # @api private
   # @return [Symbol]
-  attr_accessor :render_as
+  attr_reader :render_as
   def render_as=(value)
     @render_as = value.to_sym
   end
@@ -216,11 +216,11 @@ def deprecated?
 
   # The arity of the action
   # @return [Integer]
-  attr_reader   :positional_arg_count
+  attr_reader :positional_arg_count
 
   # The block that is executed when the action is invoked
   # @return [block]
-  attr_accessor :when_invoked
+  attr_reader :when_invoked
   def when_invoked=(block)
 
     internal_name = "#{@name} implementation, required on Ruby 1.8".to_sym

lib/puppet/interface/documentation.rb

@@ -266,7 +266,7 @@ def copyright(owner = nil, years = nil)
     #   owners.
     # @return [String] Comma-separated list of copyright owners
     # @api private
-    attr_accessor :copyright_owner
+    attr_reader :copyright_owner
     def copyright_owner=(value)
       case value
       when String then @copyright_owner = value
@@ -283,7 +283,7 @@ def copyright_owner=(value)
     #   copyright year or years.
     # @return [String]
     # @api private
-    attr_accessor :copyright_years
+    attr_reader :copyright_years
     def copyright_years=(value)
       years = munge_copyright_year value
       years = (years.is_a?(Array) ? years : [years]).

lib/puppet/interface/option.rb

@@ -132,16 +132,15 @@ def default
     @default and @default.call
   end
 
-  attr_reader   :parent, :name, :aliases, :optparse
-  attr_accessor :required
+  attr_reader :parent, :name, :aliases, :optparse, :required
   def required=(value)
     if has_default?
       raise ArgumentError, _("%{name} can't be optional and have a default value") % { name: self }
     end
     @required = value
   end
 
-  attr_accessor :before_action
+  attr_reader :before_action
   def before_action=(proc)
     unless proc.is_a? Proc
       #TRANSLATORS 'proc' is a Ruby block of code
@@ -152,7 +151,7 @@ def before_action=(proc)
       @parent.__send__(:__add_method, __decoration_name(:before), proc)
   end
 
-  attr_accessor :after_action
+  attr_reader :after_action
   def after_action=(proc)
     unless proc.is_a? Proc
       #TRANSLATORS 'proc' is a Ruby block of code

lib/puppet/module.rb

@@ -62,7 +62,7 @@ def self.parse_range(range)
     SemanticPuppet::VersionRange.parse(range)
   end
 
-  attr_reader :name, :environment, :path, :metadata, :tasks, :plans
+  attr_reader :name, :environment, :path, :metadata
   attr_writer :environment
 
   attr_accessor :dependencies, :forge_name

lib/puppet/module/plan.rb

@@ -104,7 +104,7 @@ def self.plans_in_module(pup_module)
       end
     end
 
-    attr_reader :name, :module, :metadata_file, :metadata
+    attr_reader :name, :module, :metadata_file
 
     # file paths must be relative to the modules plan directory
     def initialize(pup_module, plan_name, plan_files)

lib/puppet/module/task.rb

@@ -215,7 +215,7 @@ def self.tasks_in_module(pup_module)
       end
     end
 
-    attr_reader :name, :module, :metadata_file, :metadata
+    attr_reader :name, :module, :metadata_file
 
     # file paths must be relative to the modules task directory
     def initialize(pup_module, task_name,  module_executables, metadata_file = nil)

lib/puppet/node.rb

@@ -16,8 +16,8 @@ class Puppet::Node
   indirects :node, :terminus_setting => :node_terminus, :doc => "Where to find node information.
     A node is composed of its name, its facts, and its environment."
 
-  attr_accessor :name, :classes, :source, :ipaddress, :parameters, :trusted_data, :environment_name
-  attr_reader :time, :facts
+  attr_accessor :name, :classes, :source, :ipaddress, :parameters, :environment_name
+  attr_reader :time, :facts, :trusted_data
 
   attr_reader :server_facts
 

lib/puppet/pops/functions/function.rb

@@ -11,9 +11,6 @@
 #
 # @api public
 class Puppet::Pops::Functions::Function
-  # The scope where the function was defined
-  attr_reader :closure_scope
-
   # The loader that loaded this function.
   # Should be used if function wants to load other things.
   #
@@ -74,6 +71,7 @@ def call_function(function_name, *args, &block)
     internal_call_function(closure_scope, function_name, args, &block)
   end
 
+  # The scope where the function was defined
   def closure_scope
     # If closure scope is explicitly set to not nil, if there is a global scope, otherwise an empty hash
     @closure_scope || Puppet.lookup(:global_scope) { {} }