Merge branch 'master' of [email protected]:jruby/jruby-launcher

Author: nicksieger

argparser.cpp

@@ -23,8 +23,8 @@ using namespace std;
 
 const char *ArgParser::HELP_MSG =
 "JRuby Launcher usage: jruby" EXEEXT " {options} arguments\n\n\
+To see general JRuby options, type 'jruby -h' or 'jruby --help'.\n\n\
 Options:\n\
-  -Xhelp                show this help\n\
   -Xversion             print launcher's version\n\
 \nJvm Management:\n\
   -Xjdkhome <path>      set path to JDK\n\
@@ -37,13 +37,13 @@ Options:\n\
   -Xnobootclasspath     don't put jruby jars on the bootclasspath\n\
 \nMisc:\n\
   -Xtrace <path>        path for launcher log (for troubleshooting)\n\
-  -Xcommand             just print the equivalent java command and exit\n\
+  -Xcommand             just print the equivalent java command and exit\n\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"
 #endif
-"To see general JRuby options, type 'jruby -h' or 'jruby --help'.\n";
+;
 
 const char *ArgParser::REQ_JAVA_VERSION = "1.5";
 
@@ -309,11 +309,15 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
                 noBootClassPath = true;
             }
             javaOptions.push_back(javaOpt);
-        } else if (strcmp(it->c_str(), "-Xhelp") == 0) {
+        } else if (strcmp(it->c_str(), "-Xhelp") == 0 || strcmp(it->c_str(), "-X") == 0) {
             printToConsole(HELP_MSG);
             if (!appendHelp.empty()) {
                 printToConsole(appendHelp.c_str());
             }
+            progArgs.push_back("-Xnopreamble");
+            return false;
+        } else if (strcmp(it->c_str(), "-Xversion") == 0) {
+            printToConsole("JRuby Launcher Version " JRUBY_LAUNCHER_VERSION "\n");
             return false;
         } else if (strcmp(it->c_str(), "-Xversion") == 0) {
             printToConsole("JRuby Launcher Version " JRUBY_LAUNCHER_VERSION "\n");
@@ -419,8 +423,8 @@ void ArgParser::prepareOptions() {
 }
 
 void ArgParser::setupMaxHeapAndStack() {
-    // Hard-coded 500m, 1024k is for consistency with jruby shell script.
-    string heapSize("500m"), stackSize("1024k");
+    // Hard-coded 500m, 2048k is for consistency with jruby shell script.
+    string heapSize("500m"), stackSize("2048k");
     bool maxHeap = false, maxStack = false;
     for (list<string>::iterator it = javaOptions.begin(); it != javaOptions.end(); it++) {
         if (!maxHeap && strncmp("-Xmx", it->c_str(), 4) == 0) {

lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

lib/rubygems/defaults/jruby_native.rb

@@ -1,4 +1,4 @@
 class Gem::ConfigFile
-  PLATFORM_DEFAULTS.delete('install')
-  PLATFORM_DEFAULTS.delete('update')
+  PLATFORM_DEFAULTS['install'] = '--no-rdoc --no-ri'
+  PLATFORM_DEFAULTS['update'] = '--no-rdoc --no-ri'
 end

spec/launcher_spec.rb

@@ -11,6 +11,7 @@
 
   it "should print help message" do
     jruby_launcher("-Xhelp 2>&1").should =~ /JRuby Launcher usage/
+    jruby_launcher("-X 2>&1").should =~ /JRuby Launcher usage/
   end
 
   it "should use $JAVACMD when JAVACMD is specified" do
@@ -86,8 +87,8 @@
     jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
   end
 
-  it "should default to 1024k max stack" do
-    jruby_launcher_args("").should include("-Xss1024k", "-Djruby.stack.max=1024k")
+  it "should default to 2048k max stack" do
+    jruby_launcher_args("").should include("-Xss2048k", "-Djruby.stack.max=2048k")
   end
 
   it "should allow max stack to be overridden" do

version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.5"
+#define JRUBY_LAUNCHER_VERSION "1.0.6"
 
 #endif // ! _VERSION_H_