jarbler 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e69aa07983bce3eac767254171ee446d3d75f05cc391c95d4f8cf2be52b98b
-  data.tar.gz: 001b795796c7deb3fc315256a1938bd7aaae0bb98d12ef7575cc81bcf87dd913
+  metadata.gz: 640a16561d8e25d6674c56908ffb3442ad42eeccb9d34bd54dc480167902f52a
+  data.tar.gz: 76c9ea77cbf7eaea89588a6ffbcc6d06b39d79e6cd7560df822c31b979a7bf81
 SHA512:
-  metadata.gz: c1b459f1612a905b71b9e9a0c4f73c60c7ecc38bfe5427cb57f03bad3c8c4228ac9f501059ca0d3f6459031d101c2b580cc04037da54ae3a4d2385477c87d194
-  data.tar.gz: 2c5434ea23201d59276dbca474b6927e155d4556db012fcd78b1a1935500b3af8bc073d0db103c08300f92f467f416294cd908267d29e88431eebd2365a91589
+  metadata.gz: 9ecdbb4c5485b2e816793e367e4f1257e2f546ed95b515ec6c34393a8dd22fe8546efe8f63eef393b5f455396267db2dfc71f0ff22c0f246034f35736bcd05a0
+  data.tar.gz: acfe393d73f216856896a60fe815a94a3016eaf7a9dbf88734b8a99431b59ec5a39d947ace599a72365d70fac5ba55fff240dd0d92a9d57e46dce8d4bac66745

data/CHANGELOG.md

@@ -1,12 +1,19 @@
 ## [Unreleased]
 
+## [0.4.4] - 2026-02-03
+
+- Version conflicts with installed system default gems are fixed. <br/>
+  This is done by supressing the load/activate of the target gems during the jar file build.
+- Platforms attribute for JRuby 10.0.3.0 is "universal-java" now, without the previous suffix with Java major number.<br/>
+  So, replacement of "universal-java-XX" directories in jar file with current Java major number at jar startup isn't necessary for recent JRuby versions 
+
 ## [0.4.3] - 2025-07-29
 
 - Enable Ruby and JRuby warnings ($VERBOSE = true) in call of 'jarble' if environment variable `DEBUG` is set 
 
 ## [0.4.2] - 2025-07-24
 
-- Native Gem extensions are also copied into the jar file if the Gem has a native extension<br/>
+- 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.
 
@@ -35,8 +42,8 @@
 
 - Warning if Ruby-specific environment variables (GEM_HOME etc.) are set which may cause malfunction of  app in jar file
 - Accept jar file locations with blanks in the path, especially for Windows
-- Setting `compile_ruby_files=true` compiles only .rb file of the application, but does not compile the .rb files in Gems.<br/>
-  Compiling the Gems also remains an open task.
+- Setting `compile_ruby_files=true` compiles only .rb file of the application, but does not compile the .rb files in gems.<br/>
+  Compiling the gems also remains an open task.
 - Bugfix: Accept spaces in the path to the jar file, especially for Windows
 
 ## [0.3.1] - 2024-07-02
@@ -72,11 +79,11 @@
 
 ## [0.1.5] - 2023-06-15
 
-- Bugfix: use minor ruby version without patch level for Gem files location
+- Bugfix: use minor ruby version without patch level for gem files location
 
 ## [0.1.4] - 2023-04-28
 
-- Jarbler also supports Gemfile references to Gems with git dependencies now
+- Jarbler also supports Gemfile references to gems with git dependencies now
 
 ## [0.1.3] - 2023-04-25
 
@@ -84,7 +91,7 @@
 
 ## [0.1.2] - 2023-04-24
 
-- extract valid Gem paths from Bundler instead of using the environment variable GEM_PATH
+- extract valid gem paths from Bundler instead of using the environment variable GEM_PATH
 
 ## [0.1.1] - 2023-04-24
 

data/lib/jarbler/JarMain.java

@@ -251,7 +251,7 @@ class JarMain {
     try {
         String destFileName = zipEntry.getName();
 
-        // the platform name in extension dir depends on the the target java version, therfore we replace the platform name here
+        // the platform name in extension dir depends on the the target java version, therefore 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 + "'");

data/lib/jarbler/builder.rb

@@ -87,6 +87,18 @@ module Jarbler
       end
     end
 
+    # get the resulting extension target dir
+    # Accept that JRuby >= 10.0.3.0 uses "universal-java" where JRuby < 10.0.3.0 has used "universal-java-<Java major version>"
+    # "universal-java-XX" is replaced with the correct platform for the current Java version after unzipping of the jar file
+    # @return [String] the dir name to use in the jar file for extensions
+    def universal_java_dir_for_extensions
+      if Gem::Version.new(config.jruby_version) < Gem::Version.new('10.0.3.0')
+        'universal-java-XX'                                    # up to 10.0.2.0 the Java major version was added to the platform
+      else
+        'universal-java'                                       # JRuby 10.0.3.0 skipped the  Java major version from the platform attribute
+      end
+    end
+
     private
 
     # Copy the needed Gems to the staging directory
@@ -95,9 +107,7 @@ 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}"
+      extension_target_location = "#{gem_target_location}/extensions/#{universal_java_dir_for_extensions}/#{ruby_minor_version}"
 
       FileUtils.mkdir_p("#{gem_target_location}/bin")
       FileUtils.mkdir_p("#{gem_target_location}/build_info")
@@ -110,11 +120,12 @@ module Jarbler
       FileUtils.mkdir_p("#{gem_target_location}/bundler/gems")
 
       needed_gems = gem_dependencies  # get the full names of the dependencies
+      specs = Bundler.definition.specs                                          # Get all specs for Gems from Gemfile.lock
       needed_gems.each do |needed_gem|
-        # Get the location of the needed gem
-        spec = Gem::Specification.find_by_name(needed_gem[:name], needed_gem[:version])
+        spec = specs.find { |s| s.name == needed_gem[:name] && s.version == needed_gem[:version] }
         raise "Gem #{needed_gem[:full_name]} not found for copying" unless spec
-        debug "Found gem #{needed_gem[:full_name]} version #{needed_gem[:version]} in #{spec.gem_dir}"
+        debug "Gem #{needed_gem[:full_name]} version #{needed_gem[:version]} should be in #{spec.gem_dir}"
+        raise "Gem dir for #{needed_gem[:full_name]} version #{needed_gem[:version]} not found at location specified by Gem::Specification ( #{spec.gem_dir} )" unless Dir.exist?(spec.gem_dir)
 
         # differentiate between Gems from git/bundler and Gems from rubygems
         if spec.source.is_a?(Bundler::Source::Git)
@@ -122,12 +133,10 @@ module Jarbler
           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'"
+            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
-          # TODO: Gemfile could request a different version of default gem compared to the one jruby jars
-          #       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'"
@@ -142,7 +151,7 @@ module Jarbler
             # 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'"
+              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
@@ -157,11 +166,12 @@ module Jarbler
     # @return [Array] Array with Hashes containing: name, version, full_name
     def gem_dependencies
       needed_gems = []
+
       lockfile_parser = Bundler::LockfileParser.new(Bundler.read_file(Bundler.default_lockfile))
       lockfile_specs = lockfile_parser.specs
+      # Bundler.definition.specs possibly contains the same information like lockfile_specs
 
-      Bundler.setup(*config.gemfile_groups) # Load Gems specified in Gemfile, ensure that Gem path also includes the Gems loaded into bundler dir
-      # filter Gems needed for production
+      # filter Gems needed for the desired groups (eg. production)
       gemfile_specs = Bundler.definition.dependencies.select do |d|
         !(d.groups & config.gemfile_groups).empty?        # Check if the Gem is in the groups specified in config.gemfile_groups
       end

data/lib/jarbler/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Jarbler
-  VERSION = "0.4.3"
-  VERSION_DATE = "2025-07-29"
+  VERSION = "0.4.4"
+  VERSION_DATE = "2026-01-29"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarbler
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Peter Ramm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-29 00:00:00.000000000 Z
+date: 2026-02-03 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'