more minor cleanup

cleanup from code review

app/validators/metasploit/framework/executable_path_validator.rb

@@ -2,7 +2,7 @@ module Metasploit
   module Framework
     # This is a ActiveModel custom validator that assumes the attribute
     # is supposed to be the path to a regular file. It checks whether the
-    # file exists and whether or not it is a regular file.
+    # file exists and whether or not it is an executable file.
     class ExecutablePathValidator < ActiveModel::EachValidator
 
       def validate_each(record, attribute, value)

lib/metasploit/framework/jtr/cracker.rb

@@ -74,7 +74,7 @@ module Metasploit
         # @return [String] the path to the selected JtR binary
         def binary_path
           # Always prefer a manually entered path
-          if john_path and ::File.file? john_path
+          if john_path && ::File.file? john_path
             bin_path = john_path
           else
             # Look in the Environment PATH for the john binary
@@ -146,6 +146,18 @@ module Metasploit
           cmd << hash_path
         end
 
+        # This runs the show command in john and yields cracked passwords.
+        #
+        # @yield [String] the output lines from the command
+        # @return [void]
+        def each_cracked_password
+          ::IO.popen(show_command, "rb") do |fd|
+            fd.each_line do |line|
+              yield line
+            end
+          end
+        end
+
         # This method returns the path to a default john.pot file.
         #
         # @return [String] the path to the default john.pot file
@@ -178,18 +190,6 @@ module Metasploit
           cmd << hash_path
         end
 
-        # This runs the show command in john to show cracked passwords.
-        #
-        # @yield [String] the output lines from the command
-        # @return [void]
-        def show_passwords
-          ::IO.popen(show_command, "rb") do |fd|
-            fd.each_line do |line|
-              yield line
-            end
-          end
-        end
-
         private
 
         # This method tries to identify the correct version of the pre-shipped