jruby-launcher 1.1.13-java → 1.1.14-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: b11fc4e524ed4b37e0f46d973c6622df18dbf9676a5ca2c03fbb046a1dcd216b
-  data.tar.gz: 2b12dc9ce4c66cd0142747f9ec5898c051414f53f2080119c25c827df336eb13
+SHA1:
+  metadata.gz: 987a09dffd62bebfaf7e4fb71e747565a6234d88
+  data.tar.gz: b622dd25e2cc949ca752edb0bcb1fa5672a3186a
 SHA512:
-  metadata.gz: 0ebe917d3d4f1c416533a5e3afbb0ce5a1394c14c43f6618b97b0b8dc09265d6a84071da2f69423fe1d5da9d49ce3f5f03e47fc247d8c67fe38395bfaa064d29
-  data.tar.gz: ca74d57e9ca2f052e705209271eb8a6426122c9620b0423e0828de3dd7eb818808fa6f2624c2109e750582c372cb8011424e304b794eb4036e3a725b7429b136
+  metadata.gz: 67e2e289a6bcebdba185e8b9c7a7fcf0168fd0e149d691b746b5ab31906e5859cb1c93073e17833585685aba1e76c55e5deaa6e4d4bbb5fb631fcb7f54ae225d
+  data.tar.gz: 5b1e245cbbb37c2b88925273ac8f8341b3dc11159b45c4299f171697ce3bdeaafe8c23be6885b1288e758d6f79bc9000fa91d7d5a03676551b43951521343395

data/argparser.cpp

@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <unistd.h>
 #include <limits>
+#include <fstream>
 #include "utilsfuncs.h"
 #include "argparser.h"
 #include "argnames.h"
@@ -557,12 +558,25 @@ void ArgParser::useModulesIfPresent() {
 
     if (jdkhome.empty()) {
         logMsg("Unable to detect JPMS modules as JAVA_HOME is not specified");
-    } else if (access((jdkhome + "/jmods").c_str(), R_OK) == 0) {
+    } else if (access((jdkhome + "/lib/modules").c_str(), R_OK) == 0 ||
+            releaseFileHasModules()) {
         logMsg("JPMS jmods dir detected, using module flags");
         useModulePath = 1;
     }
 }
 
+bool ArgParser::releaseFileHasModules() {
+    string releaseFile = jdkhome + "/release";
+    std::string line;
+    ifstream in(releaseFile.c_str());
+    if (in.is_open()) {
+        while (getline(in,line)) {
+            if (line.find("MODULES") == 0) return true;
+        }
+    }
+    return false;
+}
+
 void ArgParser::constructBootClassPath() {
     logMsg("constructBootClassPath()");
     addedToBootCP.clear();

data/argparser.h

@@ -54,6 +54,7 @@ protected:
     void addOptionsToCommandLine(std::list<std::string> & commandLine);
     bool endsWith(const std::string &string, const std::string &end);
     void useModulesIfPresent();
+    bool releaseFileHasModules();
 
 protected:
     bool separateProcess;

data/lib/jruby-launcher.rb

@@ -1,3 +1,3 @@
 module JRubyLauncher
-  VERSION = "1.1.13"
+  VERSION = "1.1.14"
 end

data/spec/launcher_spec.rb

@@ -257,9 +257,12 @@ describe "JRuby native launcher" do
     jruby_launcher_args("-e %s%s%s%s%s 2>&1").should include('-e', '%s%s%s%s%s')
   end
 
-  it "should use --module-path on java9+" do
+  it "should use --module-path on java9+ jruby 9.2.1+" do
+    # versions prior to 9.2.1 do not set a predictable module name
+    skip unless (JRUBY_VERSION.split('.') <=> ['9', '2', '1']) >= 0
+    
     Dir.mktmpdir do |java_home|
-      Dir.mkdir(File.join(java_home, 'jmods'))
+      FileUtils.mkdir_p(File.join(java_home, 'lib/modules'))
       with_environment 'JAVA_HOME' => java_home do
         jruby_launcher_args('').grep(/^--module-path=.*jruby.jar/).should_not be_empty
       end

data/version.h

@@ -6,6 +6,6 @@
 #ifndef _VERSION_H_
 #define _VERSION_H_
 
-#define JRUBY_LAUNCHER_VERSION "1.1.13"
+#define JRUBY_LAUNCHER_VERSION "1.1.14"
 
 #endif // ! _VERSION_H_

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jruby-launcher
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.14
 platform: java
 authors:
 - Nick Sieger
 - Vladimir Sizikov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-20 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies: []
 description: Builds and installs a native launcher for JRuby on your system
 email:
@@ -39,11 +39,6 @@ files:
 - lib/rubygems/defaults/jruby_native.rb
 - nbexecloader.h
 - ng.c
-- pkg/jruby-launcher-1.1.12-java/extconf.rb
-- pkg/jruby-launcher-1.1.12-java/lib/jruby-launcher.rb
-- pkg/jruby-launcher-1.1.12-java/lib/rubygems/defaults/jruby_native.rb
-- pkg/jruby-launcher-1.1.12-java/spec/launcher_spec.rb
-- pkg/jruby-launcher-1.1.12-java/spec/spec_helper.rb
 - platformlauncher.cpp
 - platformlauncher.h
 - rb_w32_cmdvector.h
@@ -61,7 +56,7 @@ files:
 homepage: http://jruby.org
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -76,8 +71,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.5.2.3
+signing_key: 
 specification_version: 4
 summary: Native launcher for JRuby
 test_files: []

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

@@ -1,13 +0,0 @@
-mf = File.read('Makefile')
-mf = mf.gsub(/^BINDIR\s*=.*$/, "BINDIR = #{RbConfig::CONFIG['bindir']}")
-mf = mf.gsub(/^PREFIX\s*=.*$/, "PREFIX = #{File.dirname(RbConfig::CONFIG['libdir'])}")
-mf = mf.gsub(/^JRUBY_VERSION\s*=.*$/, "JRUBY_VERSION = #{JRUBY_VERSION}")
-
-# Launcher will use .module_opts file if present, otherwise hardcoded add-opens for this module.
-# Pre-9.2.1: ALL-UNNAMED because no name was exported
-# 9.2.1 and higher: org.jruby.dist
-if JRUBY_VERSION !~ /(^1)|(^9\.[01])|(^9\.2\.0\.0)/
-  mf = mf.gsub(/^JRUBY_MODULE\s*=.*$/, "JRUBY_MODULE = 1")
-end
-puts mf
-File.open('Makefile', 'wb') {|f| f << mf}

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

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

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

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

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

@@ -1,278 +0,0 @@
-require 'tmpdir'
-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
-
-  it "should use --module-path on java9+" do
-    Dir.mktmpdir do |java_home|
-      Dir.mkdir(File.join(java_home, 'jmods'))
-      with_environment 'JAVA_HOME' => java_home do
-        jruby_launcher_args('').grep(/^--module-path=.*jruby.jar/).should_not be_empty
-      end
-    end
-  end
-
-  it "should not treat CLASSPATH entries as modules on java9+" do
-    Dir.mktmpdir do |java_home|
-      Dir.mkdir(File.join(java_home, 'jmods'))
-      with_environment 'JAVA_HOME' => java_home, 'CLASSPATH' => '/some/lib.jar' do
-        jruby_launcher_args('').grep(/^--module-path=.*\/some\/lib.jar/).should be_empty
-        classpath_arg(jruby_launcher_args('')).should =~ /\/some\/lib.jar/
-      end
-    end
-  end
-end

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

@@ -1,76 +0,0 @@
-require 'rspec'
-require 'rbconfig'
-require 'fileutils'
-
-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