(PUP-11767) Enable Style/ClassMethods|CollectionCompact

Author: tvpartytonight

.rubocop.yml

@@ -214,3 +214,9 @@ Style/ClassCheck:
 
 Style/ClassEqualityComparison:
   Enabled: true
+
+Style/ClassMethods:
+  Enabled: true
+
+Style/CollectionCompact:
+  Enabled: true

lib/puppet/generate/models/type/property.rb

@@ -61,7 +61,7 @@ def self.get_puppet_type(property)
             enum    = strings.empty? ? nil : "Enum[#{strings.join(', ')}]"
             pattern = regexes.empty? ? nil : "Pattern[#{regexes.join(', ')}]"
             boolean = strings.include?('\'true\'') || strings.include?('\'false\'') ? 'Boolean' : nil
-            variant = [boolean, enum, pattern].reject { |t| t.nil? }
+            variant = [boolean, enum, pattern].compact
             return variant[0] if variant.size == 1
 
             "Variant[#{variant.join(', ')}]"

lib/puppet/parser/ast/resource.rb

@@ -61,6 +61,6 @@ def evaluate(scope)
           resource
         end
       end
-    end.flatten.reject { |resource| resource.nil? }
+    end.flatten.compact
   end
 end

lib/puppet/provider/package/blastwave.rb

@@ -47,7 +47,7 @@ def self.blastlist(hash)
       next if line =~ /localrev\s+remoterev/
 
       blastsplit(line)
-    end.reject { |h| h.nil? }
+    end.compact
 
     if hash[:justme]
       return list[0]

lib/puppet/provider/package/gem.rb

@@ -121,7 +121,7 @@ def self.gemlist(options)
     begin
       list = execute_gem_command(options[:command], command_options).lines
                                                                     .map { |set| gemsplit(set) }
-                                                                    .reject { |x| x.nil? }
+                                                                    .compact
     rescue Puppet::ExecutionFailure => detail
       raise Puppet::Error, _("Could not list gems: %{detail}") % { detail: detail }, detail.backtrace
     end

lib/puppet/provider/package/pkgutil.rb

@@ -74,7 +74,7 @@ def self.availlist
       else
         Puppet.warning _("Cannot match %{line}") % { line: line }
       end
-    end.reject { |h| h.nil? }
+    end.compact
   end
 
   # Turn our pkgutil -c listing into a hash for a single package.
@@ -99,7 +99,7 @@ def self.parse_pkglist(output, hash = {})
       next if noise?(line)
 
       pkgsplit(line)
-    end.reject { |h| h.nil? }
+    end.compact
 
     if hash[:justme]
       # Single queries may have been for an alias so return the name requested

lib/puppet/type.rb

@@ -2149,7 +2149,7 @@ def builddepends
     self.class.relationship_params.collect do |klass|
       param = @parameters[klass.name]
       param.to_edges if param
-    end.flatten.reject { |r| r.nil? }
+    end.flatten.compact
   end
 
   # Sets the initial list of tags to associate to this resource.
@@ -2504,7 +2504,7 @@ def finish
     self.class.relationship_params.collect do |klass|
       param = @parameters[klass.name]
       param.validate_relationship if param
-    end.flatten.reject { |r| r.nil? }
+    end.flatten.compact
   end
 
   # @comment For now, leave the 'name' method functioning like it used to.  Once 'title'

lib/puppet/type/file.rb

@@ -592,7 +592,7 @@ def newchild(path)
     # or so.  Unfortunately, we don't have a straightforward way to manage
     # the different lifetimes of this data, so we kludge it like this.
     # The right-side hash wins in the merge.
-    options = @original_parameters.merge(:path => full_path).reject { |_param, value| value.nil? }
+    options = @original_parameters.merge(:path => full_path).compact
 
     # These should never be passed to our children.
     [:parent, :ensure, :recurse, :recurselimit, :max_files, :target, :alias, :source].each do |param|

lib/puppet/util/fileparsing.rb

@@ -116,7 +116,7 @@ def join(details)
         else
           details[field].to_s
         end
-      }.reject { |c| c.nil? }.join(joinchar)
+      }.compact.join(joinchar)
     end
 
     # Customize this so we can do a bit of validation.