clean up so idiomatic ruby details

Author: kernelsmith

lib/msf/ui/console/command_dispatcher/core.rb

@@ -764,7 +764,7 @@ def cmd_irb_help
     print_line "Usage: irb"
     print_line
     print_line "Execute commands in a Ruby environment"
-    print @@irb_opts.usage()
+    print @@irb_opts.usage
   end
 
   #
@@ -778,32 +778,29 @@ def cmd_irb(*args)
     # Parse the command options
     @@irb_opts.parse(args) do |opt, idx, val|
       case opt
-        when '-e'
-          expressions << val
-        when '-h'
-          cmd_irb_help
-          return false
-      end
-    end
-
-    if !expressions.empty?
-      expressions.each do |expression|
-        eval(expression, binding)
+      when '-e'
+        expressions << val
+      when '-h'
+        cmd_irb_help
+        return false
       end
-      return
     end
 
-    print_status("Starting IRB shell...\n")
+    if expressions.empty?
+      print_status("Starting IRB shell...\n")
 
-    begin
-      Rex::Ui::Text::IrbShell.new(binding).run
-    rescue
-      print_error("Error during IRB: #{$!}\n\n#{$@.join("\n")}")
-    end
+      begin
+        Rex::Ui::Text::IrbShell.new(binding).run
+      rescue
+        print_error("Error during IRB: #{$!}\n\n#{$@.join("\n")}")
+      end
 
-    # Reset tab completion
-    if (driver.input.supports_readline)
-      driver.input.reset_tab_completion
+      # Reset tab completion
+      if (driver.input.supports_readline)
+        driver.input.reset_tab_completion
+      end
+    else
+      expressions.each { |expression| eval(expression, binding) }
     end
   end
 

lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb

@@ -330,7 +330,7 @@ def cmd_irb_help
     print_line "Usage: irb"
     print_line
     print_line "Execute commands in a Ruby environment"
-    print @@irb_opts.usage()
+    print @@irb_opts.usage
   end
 
   #
@@ -342,28 +342,24 @@ def cmd_irb(*args)
     # Parse the command options
     @@irb_opts.parse(args) do |opt, idx, val|
       case opt
-        when '-e'
-          expressions << val
-        when '-h'
-          cmd_irb_help
-          return
+      when '-e'
+        expressions << val
+      when '-h'
+        return cmd_irb_help
       end
     end
 
     session = client
     framework = client.framework
 
-    if !expressions.empty?
-      expressions.each do |expression|
-        eval(expression, binding)
-      end
-      return
-    end
-
-    print_status("Starting IRB shell")
-    print_status("The 'client' variable holds the meterpreter client\n")
+    if expressions.empty?
+      print_status("Starting IRB shell")
+      print_status("The 'client' variable holds the meterpreter client\n")
 
-    Rex::Ui::Text::IrbShell.new(binding).run
+      Rex::Ui::Text::IrbShell.new(binding).run
+    else
+      expressions.each { |expression| eval(expression, binding) }
+    end
   end
 
   @@set_timeouts_opts = Rex::Parser::Arguments.new(