Fix nopreamble arg processing and specs to get mixed output working

Author: nicksieger

argparser.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 JRuby Team (www.jruby.org).
+ * Copyright 2009-2011 JRuby Team (www.jruby.org).
  */
 
 #include <cstring>
@@ -41,8 +41,9 @@ Options:\n\
   -Xprop.erty[=value]   equivalent to -J-Djruby.<prop.erty>[=value]\n\
   -Xproperties          list supported properties (omit \"jruby.\" with -X)\n"
 #ifdef WIN32
-"  -Xconsole <mode>      jrubyw console attach mode (new|attach|suppress)\n\n"
+"  -Xconsole <mode>      jrubyw console attach mode (new|attach|suppress)\n"
 #endif
+"\n"
 ;
 
 const char *ArgParser::REQ_JAVA_VERSION = "1.5";
@@ -314,8 +315,8 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
             if (!appendHelp.empty()) {
                 printToConsole(appendHelp.c_str());
             }
-            progArgs.push_back("-Xnopreamble");
-            return false;
+            javaOptions.push_back("-Djruby.launcher.nopreamble=true");
+            progArgs.push_back("-X");
         } else if (strcmp(it->c_str(), "-Xversion") == 0) {
             printToConsole("JRuby Launcher Version " JRUBY_LAUNCHER_VERSION "\n");
             return false;

spec/launcher_spec.rb

@@ -10,8 +10,12 @@
   end
 
   it "should print help message" do
-    jruby_launcher("-Xhelp 2>&1").should =~ /JRuby Launcher usage/
-    jruby_launcher("-X 2>&1").should =~ /JRuby Launcher usage/
+    args = jruby_launcher_args("-Xhelp 2>&1")
+    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
+    args[-1].should == "-X"
+    args = jruby_launcher_args("-X 2>&1")
+    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
+    args[-1].should == "-X"
   end
 
   it "should use $JAVACMD when JAVACMD is specified" do