jruby-launcher 1.1.14-java → 1.1.19-java

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

@@ -0,0 +1,76 @@
+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

data/spec/launcher_spec.rb

@@ -21,11 +21,12 @@ describe "JRuby native launcher" do
   end
 
   it "should use $JAVACMD when JAVACMD is specified" do
-    with_environment "JAVACMD" => File.join("jato") do
+    javacmd_path = File.join("path", "to", "jato")
+    with_environment "JAVACMD" => javacmd_path do
       if windows?
-        jruby_launcher_args("-v 2>&1").join.should =~ %r{jato}
+        jruby_launcher_args("-v 2>&1").join.should =~ /#{javacmd_path}/
       else
-        jruby_launcher_args("-v").first.should == File.join("jato")
+        jruby_launcher_args("-v").first.should == javacmd_path
       end
     end
   end
@@ -180,6 +181,9 @@ describe "JRuby native launcher" do
 
   # JRUBY-4706
   it "should put JRuby on regular classpath when -Xnobootclasspath is used" do
+    # Java 9+ do not like bootclasspath so we do not use it
+    skip if ENV_JAVA['java.specification.version'].to_i >= 9
+
     args = jruby_launcher_args("-e true")
     args.grep(/Xbootclasspath/).should_not be_empty
     args = jruby_launcher_args("-Xnobootclasspath -e true")
@@ -236,6 +240,9 @@ describe "JRuby native launcher" do
     after { FileUtils.rm_rf jruby_home }
 
     it "should add jruby.jar to the bootclasspath" do
+      # Java 9+ do not like bootclasspath so we do not use it
+      skip if ENV_JAVA['java.specification.version'].to_i >= 9
+
       with_environment "JRUBY_HOME" => jruby_home do
         jruby_launcher_args("").should include("-Xbootclasspath/a:#{jruby_home}/lib/jruby.jar")
       end

data/unixlauncher.cpp

@@ -1,5 +1,8 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
+#include <limits.h>
+#include <string.h>
 #include "unixlauncher.h"
 #include "utilsfuncs.h"
 
@@ -46,6 +49,9 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
 
     if (getenv("JAVACMD") != NULL) {
         java = getenv("JAVACMD");
+        if (java.find_last_of('/') == -1) {
+            java = findOnPath(java.c_str());
+        }
     } else {
         if (!jdkhome.empty()) {
             java = jdkhome + "/bin/java";
@@ -56,10 +62,6 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
             java = java_home + "/bin/java";
         } else {
             java = findOnPath("java");
-            if (!java.empty()) {
-                int home_index = java.find_last_of('/', java.find_last_of('/') - 1);
-                jdkhome = java.substr(0, home_index);
-            }
         }
     }
 
@@ -68,6 +70,30 @@ int UnixLauncher::run(int argc, char* argv[], char* envp[]) {
         return 255;
     }
 
+    // still no jdk home, use other means to resolve it
+    if (jdkhome.empty()) {
+        char javaHomeCommand[] = "/usr/libexec/java_home";
+        if (access(javaHomeCommand, R_OK | X_OK) != -1 && !checkDirectory(javaHomeCommand)) {
+            // try java_home command when not set (on MacOS)
+            FILE *fp;
+            char tmp[PATH_MAX + 1];
+
+            fp = popen(javaHomeCommand, "r");
+            if (fp != NULL) {
+                fgets(tmp, sizeof(tmp), fp);
+                tmp[strcspn(tmp, "\n")] = 0;
+                jdkhome = tmp;
+                pclose(fp);
+            } else {
+                logErr(true, false, "failed to run %s", javaHomeCommand);
+            }
+        } else {
+            java = resolveSymlinks(java);
+            int home_index = java.find_last_of('/', java.find_last_of('/') - 1);
+            jdkhome = java.substr(0, home_index);
+        }
+    }
+
     prepareOptions();
 
     list<string> commandLine;

data/utilsfuncs.cpp

@@ -54,6 +54,7 @@
 #include <unistd.h>
 #include "utilsfuncs.h"
 #include "argnames.h"
+#include <limits.h>
 
 #ifndef WIN32
 #include <sys/stat.h>
@@ -146,6 +147,19 @@ string findOnPath(const char* name) {
     return "";
 }
 
+string resolveSymlinks(string path) {
+#ifndef WIN32
+    struct stat st;
+    char tmp[PATH_MAX + 1];
+
+    if (lstat(path.c_str(), &st) == 0 && (st.st_mode & S_IFMT) == S_IFLNK) {
+        realpath(path.c_str(), tmp);
+        path = tmp;
+    }
+#endif
+    return path;
+}
+
 const char* getSysError(char *str, int strSize) {
 #ifdef WIN32
     int err = GetLastError();

data/utilsfuncs.h

@@ -57,6 +57,7 @@ bool printToConsole(const char *msg);
 char** convertToArgvArray(std::list<std::string> args);
 void addToArgList(std::list<std::string> & args, int argc, char ** argv);
 std::string findOnPath(const char* name);
+std::string resolveSymlinks(std::string name);
 bool checkDirectory(const char* path);
 void printListToConsole(std::list<std::string> l);
 std::string trimTrailingBackslashes(std::string orig);

data/version.h

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

metadata

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