Merge pull request rapid7#20312 from bcoles/rubocop-lib-msf-module-platform_list

Msf::Module::PlatformList: Resolve RuboCop violations

Author: adfoster-r7

lib/msf/core/module/platform_list.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 # -*- coding: binary -*-
 
 #
@@ -7,8 +6,6 @@
 # of Msf::Module::Platform objects.  It also supports ranges based on relative
 # ranks...
 #
-
-
 class Msf::Module::PlatformList
   attr_accessor :platforms
 
@@ -32,88 +29,85 @@ def self.transform(src)
   # Create an instance from an array
   #
   def self.from_a(ary)
-    self.new(*ary)
+    new(*ary)
   end
 
   def index(needle)
-    self.platforms.index(needle)
+    platforms.index(needle)
   end
 
   #
-  # Constructor, takes the entries are arguments
+  # Constructor, takes the entries as arguments
   #
   def initialize(*args)
-    self.platforms = [ ]
+    self.platforms = []
 
-    args.each { |a|
-      if a.kind_of?(String)
+    args.each do |a|
+      if a.is_a?(String)
         platforms << Msf::Module::Platform.find_platform(a)
-      elsif a.kind_of?(Range)
-        b = Msf::Module::Platform.find_platform(a.begin)
-        e = Msf::Module::Platform.find_platform(a.end)
+      elsif a.is_a?(Range)
+        a_begin = Msf::Module::Platform.find_platform(a.begin)
+        a_end = Msf::Module::Platform.find_platform(a.end)
+        range = (a_begin::Rank..a_end::Rank)
 
-        children = b.superclass.find_children
-        r        = (b::Rank .. e::Rank)
-        children.each { |c|
-          platforms << c if r.include?(c::Rank)
-        }
+        a_begin.superclass.find_children.each do |c|
+          platforms << c if range.include?(c::Rank)
+        end
       else
         platforms << a
       end
-
-    }
-
+    end
   end
 
   #
   # Checks to see if the platform list is empty.
   #
   def empty?
-    return platforms.empty?
+    platforms.empty?
   end
 
   #
   # Returns an array of names contained within this platform list.
   #
   def names
-    platforms.map { |m| m.realname }
+    platforms.map(&:realname)
   end
 
   #
   # Symbolic check to see if this platform list represents 'all' platforms.
   #
   def all?
-    names.include? ''
+    names.include?('')
   end
 
   #
-  # Do I support plist (do I support all of they support?)
+  # Do I support platform list (do I support all of they support?)
   # use for matching say, an exploit and a payload
   #
-  def supports?(plist)
-    plist.platforms.each { |pl|
+  def supports?(platform_list)
+    platform_list.platforms.each do |pl|
       supported = false
-      platforms.each { |p|
+      platforms.each do |p|
         if p >= pl
           supported = true
           break
         end
-      }
-      return false if !supported
-    }
+      end
+      return false unless supported
+    end
 
-    return true
+    true
   end
 
   #
   # used for say, building a payload from a stage and stager
   # finds common subarchitectures between the arguments
   #
-  def &(plist)
+  def &(other)
     l1 = platforms
-    l2 = plist.platforms
+    l2 = other.platforms
     total = l1.find_all { |m| l2.find { |mm| m <= mm } } |
-          l2.find_all { |m| l1.find { |mm| m <= mm } }
+            l2.find_all { |m| l1.find { |mm| m <= mm } }
     Msf::Module::PlatformList.from_a(total)
   end
 end