Performance/MapCompact

Author: mhashizume

lib/puppet/provider/package/blastwave.rb

@@ -41,13 +41,13 @@ def self.blastlist(hash)
 
     output = Puppet::Util.withenv(:PAGER => "/usr/bin/cat") { pkgget command }
 
-    list = output.split("\n").collect do |line|
+    list = output.split("\n").filter_map do |line|
       next if line =~ /^#/
       next if line =~ /^WARNING/
       next if line =~ /localrev\s+remoterev/
 
       blastsplit(line)
-    end.compact
+    end
 
     if hash[:justme]
       return list[0]

lib/puppet/provider/package/gem.rb

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

lib/puppet/provider/package/pkgutil.rb

@@ -65,7 +65,7 @@ def self.instances(hash = {})
   def self.availlist
     output = pkguti ["-a"]
 
-    output.split("\n").collect do |line|
+    output.split("\n").filter_map do |line|
       next if line =~ /^common\s+package/ # header of package list
       next if noise?(line)
 
@@ -74,7 +74,7 @@ def self.availlist
       else
         Puppet.warning _("Cannot match %{line}") % { line: line }
       end
-    end.compact
+    end
   end
 
   # Turn our pkgutil -c listing into a hash for a single package.
@@ -94,12 +94,12 @@ def self.parse_pkglist(output, hash = {})
       return nil
     end
 
-    list = output.collect do |line|
+    list = output.filter_map do |line|
       next if line =~ /installed\s+catalog/ # header of package list
       next if noise?(line)
 
       pkgsplit(line)
-    end.compact
+    end
 
     if hash[:justme]
       # Single queries may have been for an alias so return the name requested

lib/puppet/util/docs.rb

@@ -20,9 +20,9 @@ def dochook(name, &block)
 
   # Generate the full doc string.
   def doc
-    extra = methods.find_all { |m| m.to_s =~ /^dochook_.+/ }.sort.collect { |m|
+    extra = methods.find_all { |m| m.to_s =~ /^dochook_.+/ }.sort.filter_map { |m|
       self.send(m)
-    }.compact.collect { |r| "* #{r}" }.join("\n")
+    }.collect { |r| "* #{r}" }.join("\n")
 
     if @doc
       scrub(@doc) + (extra.empty? ? '' : "\n\n#{extra}")

lib/puppet/util/fileparsing.rb

@@ -105,7 +105,7 @@ def initialize(type,
     def join(details)
       joinchar = self.joiner
 
-      fields.collect { |field|
+      fields.filter_map { |field|
         # If the field is marked absent, use the appropriate replacement
         if details[field] == :absent or details[field] == [:absent] or details[field].nil?
           if self.optional.include?(field)
@@ -116,7 +116,7 @@ def join(details)
         else
           details[field].to_s
         end
-      }.compact.join(joinchar)
+      }.join(joinchar)
     end
 
     # Customize this so we can do a bit of validation.