jruby-launcher 1.1.8-java → 1.1.9-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b92c78b910d37eb7a2f3b4eca4830aba9aac07cf92570302583c000ba635e43
-  data.tar.gz: 71d61c84774f723eebd76d6716eb569033b7f6fa761153393fd1977a270235a8
+  metadata.gz: 4a24cd17a7e856fa27004cd2ecae5be7f6fe133bec57528e9cfcdd287293eb76
+  data.tar.gz: 7a5c616e66f9423f27ea5ed477c5500960527e84fcccb0c12fe53056959c581b
 SHA512:
-  metadata.gz: 6a2b1d4ad8b440e5acd0abdd524575632172fdf5b4855b3466de0a6adb1967180cd9d01f6430c9d7cb4783067421e3f9ca692301b6963fc79ed09a665f9c17d9
-  data.tar.gz: c9aabf3d1ef886445c98718da014f1dcb9fdb9b920483a310fd01b5d36eae4128dd825c18d72482dc1682b389b42c53ea82a744463a70673a1be0b31a738fa23
+  metadata.gz: fc086ec3f19e35e4c70d0a8176230785cefc796032ce32f85dfc6c84e723c721e924fe6fd345a3682164e66430e6eb10f569c55342d124a1f6fd0a6dc22b5ba8
+  data.tar.gz: 07e802263388bb7395b879beef5883189775296c07b4ab81b0a9191a560d797207ebafadb870316a261ef11f9d4b97179a7f2203f1d7089d7e7463d3f16deb54

data/Makefile

@@ -28,10 +28,10 @@ jruby.res: resources/jruby.rc
 	windres $^ -O coff -o $@
 
 jruby.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
-	g++ $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS) -static
+	$(CXX) $(CXXFLAGS) $^ -s -o $@ $(LDLIBSOPTIONS) -static
 
 jrubyw.exe: jrubyexe.cpp nbexecloader.h utilsfuncs.cpp utilsfuncswin.cpp jruby.res
-	g++ $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS) -static
+	$(CXX) $(CXXFLAGS) -DJRUBYW -mwindows $^ -s -o $@ $(LDLIBSOPTIONS) -static
 
 install:
 	@if [ ! -f ./jruby ]; then echo "Please run 'make' first."; exit 1; fi

data/argparser.cpp

@@ -60,7 +60,7 @@ 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_CMDLINE_MODULE_PATH = "--module-path";
+const char *ArgParser::OPT_CMDLINE_MODULE_PATH = "--module-path=";
 const char *ArgParser::OPT_CLASS_PATH = "-Djava.class.path=";
 const char *ArgParser::OPT_BOOT_CLASS_PATH = "-Xbootclasspath/a:";
 
@@ -135,7 +135,7 @@ bool ArgParser::initPlatformDir() {
 
     if (getenv("JRUBY_HOME") != NULL) {
         logMsg("initPlatformDir: using JRUBY_HOME environment variable");
-        char sep[2] = { FILE_SEP, NULL };
+        char sep[2] = { FILE_SEP, '\0' };
         strncpy(path, getenv("JRUBY_HOME"), PATH_MAX - 11);
         strncpy(path + strlen(path), sep, 1);
         strncpy(path + strlen(path), "bin", 3);
@@ -487,8 +487,9 @@ void ArgParser::prepareOptions() {
 
     if (useModulePath) {
         // When modules are present, use module path
-        javaOptions.push_back(OPT_CMDLINE_MODULE_PATH);
-        javaOptions.push_back(classPath);
+        option = OPT_CMDLINE_MODULE_PATH;
+        option += classPath;
+        javaOptions.push_back(option);
     } else if (separateProcess) {
         // When launching a separate process, use '-cp' which expands embedded wildcards
         javaOptions.push_back(OPT_CMDLINE_CLASS_PATH);

data/inc/Makefile-conf.mk

@@ -3,9 +3,6 @@ MKDIR=mkdir
 CP=cp
 CCADMIN=CCadmin
 RANLIB=ranlib
-CC=gcc
-CCC=g++
-CXX=g++
 
 # Windows (mingw)?
 ifneq (,$(findstring mingw, $(CONF)))

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

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

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

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

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

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

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

data/pkg/jruby-launcher-1.1.8-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.8-java/pkg/jruby-launcher-1.1.5-java/extconf.rb

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

data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/lib/jruby-launcher.rb

@@ -0,0 +1,3 @@
+module JRubyLauncher
+  VERSION = "1.1.6.pre"
+end

data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-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.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/extconf.rb

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

data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/lib/jruby-launcher.rb

@@ -0,0 +1,3 @@
+module JRubyLauncher
+  VERSION = "1.1.6.pre"
+end

data/pkg/jruby-launcher-1.1.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-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.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-java/spec/launcher_spec.rb

@@ -0,0 +1,258 @@
+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 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.8-java/pkg/jruby-launcher-1.1.5-java/pkg/jruby-launcher-1.1.5.pre-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