jruby-launcher 1.0.5-java → 1.0.6-java

data/argparser.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 JRuby Team (www.jruby.org).
+ * Copyright 2009-2011 JRuby Team (www.jruby.org).
  */
 
 #include <cstring>
@@ -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,14 @@ 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"
+"  -Xconsole <mode>      jrubyw console attach mode (new|attach|suppress)\n"
 #endif
-"To see general JRuby options, type 'jruby -h' or 'jruby --help'.\n";
+"\n"
+;
 
 const char *ArgParser::REQ_JAVA_VERSION = "1.5";
 
@@ -309,11 +310,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());
             }
+            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;
         } else if (strcmp(it->c_str(), "-Xversion") == 0) {
             printToConsole("JRuby Launcher Version " JRUBY_LAUNCHER_VERSION "\n");
@@ -419,8 +424,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) {

data/lib/jruby-launcher.rb

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

data/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

data/spec/launcher_spec.rb

@@ -10,7 +10,12 @@ describe "JRuby native launcher" do
   end
 
   it "should print help message" do
-    jruby_launcher("-Xhelp 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
@@ -86,8 +91,8 @@ describe "JRuby native launcher" do
     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

data/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_

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: java
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -06:00
+date: 2011-01-27 00:00:00 -06:00
 default_executable: 
 dependencies: []