jruby-launcher 1.1.3-java → 1.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b02c50de4f7699e524adcc2428a8968185191bd19f041426df5366b46ff52d12
-  data.tar.gz: 4968c430abaf12ab2142fa430364d7bed68daff837960500983218bbbd2091b7
+  metadata.gz: dafca20193d4ab9c1273a926bac9f73461d97351d5435d61f5de74918a937b68
+  data.tar.gz: b292b1620a2795d0354e87765c89c092d1f739d477ccda1feba35008251ce2ba
 SHA512:
-  metadata.gz: ec7417c75da52682569e8b30a9ad9dd2ce7cf6ab3b31b7f9a2570fad1e4ea778af5aacb55a71457419d4f9f62cdb50745ed39d54d841fc8d8d573769f5c8a510
-  data.tar.gz: d79dd8c181a8b6a0656ed16d001a08c1dd2c3ee0caa4479ad4b39143c4a1a4b41f0a875d2f6b7b9bf69337de0133fbbf6435a11dd3ca5fb5563a5001f19c7184
+  metadata.gz: e6ed0db06fd62d68947d78dfd5f1754b0e522f1cd378384c03b642b2f9274824ec1b50768ad4bceb71bc326a298e34439bac057de95fdd3a493dcafa89bfa91b
+  data.tar.gz: df49ced229a0c1cee510b520b131aa579cf4808e131de9af734899aff25a1b061c34d57f474bcdae13b71b89d4902257288c1d264301ca7e5cd05bddd7ac9a2f

data/argparser.cpp

@@ -248,10 +248,12 @@ bool ArgParser::parseArgs(int argc, char *argv[]) {
     // Force OpenJDK-based JVMs to use /dev/urandom for random number generation
     // See https://github.com/jruby/jruby/issues/4685 among others.
     struct stat buffer;
-    if (stat("/dev/urandom", &buffer) == 0) {
+    if (access("/dev/urandom", R_OK) == 0) {
         // OpenJDK tries really hard to prevent you from using urandom.
         // See https://bugs.openjdk.java.net/browse/JDK-6202721
-        javaOptions.push_back("-Djava.security.egd=/dev/./urandom");
+        // Non-file URL causes fallback to slow threaded SeedGenerator.
+        // See https://bz.apache.org/bugzilla/show_bug.cgi?id=56139
+        javaOptions.push_back("-Djava.security.egd=file:/dev/urandom");
     }
 
     if (getenv("VERIFY_JRUBY") != NULL) {

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

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

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

data/pkg/jruby-launcher-1.1.3-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.1.3-java/lib/jruby-launcher.rb

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

data/pkg/jruby-launcher-1.1.3-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.1.3-java/pkg/jruby-launcher-1.1.2-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.1.3-java/pkg/jruby-launcher-1.1.2-java/lib/jruby-launcher.rb

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

data/pkg/jruby-launcher-1.1.3-java/pkg/jruby-launcher-1.1.2-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.1.3-java/pkg/jruby-launcher-1.1.2-java/spec/launcher_spec.rb

@@ -0,0 +1,262 @@
+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.select {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
+    args.should include("-X")
+    args = jruby_launcher_args("-X 2>&1")
+    args.detect {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
+    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 drop the backslashes at the end of JAVA_HOME" do
+    with_environment "JAVA_HOME" => File.join("some", "java", "home\\\\") do
+      if windows?
+        jruby_launcher_args("").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("").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")
+  end
+
+  it "should allow max heap to be overridden" do
+    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m")
+  end
+
+  it "should default to 2048k max stack" do
+    jruby_launcher_args("").should include("-Xss2048k")
+  end
+
+  it "should allow max stack to be overridden" do
+    jruby_launcher_args("-J-Xss512k").should include("-Xss512k")
+  end
+
+  it "should add the contents of the CLASSPATH environment variable" do
+    with_environment "CLASSPATH" => "some.jar" do
+      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
+      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
+
+  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 RbConfig::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
+    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).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")
+    end
+  end
+
+  it "should honor JAVA_STACK" do
+    with_environment "JAVA_STACK" => "-Xss3072k" do
+      jruby_launcher_args("").should include("-Xss3072k")
+    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
+
+  it "should not crash on format-strings" do
+    jruby_launcher_args("-e %s%s%s%s%s 2>&1").should include('-e', '%s%s%s%s%s')
+  end
+end

data/pkg/jruby-launcher-1.1.3-java/pkg/jruby-launcher-1.1.2-java/spec/spec_helper.rb

@@ -0,0 +1,81 @@
+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 = RbConfig::CONFIG['target_os'] =~ /mswin/
+
+  def self.check_executable_built
+    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::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 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|
+      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.1.3-java/spec/launcher_spec.rb

@@ -0,0 +1,262 @@
+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.select {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
+    args.should include("-X")
+    args = jruby_launcher_args("-X 2>&1")
+    args.detect {|l| l =~ /JRuby Launcher usage/}.should_not be_empty
+    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 drop the backslashes at the end of JAVA_HOME" do
+    with_environment "JAVA_HOME" => File.join("some", "java", "home\\\\") do
+      if windows?
+        jruby_launcher_args("").join.should =~ %r{some/java/home}
+      else
+        jruby_launcher_args("").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")
+  end
+
+  it "should allow max heap to be overridden" do
+    jruby_launcher_args("-J-Xmx256m").should include("-Xmx256m")
+  end
+
+  it "should default to 2048k max stack" do
+    jruby_launcher_args("").should include("-Xss2048k")
+  end
+
+  it "should allow max stack to be overridden" do
+    jruby_launcher_args("-J-Xss512k").should include("-Xss512k")
+  end
+
+  it "should add the contents of the CLASSPATH environment variable" do
+    with_environment "CLASSPATH" => "some.jar" do
+      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
+      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
+
+  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 RbConfig::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
+    classpath_arg(jruby_launcher_args("-Xnobootclasspath -e true")).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")
+    end
+  end
+
+  it "should honor JAVA_STACK" do
+    with_environment "JAVA_STACK" => "-Xss3072k" do
+      jruby_launcher_args("").should include("-Xss3072k")
+    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
+
+  it "should not crash on format-strings" do
+    jruby_launcher_args("-e %s%s%s%s%s 2>&1").should include('-e', '%s%s%s%s%s')
+  end
+end

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

@@ -0,0 +1,81 @@
+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 = RbConfig::CONFIG['target_os'] =~ /mswin/
+
+  def self.check_executable_built
+    exe = File.expand_path("../../jruby", __FILE__) + RbConfig::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 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|
+      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/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.1.3"
+#define JRUBY_LAUNCHER_VERSION "1.1.4"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: java
 authors:
 - Nick Sieger
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-12 00:00:00.000000000 Z
+date: 2017-11-20 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -44,6 +44,16 @@ files:
 - pkg/jruby-launcher-1.1.2-java/lib/rubygems/defaults/jruby_native.rb
 - pkg/jruby-launcher-1.1.2-java/spec/launcher_spec.rb
 - pkg/jruby-launcher-1.1.2-java/spec/spec_helper.rb
+- pkg/jruby-launcher-1.1.3-java/extconf.rb
+- pkg/jruby-launcher-1.1.3-java/lib/jruby-launcher.rb
+- pkg/jruby-launcher-1.1.3-java/lib/rubygems/defaults/jruby_native.rb
+- pkg/jruby-launcher-1.1.3-java/pkg/jruby-launcher-1.1.2-java/extconf.rb
+- pkg/jruby-launcher-1.1.3-java/pkg/jruby-launcher-1.1.2-java/lib/jruby-launcher.rb
+- pkg/jruby-launcher-1.1.3-java/pkg/jruby-launcher-1.1.2-java/lib/rubygems/defaults/jruby_native.rb
+- pkg/jruby-launcher-1.1.3-java/pkg/jruby-launcher-1.1.2-java/spec/launcher_spec.rb
+- pkg/jruby-launcher-1.1.3-java/pkg/jruby-launcher-1.1.2-java/spec/spec_helper.rb
+- pkg/jruby-launcher-1.1.3-java/spec/launcher_spec.rb
+- pkg/jruby-launcher-1.1.3-java/spec/spec_helper.rb
 - platformlauncher.cpp
 - platformlauncher.h
 - rb_w32_cmdvector.h