jruby-launcher 1.0.2-java → 1.0.3-java

data/argparser.cpp

@@ -37,7 +37,9 @@ 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\
+  -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
@@ -316,6 +318,14 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
         } else if (strcmp(it->c_str(), "-Xversion") == 0) {
             printToConsole("JRuby Launcher Version " JRUBY_LAUNCHER_VERSION "\n");
             return false;
+        } else if (strcmp(it->c_str(), "-Xproperties") == 0) {
+			progArgs.push_back(std::string("--properties"));
+        } else if (it->compare(0, 2, "-X", 2) == 0 && islower(it->c_str()[2])) {
+	        // Any other /-X([a-z].*)/ get turned into a -Djruby.\1 property
+			std::string propPart = it->substr(2);
+	        std::string propSet = std::string("-Djruby.");
+			propSet += propPart;
+            javaOptions.push_back(propSet);
         } else {
             progArgs.push_back(*it);
         }

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/spec/launcher_spec.rb

@@ -60,6 +60,14 @@ describe "JRuby native launcher" do
     jruby_launcher_args("-J-Darg1=value1 -J-Darg2=value2").should include("-Darg1=value1", "-Darg2=value2")
   end
 
+  it "should pass -Xprop.erty=value as -J-Djruby.prop.erty=value" do
+    jruby_launcher_args("-Xprop.erty=value").should include("-Djruby.prop.erty=value")
+  end
+
+  it "should pass -Xproperties as --properties" do
+    jruby_launcher_args("-Xproperties").should include("--properties")
+  end
+
   it "should default to 500m max heap" do
     jruby_launcher_args("").should include("-Xmx500m", "-Djruby.memory.max=500m")
   end

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.1"
+#define JRUBY_LAUNCHER_VERSION "1.0.3"
 
 #endif // ! _VERSION_H_

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: java
 authors: 
 - Nick Sieger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 -06:00
+date: 2010-11-30 00:00:00 -06:00
 default_executable: 
 dependencies: []