jarbler 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6c86b6661dda0e9669619c5bac4a954a400dbeed028cb1944b9f0b781b4771d
-  data.tar.gz: 987e8bd4e2bd388f1b1642a8b9e911e9774e4c9870eb56c3bb85d053de1e1e1b
+  metadata.gz: ff7c6489ae577a03079ca5976e6f8ea2c311593aa2754590b83e37a446f68bc9
+  data.tar.gz: 840b7720151675d538e08473857d7fae6a4342f478cf84473ffc231f2414fc46
 SHA512:
-  metadata.gz: 4810b94071beeda3eea5fc513646b63033129e38b258b0d274e4b3384705f3b1034ff7a706cf90317c6c0dd5086fea572652c7b89ddeba62bb3faebc68d1f69d
-  data.tar.gz: b6054b374c79cc5f1d4976d1b486fcc4730e088e54285edb3156f6cd592ca2bf8c665c8fcfbec383fc4e9e2132268744dec11fdc1e81b5fbf0dbdf0d9c5cd40d
+  metadata.gz: 444d52de14b8316967b5184c9e814e40d52bcb780d84ef74dc148befea457232182bf83b01ec8c64540959af7d2522d2e20417ed9589771e8cd63779ffd60266
+  data.tar.gz: 991f7a004c5383846504ff98c7b0c0cb508e50530d64887e4418dd7b9ec2e788764303fa7358eb43d8d66ec3143118da038ee8cf8b03e5743dbc7b83175ff87b

data/CHANGELOG.md

@@ -7,3 +7,8 @@
 ## [0.1.1] - 2023-04-24
 
 - Fixed the bug 'java.lang.ClassNotFoundException: org.jruby.Main' with Windows
+
+## [0.1.2] - 2023-04-24
+
+- extract valid Gem paths from Bundler instead of using the environment variable GEM_PATH 
+

data/lib/jarbler/builder.rb

@@ -86,28 +86,28 @@ module Jarbler
     # @param [String] app_root Application root directory
     # @return [Array] Array of Gem locations
     def collect_gem_search_locations(app_root)
-      # Search locations of gems in Gemfile.lock
-      possible_gem_search_locations = []
-      # Add possible local config first in search list
-      possible_gem_search_locations << bundle_config_bundle_path(app_root) if bundle_config_bundle_path(app_root)
-      ENV['GEM_PATH'].split(':').each do |gem_path|
-        possible_gem_search_locations << gem_path
-      end
+      # All active search locations for Gems
+      Bundler.setup
+      possible_gem_search_locations = Gem.paths.path
       debug "Possible Gem locations: #{possible_gem_search_locations}"
       gem_search_locations = []
       # Check where inside this location the gems may be installed
       possible_gem_search_locations.each do |gem_search_location|
-        valid_gem_search_location = nil # No valid path found yet
-        Find.find(gem_search_location) do |path|
-          if File.directory?(path) && File.exist?("#{path}/specifications") && File.exist?("#{path}/gems")
-            valid_gem_search_location = path # Found a valid path
-            Find.prune # Do not search deeper
+        if File.exist?(gem_search_location) && File.directory?(gem_search_location)
+          valid_gem_search_location = nil # No valid path found yet
+          Find.find(gem_search_location) do |path|
+            if File.directory?(path) && File.exist?("#{path}/specifications") && File.exist?("#{path}/gems")
+              valid_gem_search_location = path # Found a valid path
+              Find.prune # Do not search deeper
+            end
+          end
+          if valid_gem_search_location
+            gem_search_locations << valid_gem_search_location
+          else
+            debug "No valid gem location found in #{gem_search_location}"
           end
-        end
-        if valid_gem_search_location
-          gem_search_locations << valid_gem_search_location
         else
-          debug "No valid gem location found in #{gem_search_location}"
+          debug("Gem location #{gem_search_location} does not exist or is not a directory")
         end
       end
       debug "Valid Gem locations: #{gem_search_locations}"
@@ -193,19 +193,6 @@ module Jarbler
       @config
     end
 
-    # Check if there is an additional local bundle path in .bundle/config
-    def bundle_config_bundle_path(rails_root)
-      bundle_path = nil # default
-      if File.exist?("#{rails_root}/.bundle/config")
-        bundle_config = YAML.load_file("#{rails_root}/.bundle/config")
-        if bundle_config && bundle_config['BUNDLE_PATH']
-          bundle_path = "#{rails_root}/#{bundle_config['BUNDLE_PATH']}"
-          debug "Local Gem path configured in #{rails_root}/.bundle/config: #{bundle_path}"
-        end
-      end
-      bundle_path
-    end
-
     # Copy the jruby-jars to the staging directory
     # @param [String] staging_dir Path to the staging directory
     # @param [Array] gem_search_locations Array of Gem locations to look for jRuby jars
@@ -219,7 +206,7 @@ module Jarbler
           break
         end
       end
-      raise "Could not determine location of jRuby jars for release '#{config.jruby_version}' in the following output:\n#{lines}" unless jruby_jars_location
+      raise "Could not determine location of jRuby jars for release '#{config.jruby_version}' in the following locations:\n#{gem_search_locations}" unless jruby_jars_location
       file_utils_copy("#{jruby_jars_location}/lib/jruby-core-#{config.jruby_version}-complete.jar", staging_dir)
       file_utils_copy("#{jruby_jars_location}/lib/jruby-stdlib-#{config.jruby_version}.jar", staging_dir)
 

data/lib/jarbler/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Jarbler
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
   VERSION_DATE = "2023-04-24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jarbler
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Peter Ramm