jarbler 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70f0325158bf02611ae188df443a2e22a3032f7b8e275e09d0e2ff8216476979
-  data.tar.gz: 1d5ca40cfa30dad802a394e4b4980854d0a0bb093cf00eafece8ef5b090e5c85
+  metadata.gz: af40fd597f65765920d0825c739db3604cd8ec0d6a975889e10b9f17b0869dce
+  data.tar.gz: 3b887f4cb0ce06669a78da49cdc3f28fd7137cca0e7cd7eeebd60cfc1f8a3f2d
 SHA512:
-  metadata.gz: c3671a308f5c65bcc937676930c9792d6461db55f52e2dd6d609edb3ad1d75262164740b951d733fb71041954fc8ee3377b91122af78d0e1768e1977bc851470
-  data.tar.gz: c33d7b1affbcf4cdd4c7cb9f1e5ecf375e083266c59e077ed28d4532ded06b301d4b88b29e9afb63ba0c2d98c699ca9315d7afd35b3bb2037728d3e602693d4b
+  metadata.gz: b07fc51c641293913293b3d3cf4713e306f73c3f746237406905dfe973f31ca08497db7a35ebb1d870bc89a2690aa5775fbfe84c1bd120108cc3c7bb4e8fe786
+  data.tar.gz: 6b8ef9fe88116c68b47ad5fc7d3f7923d8a8e0d5c5b511fbe1c9a9a179841ab95035fa65dd3761f7d1466e2d0df9176b8061eed9dc548109290499cb07f04783

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## [Unreleased]
 
+## [0.4.2] - 2025-07-24
+
+- Native Gem extensions are also copied into the jar file if the Gem has a native extension<br/>
+  If the extension is of platform type 'universal-java-XX' then the 'XX' in the dir name 'universal-java-XX' is corrected with the real Java major version at start of the jar file.<br/>
+  Extensions of other platform types are copied as is.
+
 ## [0.4.1] - 2025-07-15
 
 - config attribute 'gemfile_groups' established to specify the groups of the Gemfile which should be included in the jar file

data/lib/jarbler/JarMain.java

@@ -157,6 +157,11 @@ class JarMain {
             //debug("JRuby set property 'jruby.gem.home' to '" + full_gem_home + "'");
             //System.setProperty("jruby.gem.home", full_gem_home);
 
+            // Enable JRuby warnings, not proof to really function
+            System.setProperty("jruby.log.warnings", "true");
+            System.setProperty("jruby.cli.verbose",  "true");
+            // System.setProperty("jruby.debug.fullTrace",  "true");
+
             debug("JRuby program starts with the following arguments: ");
             for (String arg : mainArgs) {
                 debug(" - " + arg);
@@ -244,7 +249,16 @@ class JarMain {
      */
     private static File newFile(File destinationDir, ZipEntry zipEntry) throws IOException {
     try {
-        File destFile = new File(destinationDir, zipEntry.getName());
+        String destFileName = zipEntry.getName();
+
+        // the platform name in extension dir depends on the the target java version, therfore we replace the platform name here
+        if (destFileName.contains("universal-java-XX")) {
+            String newPlatformName = "universal-java-" + javaMajorRelease4RubyPlatform();
+            debug ("Replacing platform name in file '" + destFileName + "' from 'universal-java-XX' to '" + newPlatformName + "'");
+            destFileName = destFileName.replace("universal-java-XX", newPlatformName);
+        }
+
+        File destFile = new File(destinationDir, destFileName);
 
         String destDirPath = destinationDir.getCanonicalPath();
         String destFilePath = destFile.getCanonicalPath();
@@ -348,4 +362,76 @@ class JarMain {
             System.err.println(errorSummary);
         }
     }
+
+    /**
+     * Get the major release of the Java platform a'la universal-java-XX
+     * @return [int] The major release of the Java platform, e.g. "java-universal-11"
+     */
+
+    private static int javaMajorRelease4RubyPlatform() {
+        try {
+            // --- Ansatz 1: Für Java 9 und höher (empfohlen) ---
+            // Versuche, Runtime.version() zu verwenden.
+            // Wir nutzen Reflection, damit der Code auch mit einem Java 8 JDK kompiliert werden kann,
+            // aber trotzdem die moderne API verwendet, wenn er auf einem Java 9+ JRE läuft.
+            Class<?> runtimeClass = Class.forName("java.lang.Runtime");
+            Method versionMethod = runtimeClass.getMethod("version");
+            Object versionObject = versionMethod.invoke(null); // Runtime.version() ist eine statische Methode
+
+            // Hole die "major" Methode vom zurückgegebenen Runtime.Version Objekt
+            Class<?> versionClass = Class.forName("java.lang.Runtime$Version");
+            Method majorMethod = versionClass.getMethod("major");
+            return (int) majorMethod.invoke(versionObject);
+
+        } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | java.lang.reflect.InvocationTargetException e) {
+            // --- Ansatz 2: Fallback für Java 8 und älter ---
+            // Dieser Block wird ausgeführt, wenn Runtime.version() nicht verfügbar ist
+            // (z.B. auf Java 8) oder wenn Reflection fehlschlägt.
+
+            String javaVersion = System.getProperty("java.version");
+            // Beispiele für java.version:
+            // Java 8: "1.8.0_291"
+            // Java 11: "11.0.11"
+            // Java 17: "17.0.2"
+            // Java 9: "9" (manchmal ohne weitere Punkte)
+
+            // Prüfe, ob es sich um das alte "1.x.y" Format handelt
+            if (javaVersion.startsWith("1.")) {
+                // Für "1.x.y_z" ist die Hauptversion 'x'
+                // Beispiel: "1.8.0_291" -> '8'
+                try {
+                    return Integer.parseInt(javaVersion.substring(2, 3));
+                } catch (NumberFormatException ex) {
+                    // Sollte nicht passieren, aber zur Sicherheit
+                    System.err.println("Fehler beim Parsen der Java 1.x Version: " + javaVersion + " - " + ex.getMessage());
+                    return -1;
+                }
+            } else {
+                // Für "x.y.z" oder "x" Format (Java 9+ Stil)
+                // Beispiel: "11.0.11" -> '11', "17.0.2" -> '17', "9" -> '9'
+                int dotIndex = javaVersion.indexOf('.');
+                if (dotIndex != -1) {
+                    try {
+                        return Integer.parseInt(javaVersion.substring(0, dotIndex));
+                    } catch (NumberFormatException ex) {
+                        System.err.println("Fehler beim Parsen der Java x.y Version: " + javaVersion + " - " + ex.getMessage());
+                        return -1;
+                    }
+                } else {
+                    // Fallback für den Fall, dass nur die Hauptversion angegeben ist (z.B. "9", "10", "11")
+                    try {
+                        return Integer.parseInt(javaVersion);
+                    } catch (NumberFormatException ex) {
+                        System.err.println("Fehler beim Parsen der Java Hauptversion: " + javaVersion + " - " + ex.getMessage());
+                        return -1;
+                    }
+                }
+            }
+        } catch (NumberFormatException e) {
+            // Dieser Catch-Block fängt Fehler ab, die auftreten, wenn System.getProperty("java.version")
+            // ein unerwartetes Format hat, das nicht geparst werden kann.
+            System.err.println("Fehler beim Parsen der Java-Versionszeichenkette: " + System.getProperty("java.version") + " - " + e.getMessage());
+            return -1;
+        }
+    }
 }

data/lib/jarbler/builder.rb

@@ -95,11 +95,15 @@ module Jarbler
     # @return [void]
     def copy_needed_gems_to_staging(staging_dir, ruby_minor_version)
       gem_target_location = "#{staging_dir}/gems/jruby/#{ruby_minor_version}"
+
+      # Replace universal-java-XX with the correct platform for the current Java version after unzipping of the jar file
+      extension_target_location = "#{gem_target_location}/extensions/universal-java-XX/#{ruby_minor_version}"
+
       FileUtils.mkdir_p("#{gem_target_location}/bin")
       FileUtils.mkdir_p("#{gem_target_location}/build_info")
       FileUtils.mkdir_p("#{gem_target_location}/cache")
       FileUtils.mkdir_p("#{gem_target_location}/doc")
-      FileUtils.mkdir_p("#{gem_target_location}/extensions")
+      FileUtils.mkdir_p(extension_target_location)
       FileUtils.mkdir_p("#{gem_target_location}/gems")
       FileUtils.mkdir_p("#{gem_target_location}/specifications")
       FileUtils.mkdir_p("#{gem_target_location}/bundler/bin")
@@ -115,8 +119,10 @@ module Jarbler
         # differentiate between Gems from git/bundler and Gems from rubygems
         if spec.source.is_a?(Bundler::Source::Git)
           # Copy the Gem from bundler/gems including the gemspec
+          debug "Adding Bundler Gem from dir '#{spec.gem_dir}' into jar file at temporary location '#{gem_target_location}/gems'"
           file_utils_copy(spec.gem_dir, "#{gem_target_location}/bundler/gems")
           spec.executables.each do |executable|
+            debug "Adding executable of Bundler Gem from dir '#{spec.bin_dir}#{executable}/' into jar file at temporary location '#{gem_target_location}/bundler/bin'"
             file_utils_copy("#{spec.bin_dir}/#{executable}", "#{gem_target_location}/bundler/bin")
           end
         else  # Gem is from rubygems
@@ -124,10 +130,19 @@ module Jarbler
           #       Should the default gems are also copied to the staging directory?
           unless spec.default_gem?  # Do not copy default gems, because they are already included in the jruby jars standard library
             # copy the Gem and gemspec separately
+            debug "Adding local Gem from dir '#{spec.gem_dir}' into jar file at temporary location '#{gem_target_location}/gems'"
             file_utils_copy(spec.gem_dir, "#{gem_target_location}/gems")
+
+            if spec.extension_dir && Dir.exist?(spec.extension_dir)
+              debug "Adding extension from dir '#{spec.extension_dir}' into jar file at temporary location '#{extension_target_location}'"
+              puts "Adding extension from dir '#{spec.extension_dir}' into jar file but extension is not for platform 'universal-java-xx'!!!" unless spec.extension_dir['universal-java']
+              file_utils_copy(spec.extension_dir, extension_target_location)
+            end
+
             # spec.loaded_from contains the path to the gemspec file including the path prefix "default/" for default gems
             file_utils_copy(spec.loaded_from, "#{gem_target_location}/specifications")
             spec.executables.each do |executable|
+              debug "Adding executable of local Gem from dir '#{spec.bin_dir}#{executable}/' into jar file at temporary location '#{gem_target_location}/bin'"
               file_utils_copy("#{spec.bin_dir}/#{executable}", "#{gem_target_location}/bin")
             end
           end

data/lib/jarbler/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Jarbler
-  VERSION = "0.4.1"
-  VERSION_DATE = "2025-07-15"
+  VERSION = "0.4.2"
+  VERSION_DATE = "2025-07-24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarbler
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Peter Ramm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-15 00:00:00.000000000 Z
+date: 2025-07-24 00:00:00.000000000 Z
 dependencies: []
 description: Pack a Ruby app combined with JRuby runtime and all its Gem dependencies
   into a jar file to simply run the app on any Java platform by '> java -jar file.jar'