jruby-launcher 1.0.13-java → 1.0.14-java

data/argparser.cpp

@@ -55,6 +55,7 @@ const char *ArgParser::OPT_JDK_HOME = "-Djdk.home=";
 const char *ArgParser::OPT_JRUBY_HOME = "-Djruby.home=";
 const char *ArgParser::OPT_JRUBY_COMMAND_NAME = "-Dsun.java.command=";
 
+const char *ArgParser::OPT_CMDLINE_CLASS_PATH = "-cp";
 const char *ArgParser::OPT_CLASS_PATH = "-Djava.class.path=";
 const char *ArgParser::OPT_BOOT_CLASS_PATH = "-Xbootclasspath/a:";
 
@@ -65,7 +66,7 @@ const char *ArgParser::MAIN_CLASS = "org/jruby/Main";
 const char *ArgParser::DEFAULT_EXECUTABLE = "jruby";
 
 ArgParser::ArgParser()
-    : separateProcess(false)
+    : separateProcess(true)
     , nailgunClient(false)
     , noBootClassPath(false)
     , printCommandLine(false)
@@ -433,9 +434,15 @@ void ArgParser::prepareOptions() {
     option += cmdName;
     javaOptions.push_back(option);
 
-    option = OPT_CLASS_PATH;
-    option += classPath;
-    javaOptions.push_back(option);
+    // When launching a separate process, use '-cp' which expands embedded wildcards
+    if (separateProcess) {
+        javaOptions.push_back(OPT_CMDLINE_CLASS_PATH);
+        javaOptions.push_back(classPath);
+    } else {
+        option = OPT_CLASS_PATH;
+        option += classPath;
+        javaOptions.push_back(option);
+    }
 
     if (!bootClassPath.empty()) {
         option = OPT_BOOT_CLASS_PATH;

data/argparser.h

@@ -19,6 +19,7 @@ protected:
     static const char *OPT_JRUBY_HOME;
     static const char *OPT_JRUBY_COMMAND_NAME;
 
+    static const char *OPT_CMDLINE_CLASS_PATH;
     static const char *OPT_CLASS_PATH;
     static const char *OPT_BOOT_CLASS_PATH;
 

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.0.13"
+  VERSION = "1.0.14"
 end

data/pkg/jruby-launcher-1.0.13-java/extconf.rb

@@ -0,0 +1,7 @@
+require 'rbconfig'
+
+mf = File.read('Makefile')
+mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{Config::CONFIG['bindir']}")
+mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(Config::CONFIG['libdir'])}")
+puts mf
+File.open('Makefile', 'wb') {|f| f << mf}

data/pkg/jruby-launcher-1.0.13-java/lib/jruby-launcher.rb

@@ -0,0 +1,3 @@
+module JRubyLauncher
+  VERSION = "1.0.13"
+end

data/pkg/jruby-launcher-1.0.13-java/lib/rubygems/defaults/jruby_native.rb

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

data/pkg/jruby-launcher-1.0.13-java/pkg/jruby-launcher-1.0.12-java/extconf.rb

@@ -0,0 +1,7 @@
+require 'rbconfig'
+
+mf = File.read('Makefile')
+mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{Config::CONFIG['bindir']}")
+mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(Config::CONFIG['libdir'])}")
+puts mf
+File.open('Makefile', 'wb') {|f| f << mf}

data/pkg/jruby-launcher-1.0.13-java/pkg/jruby-launcher-1.0.12-java/lib/jruby-launcher.rb

@@ -0,0 +1,3 @@
+module JRubyLauncher
+  VERSION = "1.0.12"
+end

data/pkg/jruby-launcher-1.0.13-java/pkg/jruby-launcher-1.0.12-java/lib/rubygems/defaults/jruby_native.rb

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

data/pkg/jruby-launcher-1.0.13-java/pkg/jruby-launcher-1.0.12-java/spec/launcher_spec.rb

@@ -0,0 +1,223 @@
+require File.expand_path('../spec_helper.rb', __FILE__)
+load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
+
+describe "JRuby native launcher" do
+  it "should run org.jruby.Main" do
+    jruby_launcher_args("").last.should == "org/jruby/Main"
+  end
+
+  it "should pass unrecognized arguments to JRuby" do
+    jruby_launcher_args("-J-Dsome.option -v --help")[-3..-1].should == ["org/jruby/Main", "-v", "--help"]
+  end
+
+  it "should print help message" do
+    args = jruby_launcher_args("-Xhelp 2>&1")
+    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
+    args.should include("-X")
+    args = jruby_launcher_args("-X 2>&1")
+    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
+    args.should include("-X")
+  end
+
+  it "should use $JAVACMD when JAVACMD is specified" do
+    with_environment "JAVACMD" => File.join("jato") do
+      if windows?
+        jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
+      else
+        jruby_launcher_args("-v").first.should == File.join("jato")
+      end
+    end
+  end
+
+  it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
+    with_environment "JAVA_HOME" => File.join("some", "java", "home") do
+      if windows?
+        jruby_launcher_args("-v 2>&1").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("-v").first.should == File.join("some", "java", "home", "bin", "java")
+      end
+    end
+  end
+
+  it "should use -Xjdkhome argument above JAVA_HOME" do
+    with_environment "JAVA_HOME" => File.join("env", "java", "home") do
+      if windows?
+        jruby_launcher_args("-Xjdkhome some/java/home 2>&1").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("-Xjdkhome some/java/home").first.should == File.join("some", "java", "home", "bin", "java")
+      end
+    end
+  end
+
+  it "should complain about a missing log argument" do
+    jruby_launcher("-Xtrace 2>&1").should =~ /Argument is missing for "-Xtrace"/
+    jruby_launcher("-Xtrace -- 2>&1").should =~ /Argument is missing for "-Xtrace"/
+  end
+
+  it "should complain about a missing jdkhome argument" do
+    jruby_launcher("-Xjdkhome 2>&1").should =~ /Argument is missing/
+    jruby_launcher("-Xjdkhome -- 2>&1").should =~ /Argument is missing/
+  end
+
+  it "should complain about a missing classpath append argument" do
+    jruby_launcher("-Xcp:a 2>&1").should =~ /Argument is missing/
+    jruby_launcher("-Xcp:a -- 2>&1").should =~ /Argument is missing/
+  end
+
+  it "should run nailgun server with --ng-server option" do
+    jruby_launcher_args("--ng-server").last.should == "com/martiansoftware/nailgun/NGServer"
+  end
+
+  it "should run nailgun client with --ng option" do
+    jruby_launcher_args('--ng -e "puts 1"').should == ["org.jruby.util.NailMain", "-e", "puts 1"]
+  end
+
+  it "should handle -J JVM options" 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
+
+  it "should allow max heap to be overridden" do
+    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
+  end
+
+  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
+    jruby_launcher_args("-J-Xss512k").should include("-Xss512k", "-Djruby.stack.max=512k")
+  end
+
+  it "should add the contents of the CLASSPATH environment variable" do
+    with_environment "CLASSPATH" => "some.jar" do
+      classpath_arg = jruby_launcher_args("").detect{|a| a =~ /java\.class\.path/}
+      classpath_arg.should =~ /-Djava.class.path=.*some.jar/
+    end
+  end
+
+  it "should add the classpath elements in proper order" do
+    s = File::PATH_SEPARATOR
+    with_environment "CLASSPATH" => "some-env.jar" do
+      classpath_arg = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar").detect{|a| a =~ /java\.class\.path/}
+      classpath_arg.should =~ /-Djava.class.path=some.jar.*#{s}some-env.jar#{s}some-other.jar/
+    end
+  end
+
+  it "should use the --server compiler" do
+    jruby_launcher_args("--server").should include("-server")
+  end
+
+  it "should use the --client compiler" do
+    jruby_launcher_args("--client").should include("-client")
+  end
+
+  it "should set the JMX settings when --manage is present" do
+    jruby_launcher_args("--manage").should include("-Dcom.sun.management.jmxremote", "-Djruby.management.enabled=true")
+  end
+
+  it "should set the headless flag when --headless is present" do
+    jruby_launcher_args("--headless").should include("-Djava.awt.headless=true")
+  end
+
+  it "should pass -Xprof when --sample is present" do
+    jruby_launcher_args("--sample").should include("-Xprof")
+  end
+
+  it "should stop argument processing when a -- is seen" do
+    jruby_launcher_args("-- -Xhelp -Xtrace --headless").should include("-Xhelp", "-Xtrace", "--headless")
+  end
+
+  # JRUBY-4151
+  it "should properly handle single quotes" do
+    jruby_launcher_args("-e 'ABC DEF'").should include("ABC DEF")
+  end
+
+  # JRUBY-4581
+  it "should prepend JRUBY_OPTS to the start of the argument list to process" do
+    with_environment "JRUBY_OPTS" => "--server -J-Dsome.key=val -rubygems" do
+      jruby_launcher_args("-e 'ABC DEF'").should include("-server", "-Dsome.key=val", "-rubygems", "-e", "ABC DEF")
+    end
+  end
+
+  # JRUBY-4611
+  it "stops argument processing on first non-option argument" do
+    jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
+  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
+
+  # JRUBY-4706
+  it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
+    args = jruby_launcher_args("-e true")
+    args.grep(/Xbootclasspath/).should_not be_empty
+    args = jruby_launcher_args("-Xnobootclasspath -e true")
+    args.grep(/Xbootclasspath/).should be_empty
+  end
+
+  it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
+    with_environment "VERIFY_JRUBY" => "true" do
+      args = jruby_launcher_args("-e true")
+      args.grep(/Xbootclasspath/).should be_empty
+    end
+  end
+
+  # JRUBY-4709
+  it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
+    jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.should =~
+      if windows?
+        /;$/
+      else
+        /:$/
+      end
+  end
+
+  # JRUBY-6016
+  it "should honor JAVA_MEM" do
+    with_environment "JAVA_MEM" => "-Xmx768m" do
+      jruby_launcher_args("").should include("-Xmx768m", "-Djruby.memory.max=768m")
+    end
+  end
+
+  it "should honor JAVA_STACK" do
+    with_environment "JAVA_STACK" => "-Xss3072k" do
+      jruby_launcher_args("").should include("-Xss3072k", "-Djruby.stack.max=3072k")
+    end
+  end
+
+  it "should place user-supplied options after default options" do
+    args = jruby_launcher_args("-J-Djruby.home=/tmp")
+    home_args = args.select {|x| x =~ /^-Djruby\.home/ }
+    home_args.length.should == 2
+    home_args.last.should == "-Djruby.home=/tmp"
+  end
+
+  it "should print the version" do
+    jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
+  end
+end

data/pkg/jruby-launcher-1.0.13-java/pkg/jruby-launcher-1.0.12-java/spec/spec_helper.rb

@@ -0,0 +1,75 @@
+require 'rspec'
+require 'rbconfig'
+require 'fileutils'
+
+if defined?(JRUBY_VERSION)
+  require 'jruby'
+  JRuby.runtime.instance_config.run_ruby_in_process = false
+end
+
+module JRubyLauncherHelper
+  JRUBY_EXE = ''
+  WINDOWS = Config::CONFIG['target_os'] =~ /mswin/
+
+  def self.check_executable_built
+    exe = File.expand_path("../../jruby", __FILE__) + Config::CONFIG['EXEEXT']
+    unless File.executable?(exe)
+      raise "Error: launcher executable not built; type `make' before continuing."
+    end
+    top = File.dirname(exe)
+    name = File.basename(exe)
+    home = File.join(top, "build/home")
+    FileUtils.mkdir_p(File.join(home, "bin"))
+    FileUtils.cp(exe, File.join(home, "bin"))
+    if JRubyLauncherHelper::WINDOWS
+      FileUtils.cp(exe.sub(/exe/, 'dll'), File.join(home, "bin"))
+    end
+    FileUtils.mkdir_p(File.join(home, "lib"))
+    FileUtils.touch(File.join(home, "lib/jruby.jar"))
+    JRUBY_EXE.concat File.join(home, "bin", name)
+  end
+
+  def jruby_launcher(args)
+    `#{JRUBY_EXE} #{args}`
+  end
+
+  def jruby_launcher_args(args)
+    jruby_launcher("-Xcommand #{args}").split("\n")
+  end
+
+  def last_exit_code
+    $?.exitstatus
+  end
+
+  def windows?
+    WINDOWS
+  end
+
+  def with_environment(pairs = {})
+    prev_env = {}
+    pairs.each_pair do |k,v|
+      prev_env[k] = ENV[k] if ENV.has_key?(k)
+      ENV[k] = v
+    end
+    begin
+      yield
+    ensure
+      pairs.keys.each {|k| ENV.delete(k)}
+      ENV.update(prev_env)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:all) do
+    JRubyLauncherHelper.check_executable_built
+    # clear environment for better control
+    ENV.delete("JAVA_HOME")
+    ENV.delete("JRUBY_HOME")
+    ENV.delete("JAVA_OPTS")
+    ENV.delete("JRUBY_OPTS")
+    ENV.delete("CLASSPATH")
+    ENV.delete("JAVA_ENCODING")
+  end
+  config.include(JRubyLauncherHelper)
+end

data/pkg/jruby-launcher-1.0.13-java/spec/launcher_spec.rb

@@ -0,0 +1,249 @@
+require File.expand_path('../spec_helper.rb', __FILE__)
+load File.expand_path('../../lib/jruby-launcher.rb', __FILE__)
+
+describe "JRuby native launcher" do
+  it "should run org.jruby.Main" do
+    jruby_launcher_args("").last.should == "org/jruby/Main"
+  end
+
+  it "should pass unrecognized arguments to JRuby" do
+    jruby_launcher_args("-J-Dsome.option -v --help")[-3..-1].should == ["org/jruby/Main", "-v", "--help"]
+  end
+
+  it "should print help message" do
+    args = jruby_launcher_args("-Xhelp 2>&1")
+    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
+    args.should include("-X")
+    args = jruby_launcher_args("-X 2>&1")
+    args.detect{|l| l =~ /JRuby Launcher usage/}.should be_true
+    args.should include("-X")
+  end
+
+  it "should use $JAVACMD when JAVACMD is specified" do
+    with_environment "JAVACMD" => File.join("jato") do
+      if windows?
+        jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
+      else
+        jruby_launcher_args("-v").first.should == File.join("jato")
+      end
+    end
+  end
+
+  it "should use $JAVA_HOME/bin/java when JAVA_HOME is specified" do
+    with_environment "JAVA_HOME" => File.join("some", "java", "home") do
+      if windows?
+        jruby_launcher_args("-v 2>&1").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("-v").first.should == File.join("some", "java", "home", "bin", "java")
+      end
+    end
+  end
+
+  it "should use -Xjdkhome argument above JAVA_HOME" do
+    with_environment "JAVA_HOME" => File.join("env", "java", "home") do
+      if windows?
+        jruby_launcher_args("-Xjdkhome some/java/home 2>&1").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("-Xjdkhome some/java/home").first.should == File.join("some", "java", "home", "bin", "java")
+      end
+    end
+  end
+
+  it "should complain about a missing log argument" do
+    jruby_launcher("-Xtrace 2>&1").should =~ /Argument is missing for "-Xtrace"/
+    jruby_launcher("-Xtrace -- 2>&1").should =~ /Argument is missing for "-Xtrace"/
+  end
+
+  it "should complain about a missing jdkhome argument" do
+    jruby_launcher("-Xjdkhome 2>&1").should =~ /Argument is missing/
+    jruby_launcher("-Xjdkhome -- 2>&1").should =~ /Argument is missing/
+  end
+
+  it "should complain about a missing classpath append argument" do
+    jruby_launcher("-Xcp:a 2>&1").should =~ /Argument is missing/
+    jruby_launcher("-Xcp:a -- 2>&1").should =~ /Argument is missing/
+  end
+
+  it "should run nailgun server with --ng-server option" do
+    jruby_launcher_args("--ng-server").last.should == "com/martiansoftware/nailgun/NGServer"
+  end
+
+  it "should run nailgun client with --ng option" do
+    jruby_launcher_args('--ng -e "puts 1"').should == ["org.jruby.util.NailMain", "-e", "puts 1"]
+  end
+
+  it "should handle -J JVM options" 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
+
+  it "should allow max heap to be overridden" do
+    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m", "-Djruby.memory.max=256m")
+  end
+
+  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
+    jruby_launcher_args("-J-Xss512k").should include("-Xss512k", "-Djruby.stack.max=512k")
+  end
+
+  it "should add the contents of the CLASSPATH environment variable" do
+    with_environment "CLASSPATH" => "some.jar" do
+      classpath_arg = jruby_launcher_args("").detect{|a| a =~ /java\.class\.path/}
+      classpath_arg.should =~ /-Djava.class.path=.*some.jar/
+    end
+  end
+
+  it "should add the classpath elements in proper order" do
+    s = File::PATH_SEPARATOR
+    with_environment "CLASSPATH" => "some-env.jar" do
+      classpath_arg = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar").detect{|a| a =~ /java\.class\.path/}
+      classpath_arg.should =~ /-Djava.class.path=some.jar.*#{s}some-env.jar#{s}some-other.jar/
+    end
+  end
+
+  it "should use the --server compiler" do
+    jruby_launcher_args("--server").should include("-server")
+  end
+
+  it "should use the --client compiler" do
+    jruby_launcher_args("--client").should include("-client")
+  end
+
+  it "should set the JMX settings when --manage is present" do
+    jruby_launcher_args("--manage").should include("-Dcom.sun.management.jmxremote", "-Djruby.management.enabled=true")
+  end
+
+  it "should set the headless flag when --headless is present" do
+    jruby_launcher_args("--headless").should include("-Djava.awt.headless=true")
+  end
+
+  it "should pass -Xprof when --sample is present" do
+    jruby_launcher_args("--sample").should include("-Xprof")
+  end
+
+  it "should stop argument processing when a -- is seen" do
+    jruby_launcher_args("-- -Xhelp -Xtrace --headless").should include("-Xhelp", "-Xtrace", "--headless")
+  end
+
+  # JRUBY-4151
+  it "should properly handle single quotes" do
+    jruby_launcher_args("-e 'ABC DEF'").should include("ABC DEF")
+  end
+
+  # JRUBY-4581
+  it "should prepend JRUBY_OPTS to the start of the argument list to process" do
+    with_environment "JRUBY_OPTS" => "--server -J-Dsome.key=val -rubygems" do
+      jruby_launcher_args("-e 'ABC DEF'").should include("-server", "-Dsome.key=val", "-rubygems", "-e", "ABC DEF")
+    end
+  end
+
+  # JRUBY-4611
+  it "stops argument processing on first non-option argument" do
+    jruby_launcher_args("foo.rb --sample")[-2..-1].should == ["foo.rb", "--sample"]
+  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
+
+  # JRUBY-4706
+  it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
+    args = jruby_launcher_args("-e true")
+    args.grep(/Xbootclasspath/).should_not be_empty
+    args = jruby_launcher_args("-Xnobootclasspath -e true")
+    args.grep(/Xbootclasspath/).should be_empty
+  end
+
+  it "should put JRuby on regular classpath when VERIFY_JRUBY is set" do
+    with_environment "VERIFY_JRUBY" => "true" do
+      args = jruby_launcher_args("-e true")
+      args.grep(/Xbootclasspath/).should be_empty
+    end
+  end
+
+  # JRUBY-4709
+  it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
+    jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.should =~
+      if windows?
+        /;$/
+      else
+        /:$/
+      end
+  end
+
+  # JRUBY-6016
+  it "should honor JAVA_MEM" do
+    with_environment "JAVA_MEM" => "-Xmx768m" do
+      jruby_launcher_args("").should include("-Xmx768m", "-Djruby.memory.max=768m")
+    end
+  end
+
+  it "should honor JAVA_STACK" do
+    with_environment "JAVA_STACK" => "-Xss3072k" do
+      jruby_launcher_args("").should include("-Xss3072k", "-Djruby.stack.max=3072k")
+    end
+  end
+
+  it "should honor JRUBY_HOME" do
+    with_environment "JRUBY_HOME" => "/tmp" do
+      jruby_launcher_args("").should include("-Djruby.home=/tmp")
+    end
+  end
+
+  context "JRUBY_HOME set and JRUBY_HOME/lib/jruby.jar exists" do
+    let(:jruby_home) do
+      require 'tempfile'
+      t = Tempfile.new("jruby_home")
+      t.path.tap { t.close! }
+    end
+
+    before do
+      FileUtils.mkdir_p(File.join(jruby_home, "lib"))
+      FileUtils.touch(File.join(jruby_home, "lib", "jruby.jar"))
+    end
+    after { FileUtils.rm_rf jruby_home }
+
+    it "should add jruby.jar to the bootclasspath" do
+      with_environment "JRUBY_HOME" => jruby_home do
+        jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
+      end
+    end
+  end
+
+  it "should place user-supplied options after default options" do
+    args = jruby_launcher_args("-J-Djruby.home=/tmp")
+    home_args = args.select {|x| x =~ /^-Djruby\.home/ }
+    home_args.length.should == 2
+    home_args.last.should == "-Djruby.home=/tmp"
+  end
+
+  it "should print the version" do
+    jruby_launcher("-Xversion 2>&1").should =~ /Launcher Version #{JRubyLauncher::VERSION}/
+  end
+end

data/pkg/jruby-launcher-1.0.13-java/spec/spec_helper.rb

@@ -0,0 +1,75 @@
+require 'rspec'
+require 'rbconfig'
+require 'fileutils'
+
+if defined?(JRUBY_VERSION)
+  require 'jruby'
+  JRuby.runtime.instance_config.run_ruby_in_process = false
+end
+
+module JRubyLauncherHelper
+  JRUBY_EXE = ''
+  WINDOWS = Config::CONFIG['target_os'] =~ /mswin/
+
+  def self.check_executable_built
+    exe = File.expand_path("../../jruby", __FILE__) + Config::CONFIG['EXEEXT']
+    unless File.executable?(exe)
+      raise "Error: launcher executable not built; type `make' before continuing."
+    end
+    top = File.dirname(exe)
+    name = File.basename(exe)
+    home = File.join(top, "build/home")
+    FileUtils.mkdir_p(File.join(home, "bin"))
+    FileUtils.cp(exe, File.join(home, "bin"))
+    if JRubyLauncherHelper::WINDOWS
+      FileUtils.cp(exe.sub(/exe/, 'dll'), File.join(home, "bin"))
+    end
+    FileUtils.mkdir_p(File.join(home, "lib"))
+    FileUtils.touch(File.join(home, "lib/jruby.jar"))
+    JRUBY_EXE.concat File.join(home, "bin", name)
+  end
+
+  def jruby_launcher(args)
+    `#{JRUBY_EXE} #{args}`
+  end
+
+  def jruby_launcher_args(args)
+    jruby_launcher("-Xcommand #{args}").split("\n")
+  end
+
+  def last_exit_code
+    $?.exitstatus
+  end
+
+  def windows?
+    WINDOWS
+  end
+
+  def with_environment(pairs = {})
+    prev_env = {}
+    pairs.each_pair do |k,v|
+      prev_env[k] = ENV[k] if ENV.has_key?(k)
+      ENV[k] = v
+    end
+    begin
+      yield
+    ensure
+      pairs.keys.each {|k| ENV.delete(k)}
+      ENV.update(prev_env)
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.before(:all) do
+    JRubyLauncherHelper.check_executable_built
+    # clear environment for better control
+    ENV.delete("JAVA_HOME")
+    ENV.delete("JRUBY_HOME")
+    ENV.delete("JAVA_OPTS")
+    ENV.delete("JRUBY_OPTS")
+    ENV.delete("CLASSPATH")
+    ENV.delete("JAVA_ENCODING")
+  end
+  config.include(JRubyLauncherHelper)
+end

data/platformlauncher.cpp

@@ -54,6 +54,7 @@ extern "C" int nailgunClientMain(int argc, char *argv[], char *env[]);
 PlatformLauncher::PlatformLauncher()
     : ArgParser()
     , suppressConsole(false)
+    , separateProcess(false)
 {
 }
 

data/spec/launcher_spec.rb

@@ -102,16 +102,15 @@ describe "JRuby native launcher" do
 
   it "should add the contents of the CLASSPATH environment variable" do
     with_environment "CLASSPATH" => "some.jar" do
-      classpath_arg = jruby_launcher_args("").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=.*some.jar/
+      classpath_arg(jruby_launcher_args("")).should =~ /some.jar/
     end
   end
 
   it "should add the classpath elements in proper order" do
     s = File::PATH_SEPARATOR
     with_environment "CLASSPATH" => "some-env.jar" do
-      classpath_arg = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar").detect{|a| a =~ /java\.class\.path/}
-      classpath_arg.should =~ /-Djava.class.path=some.jar.*#{s}some-env.jar#{s}some-other.jar/
+      args = jruby_launcher_args("-Xcp:a some-other.jar -Xcp:p some.jar")
+      classpath_arg(args).should =~ /some.jar.*#{s}some-env.jar#{s}some-other.jar/
     end
   end
 
@@ -189,7 +188,7 @@ describe "JRuby native launcher" do
 
   # JRUBY-4709
   it "should include a bare : or ; at the end of the classpath, to include PWD in the path" do
-    jruby_launcher_args("-Xnobootclasspath -e true").grep(/java\.class\.path/).first.should =~
+    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).should =~
       if windows?
         /;$/
       else

data/spec/spec_helper.rb

@@ -45,6 +45,12 @@ module JRubyLauncherHelper
     WINDOWS
   end
 
+  def classpath_arg(args)
+    index = args.index("-cp")
+    index.should > 0
+    args[index + 1]
+  end
+
   def with_environment(pairs = {})
     prev_env = {}
     pairs.each_pair do |k,v|

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.0.13"
+#define JRUBY_LAUNCHER_VERSION "1.0.14"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,94 +1,157 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: jruby-launcher
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.0.13
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 1.0.14
 platform: java
-authors: 
-  - Nick Sieger
-  - Vladimir Sizikov
-autorequire: 
+authors:
+- Nick Sieger
+- Vladimir Sizikov
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-04-18 00:00:00 Z
+date: 2012-05-04 00:00:00.000000000 Z
 dependencies: []
-
 description: Builds and installs a native launcher for JRuby on your system
-email: 
-  - nick@nicksieger.com
-  - vsizikov@gmail.com
+email:
+- nick@nicksieger.com
+- vsizikov@gmail.com
 executables: []
-
-extensions: 
-  - extconf.rb
+extensions:
+- extconf.rb
 extra_rdoc_files: []
-
-files: 
-  - COPYING
-  - README.txt
-  - Makefile
-  - Rakefile
-  - ng.c
-  - strlcpy.c
-  - argparser.cpp
-  - jruby.cpp
-  - jrubyexe.cpp
-  - jvmlauncher.cpp
-  - platformlauncher.cpp
-  - unixlauncher.cpp
-  - utilsfuncs.cpp
-  - utilsfuncswin.cpp
-  - argnames.h
-  - argparser.h
-  - jvmlauncher.h
-  - nbexecloader.h
-  - platformlauncher.h
-  - rb_w32_cmdvector.h
-  - unixlauncher.h
-  - utilsfuncs.h
-  - version.h
-  - inc/Makefile-conf.mk
-  - inc/Makefile-impl.mk
-  - inc/Makefile-rules.mk
-  - extconf.rb
-  - lib/jruby-launcher.rb
-  - lib/rubygems/defaults/jruby_native.rb
-  - pkg/jruby-launcher-1.0.12-java/extconf.rb
-  - pkg/jruby-launcher-1.0.12-java/lib/jruby-launcher.rb
-  - pkg/jruby-launcher-1.0.12-java/lib/rubygems/defaults/jruby_native.rb
-  - pkg/jruby-launcher-1.0.12-java/spec/launcher_spec.rb
-  - pkg/jruby-launcher-1.0.12-java/spec/spec_helper.rb
-  - spec/launcher_spec.rb
-  - spec/spec_helper.rb
-  - resources/jruby.ico
-  - resources/jruby.rc
+files:
+- COPYING
+- README.txt
+- Makefile
+- Rakefile
+- !binary |-
+  bmcuYw==
+- !binary |-
+  c3RybGNweS5j
+- !binary |-
+  YXJncGFyc2VyLmNwcA==
+- !binary |-
+  anJ1YnkuY3Bw
+- !binary |-
+  anJ1YnlleGUuY3Bw
+- !binary |-
+  anZtbGF1bmNoZXIuY3Bw
+- !binary |-
+  cGxhdGZvcm1sYXVuY2hlci5jcHA=
+- !binary |-
+  dW5peGxhdW5jaGVyLmNwcA==
+- !binary |-
+  dXRpbHNmdW5jcy5jcHA=
+- !binary |-
+  dXRpbHNmdW5jc3dpbi5jcHA=
+- !binary |-
+  YXJnbmFtZXMuaA==
+- !binary |-
+  YXJncGFyc2VyLmg=
+- !binary |-
+  anZtbGF1bmNoZXIuaA==
+- !binary |-
+  bmJleGVjbG9hZGVyLmg=
+- !binary |-
+  cGxhdGZvcm1sYXVuY2hlci5o
+- !binary |-
+  cmJfdzMyX2NtZHZlY3Rvci5o
+- !binary |-
+  dW5peGxhdW5jaGVyLmg=
+- !binary |-
+  dXRpbHNmdW5jcy5o
+- !binary |-
+  dmVyc2lvbi5o
+- !binary |-
+  aW5jL01ha2VmaWxlLWNvbmYubWs=
+- !binary |-
+  aW5jL01ha2VmaWxlLWltcGwubWs=
+- !binary |-
+  aW5jL01ha2VmaWxlLXJ1bGVzLm1r
+- !binary |-
+  ZXh0Y29uZi5yYg==
+- !binary |-
+  bGliL2pydWJ5LWxhdW5jaGVyLnJi
+- !binary |-
+  bGliL3J1YnlnZW1zL2RlZmF1bHRzL2pydWJ5X25hdGl2ZS5yYg==
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL2V4dGNvbmYucmI=
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL2xpYi9qcnVieS1sYXVu
+  Y2hlci5yYg==
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL2xpYi9ydWJ5Z2Vtcy9k
+  ZWZhdWx0cy9qcnVieV9uYXRpdmUucmI=
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL3NwZWMvbGF1bmNoZXJf
+  c3BlYy5yYg==
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMi1qYXZhL3NwZWMvc3BlY19oZWxw
+  ZXIucmI=
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL2V4dGNvbmYucmI=
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL2xpYi9qcnVieS1sYXVu
+  Y2hlci5yYg==
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL2xpYi9ydWJ5Z2Vtcy9k
+  ZWZhdWx0cy9qcnVieV9uYXRpdmUucmI=
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
+  Y2hlci0xLjAuMTItamF2YS9leHRjb25mLnJi
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
+  Y2hlci0xLjAuMTItamF2YS9saWIvanJ1YnktbGF1bmNoZXIucmI=
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
+  Y2hlci0xLjAuMTItamF2YS9saWIvcnVieWdlbXMvZGVmYXVsdHMvanJ1Ynlf
+  bmF0aXZlLnJi
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
+  Y2hlci0xLjAuMTItamF2YS9zcGVjL2xhdW5jaGVyX3NwZWMucmI=
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3BrZy9qcnVieS1sYXVu
+  Y2hlci0xLjAuMTItamF2YS9zcGVjL3NwZWNfaGVscGVyLnJi
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3NwZWMvbGF1bmNoZXJf
+  c3BlYy5yYg==
+- !binary |-
+  cGtnL2pydWJ5LWxhdW5jaGVyLTEuMC4xMy1qYXZhL3NwZWMvc3BlY19oZWxw
+  ZXIucmI=
+- !binary |-
+  c3BlYy9sYXVuY2hlcl9zcGVjLnJi
+- !binary |-
+  c3BlYy9zcGVjX2hlbHBlci5yYg==
+- !binary |-
+  cmVzb3VyY2VzL2pydWJ5Lmljbw==
+- !binary |-
+  cmVzb3VyY2VzL2pydWJ5LnJj
 homepage: http://jruby.org
 licenses: []
-
-post_install_message: 
+post_install_message:
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
 rubyforge_project: jruby-extras
-rubygems_version: 1.8.15
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Native launcher for JRuby
 test_files: []
-
+...