Naming/MethodName

Pops implements the visitor pattern and that relies on the convention of
methods being namedoperation_Class. This commit excludes
puppet/functions, puppet/pops, and puppet/util/windows from the Rubocop
Naming/MethodName cop.

Additionally, this commit updates the rpm_compareEVR methods in both
Puppet::Util::Package::Version::Rpm and Puppet::Util::RpmCompare to
instead be called rpm_compare_evr to adhere to snake case.

Author: mhashizume

.rubocop.yml

@@ -92,5 +92,12 @@ Naming/MemoizedInstanceVariableName:
     - 'lib/puppet/provider/package/portage.rb'
     - 'lib/puppet/resource.rb'
 
+Naming/MethodName:
+  Exclude:
+    - 'lib/puppet/functions/**/*'
+    - 'lib/puppet/parser/ast/pops_bridge.rb'
+    - 'lib/puppet/pops/**/*'
+    - 'lib/puppet/util/windows/**/*'
+
 Naming/MethodParameterName:
   Enabled: false

.rubocop_todo.yml

@@ -656,11 +656,6 @@ Naming/BlockParameterName:
     - 'lib/puppet/util/windows/daemon.rb'
     - 'lib/puppet/util/windows/user.rb'
 
-# Configuration parameters: EnforcedStyle, AllowedPatterns, IgnoredPatterns.
-# SupportedStyles: snake_case, camelCase
-Naming/MethodName:
-  Enabled: false
-
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros.
 # NamePrefix: is_, has_, have_
 # ForbiddenPrefixes: is_, has_, have_

lib/puppet/provider/package/rpm.rb

@@ -190,7 +190,7 @@ def insync?(is)
 
     should = resource[:ensure]
     is.split(self.class::MULTIVERSION_SEPARATOR).any? do |version|
-      0 == rpm_compareEVR(should, version)
+      0 == rpm_compare_evr(should, version)
     end
   end
 

lib/puppet/provider/package/yum.rb

@@ -292,10 +292,10 @@ def install
         if @resource[:install_only]
           self.debug "Updating package #{@resource[:name]} from version #{current_package[:ensure]} to #{should} as install_only packages are never downgraded"
           operation = update_command
-        elsif rpm_compareEVR(should, current_package[:ensure]) < 0
+        elsif rpm_compare_evr(should, current_package[:ensure]) < 0
           self.debug "Downgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = :downgrade
-        elsif rpm_compareEVR(should, current_package[:ensure]) > 0
+        elsif rpm_compare_evr(should, current_package[:ensure]) > 0
           self.debug "Upgrading package #{@resource[:name]} from version #{current_package[:ensure]} to #{should}"
           operation = update_command
         end

lib/puppet/util/package/version/rpm.rb

@@ -39,18 +39,18 @@ def eql?(other)
     def <=>(other)
       raise ArgumentError, _("Cannot compare, as %{other} is not a Rpm Version") % { other: other } unless other.is_a?(self.class)
 
-      rpm_compareEVR(self.to_s, other.to_s)
+      rpm_compare_evr(self.to_s, other.to_s)
     end
 
     private
 
-    # overwrite rpm_compareEVR to treat no epoch as zero epoch
+    # overwrite rpm_compare_evr to treat no epoch as zero epoch
     # in order to compare version correctly
     #
     # returns 1 if a is newer than b,
     #         0 if they are identical
     #        -1 if a is older than b
-    def rpm_compareEVR(a, b)
+    def rpm_compare_evr(a, b)
       a_hash = rpm_parse_evr(a)
       b_hash = rpm_parse_evr(b)
 

lib/puppet/util/rpm_compare.rb

@@ -165,7 +165,7 @@ def compare_values(s1, s2)
   # return 1: a is newer than b
   #        0: a and b are the same version
   #       -1: b is newer than a
-  def rpm_compareEVR(should, is)
+  def rpm_compare_evr(should, is)
     # pass on to rpm labelCompare
     should_hash = rpm_parse_evr(should)
     is_hash = rpm_parse_evr(is)

spec/unit/util/rpm_compare_spec.rb

@@ -91,35 +91,35 @@ class RpmTest
     it { expect(RpmTest.rpmvercmp('1', '0')).to eq(1) }
   end
 
-  describe '.rpm_compareEVR' do
+  describe '.rpm_compare_evr' do
     it 'evaluates identical version-release as equal' do
-      expect(RpmTest.rpm_compareEVR('1.2.3-1.el5', '1.2.3-1.el5')).to eq(0)
+      expect(RpmTest.rpm_compare_evr('1.2.3-1.el5', '1.2.3-1.el5')).to eq(0)
     end
 
     it 'evaluates identical version as equal' do
-      expect(RpmTest.rpm_compareEVR('1.2.3', '1.2.3')).to eq(0)
+      expect(RpmTest.rpm_compare_evr('1.2.3', '1.2.3')).to eq(0)
     end
 
     it 'evaluates identical version but older release as less' do
-      expect(RpmTest.rpm_compareEVR('1.2.3-1.el5', '1.2.3-2.el5')).to eq(-1)
+      expect(RpmTest.rpm_compare_evr('1.2.3-1.el5', '1.2.3-2.el5')).to eq(-1)
     end
 
     it 'evaluates identical version but newer release as greater' do
-      expect(RpmTest.rpm_compareEVR('1.2.3-3.el5', '1.2.3-2.el5')).to eq(1)
+      expect(RpmTest.rpm_compare_evr('1.2.3-3.el5', '1.2.3-2.el5')).to eq(1)
     end
 
     it 'evaluates a newer epoch as greater' do
-      expect(RpmTest.rpm_compareEVR('1:1.2.3-4.5', '1.2.3-4.5')).to eq(1)
+      expect(RpmTest.rpm_compare_evr('1:1.2.3-4.5', '1.2.3-4.5')).to eq(1)
     end
 
     # these tests describe PUP-1244 logic yet to be implemented
     it 'evaluates any version as equal to the same version followed by release' do
-      expect(RpmTest.rpm_compareEVR('1.2.3', '1.2.3-2.el5')).to eq(0)
+      expect(RpmTest.rpm_compare_evr('1.2.3', '1.2.3-2.el5')).to eq(0)
     end
 
     # test cases for PUP-682
     it 'evaluates same-length numeric revisions numerically' do
-      expect(RpmTest.rpm_compareEVR('2.2-405', '2.2-406')).to eq(-1)
+      expect(RpmTest.rpm_compare_evr('2.2-405', '2.2-406')).to eq(-1)
     end
   end