Unify error message for invalid option.

No need to `puts` part of it and `abort` with the rest.

lib/rspec/core/option_parser.rb

@@ -20,8 +20,7 @@ def parse!(args)
       begin
         parser(options).parse!(args)
       rescue OptionParser::InvalidOption => e
-        puts e.message
-        abort "please use --help for documentation on the options available"
+        abort "#{e.message}\n\nPlease use --help for a listing of valid options"
       end
 
       options

spec/rspec/core/option_parser_spec.rb

@@ -17,8 +17,13 @@ module RSpec::Core
 
     it "proposes you to use --help and returns an error on incorrect argument" do
       parser = Parser.new
-      parser.should_receive(:abort).with(/use --help/)
-      parser.parse!(%w[--my_very_wrong_argument_ein])
+      option = "--my_wrong_arg"
+
+      parser.should_receive(:abort) do |msg|
+        expect(msg).to include('use --help', option)
+      end
+
+      parser.parse!([option])
     end
 
     describe "--formatter" do