jruby-launcher 0.9.9-java → 1.0-java

data/argparser.cpp

@@ -205,7 +205,7 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
 
 #define CHECK_ARG                                                       \
     it++;								\
-    if (it == args.end() || it->at(0) == '-') {				\
+    if (it == args.end() || it->empty() || it->at(0) == '-') {	\
         logErr(false, true, "Argument is missing for \"%s\" option.", (--it)->c_str()); \
         return false;                                                   \
     }									\
@@ -214,6 +214,13 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
 
     addEnvVarToOptions(javaOptions, "JAVA_OPTS");
     addEnvVarToOptions(args, "JRUBY_OPTS");
+
+#ifdef __MACH__
+    if (getenv("JAVA_ENCODING") == NULL) {
+        javaOptions.push_back("-Dfile.encoding=UTF-8");
+    }
+#endif
+
     addToArgList(args, argc, argv);
 
     logMsg("Parsing arguments:");
@@ -227,7 +234,7 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
     for (list<string>::iterator it = args.begin(); it != args.end(); INCR) {
         if (doneScanning) {
             progArgs.push_back(*it);
-        } else if (it->compare("--") == 0 || it->at(0) != '-') {
+        } else if (it->compare("--") == 0 || it->empty() || it->at(0) != '-') {
             progArgs.push_back(*it);
             doneScanning = true;
         } else if (it->compare(ARG_NAME_SEPAR_PROC) == 0) {

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "0.9.9"
+  VERSION = "1.0"
 end

data/spec/launcher_spec.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../spec_helper.rb', __FILE__)
+require 'rbconfig'
 
 describe "JRuby native launcher" do
   it "should run org.jruby.Main" do
@@ -131,4 +132,20 @@ describe "JRuby native launcher" do
   it "stops argument processing on first non-option argument" do
     jruby_launcher_args("foo.rb --profile")[-2..-1].should == ["foo.rb", "--profile"]
   end
+
+  # JRUBY-4608
+  if Config::CONFIG['target_os'] =~ /darwin/i
+    it "includes file.encoding=UTF-8 on Mac if JAVA_ENCODING is not set" do
+      jruby_launcher_args("-e true").should include("-Dfile.encoding=UTF-8")
+      with_environment "JAVA_ENCODING" => "MacRoman" do
+        jruby_launcher_args("-e true").should_not include("-Dfile.encoding=UTF-8")
+      end
+    end
+  end
+
+  it "does not crash on empty args" do
+    jruby_launcher_args("-e ''").should include("-e")
+    jruby_launcher("-Xtrace '' 2>&1").should =~ /-Xtrace/
+    jruby_launcher("-Xjdkhome '' 2>&1").should =~ /-Xjdkhome/
+  end
 end

data/spec/spec_helper.rb

@@ -56,6 +56,7 @@ Spec::Runner.configure do |config|
     ENV.delete("JAVA_OPTS")
     ENV.delete("JRUBY_OPTS")
     ENV.delete("CLASSPATH")
+    ENV.delete("JAVA_ENCODING")
   end
   config.include(JRubyLauncherHelper)
 end

metadata

@@ -3,10 +3,9 @@ name: jruby-launcher
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+    - 1
     - 0
-    - 9
-    - 9
-  version: 0.9.9
+  version: "1.0"
 platform: java
 authors: 
   - Nick Sieger
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-01 00:00:00 -06:00
+date: 2010-04-07 00:00:00 -05:00
 default_executable: 
 dependencies: []