set good defaults

Author: busterb

lib/msf/core/opt_enum.rb

@@ -1,48 +1,45 @@
 # -*- coding: binary -*-
 
 module Msf
+  ###
+  #
+  # Enum option.
+  #
+  ###
+  class OptEnum < OptBase
+    def type
+      return 'enum'
+    end
 
-###
-#
-# Enum option.
-#
-###
-class OptEnum < OptBase
-
-  def type
-    return 'enum'
-  end
-
-  def valid?(value=self.value, check_empty: true)
-    return false if check_empty && empty_required_value?(value)
-    return true if value.nil? and !required?
-
-    (value and self.enums.include?(value.to_s))
-  end
-
-  def normalize(value=self.value)
-    return nil if not self.valid?(value)
-    return value.to_s
-  end
-
-  def desc=(value)
-    self.desc_string = value
+    # This overrides required default from 'false' to 'true'
+    def initialize(in_name, attrs = [],
+                   required: true, desc: nil, default: nil, enums: [], aliases: [])
+      super
+    end
 
-    self.desc
-  end
+    def valid?(value = self.value, check_empty: true)
+      return false if check_empty && empty_required_value?(value)
+      return true if value.nil? && !required?
 
-  def desc
-    if self.enums
-      str = self.enums.join(', ')
+      (value && enums.include?(value.to_s))
     end
-    "#{self.desc_string || ''} (Accepted: #{str})"
-  end
 
+    def normalize(value = self.value)
+      !valid?(value) ? nil : value.to_s
+    end
 
-protected
+    def desc=(value)
+      self.desc_string = value
+      desc
+    end
 
-  attr_accessor :desc_string # :nodoc:
+    def desc
+      str = enums.join(', ') if enums
+      "#{desc_string || ''} (Accepted: #{str})"
+    end
 
-end
+    protected
 
+    attr_accessor :desc_string # :nodoc:
+  end
 end