jarbler 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc9683c3fba322e4476646046c54b7c61ae7b6fa3d4c9865d1223fad0db590ee
-  data.tar.gz: 5e64e298302111c5fbcc606c8aad86ba93b454daece192318c33b3eca6696ccb
+  metadata.gz: ff7c6489ae577a03079ca5976e6f8ea2c311593aa2754590b83e37a446f68bc9
+  data.tar.gz: 840b7720151675d538e08473857d7fae6a4342f478cf84473ffc231f2414fc46
 SHA512:
-  metadata.gz: 0edc420a59cb4e48364c0155c0cee0f2449b32264de8f3967cf790b82df541a367d7206b4a5dbf0461561be9e88fee79d8ba7bdc737d6ca2eda951a97cc5e0d9
-  data.tar.gz: 4e7d227903baacaaf8960f333c9f3beaee96dd5c399a45ab724620af04fbdfcbb5ed1ccce9a1955907d563ce2888b1d9a0b174dc2dadb85d557960e30ca7608c
+  metadata.gz: 444d52de14b8316967b5184c9e814e40d52bcb780d84ef74dc148befea457232182bf83b01ec8c64540959af7d2522d2e20417ed9589771e8cd63779ffd60266
+  data.tar.gz: 991f7a004c5383846504ff98c7b0c0cb508e50530d64887e4418dd7b9ec2e788764303fa7358eb43d8d66ec3143118da038ee8cf8b03e5743dbc7b83175ff87b

data/CHANGELOG.md

@@ -3,3 +3,12 @@
 ## [0.1.0] - 2023-04-12
 
 - Initial release
+
+## [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/README.md

@@ -53,6 +53,7 @@ The default executable parameters are  "server -p 8080 -e production".
 
 ## Troubleshooting
 * Set DEBUG=true in environment to get additional runtime information
+* The temporary folder with the extracted app and jRuby runtime files is not deleted after execution if DEBUG is set.
 
 ## Contributing
 

data/jarbler.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |spec|
   spec.authors = ["Peter Ramm"]
   spec.email = ["Peter@ramm-oberhermsdorf.de"]
 
-  spec.summary = "Create jar file from Rails app"
-  spec.description = "Pack a Rails application into an executable jar file"
+  spec.summary = "Pack a Ruby app into a Java jar file"
+  spec.description = "Pack Ruby combined with jRuby runtime into a jar file to simply run the app on any Java platform by '> java -jar file.jar'"
   spec.homepage = "https://github.com/rammpeter/jarbler"
   spec.license = "MIT"
   spec.required_ruby_version = ">= 2.6.0"
-  
+
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/rammpeter/jarbler"
   spec.metadata["changelog_uri"] = "https://github.com/rammpeter/jarbler/CHANGELOG.md"

data/lib/jarbler/JarMain.java

@@ -23,7 +23,10 @@ import java.lang.ClassNotFoundException;
 import java.lang.NoSuchMethodException;
 import java.lang.IllegalAccessException;
 import java.lang.InstantiationException;
-
+import java.util.Map;
+import java.util.HashMap;
+import java.lang.reflect.Field;
+import java.io.FileWriter;
 
 class JarMain {
 
@@ -55,6 +58,7 @@ class JarMain {
             System.out.println("Extracting files from "+jarPath+" to "+ newFolder.getAbsolutePath());
             unzip(jarPath, newFolder.getAbsolutePath());
 
+            String app_root = newFolder.getAbsolutePath()+File.separator+"app_root";
 
             // get the file name of the jruby jar file in newFolder
             File[] files = newFolder.listFiles();
@@ -86,15 +90,15 @@ class JarMain {
                 throw new RuntimeException("Property 'executable' definition missing in jarbler.properties");
             }
 
-            System.setProperty("GEM_PATH", newFolder.getAbsolutePath()+File.separator+"gems");      // not really necessray for Rails
-            System.setProperty("GEM_HOME", newFolder.getAbsolutePath()+File.separator+"gems");      // not really necessray for Rails
-            System.setProperty("BUNDLE_PATH", newFolder.getAbsolutePath()+File.separator+"gems");   // this drives bundler for rails app
-            System.setProperty("BUNDLE_WITHOUT", "test:development");  // exclude test and development dependencies from Gemfile check
+            // create the bundle config file with the path of the gems
+            create_bundle_config(app_root, newFolder.getAbsolutePath()+File.separator+"gems");
 
             // Load the Jar file
             URLClassLoader classLoader = new URLClassLoader(new URL[]{
-                new URL("file://" + jrubyCoreFile.getAbsolutePath()),
-                new URL("file://" + jrubyStdlibFile.getAbsolutePath())
+                jrubyCoreFile.toURI().toURL(),
+                jrubyStdlibFile.toURI().toURL()
+                //new URL("file:/" + jrubyCoreFile.getAbsolutePath()),
+                //new URL("file:/" + jrubyStdlibFile.getAbsolutePath())
             });
 
             // Load the class
@@ -128,15 +132,18 @@ class JarMain {
                 debug(" - " + arg);
             }
 
-            System.setProperty("user.dir", newFolder.getAbsolutePath()+File.separator+"app_root");
+            System.setProperty("user.dir", app_root);
             // call the method org.jruby.Main.main
             mainMethod.invoke(null, (Object)mainArgs.toArray(new String[mainArgs.size()]));
         } catch (Exception e) {
-            e.getCause().printStackTrace();
+            e.printStackTrace();
         } finally {
-            // remove the temp directory newFolder
-            debug("jRuby program terminated, removing temporary folder "+ newFolder.getAbsolutePath());
-            deleteFolder(newFolder);
+            // remove the temp directory newFolder if not DEBUG mode
+            if (System.getenv("DEBUG") != null) {
+                System.out.println("DEBUG mode is active, temporary folder is not removed at process termination: "+ newFolder.getAbsolutePath());
+            } else {
+                deleteFolder(newFolder);
+            }
         }
     }
 
@@ -206,4 +213,16 @@ class JarMain {
       file.delete();
     }
 
+
+    private static void create_bundle_config(String app_root, String gem_path) throws IOException {
+        File bundle_config = new File(app_root + File.separator + ".bundle");
+        bundle_config.mkdir();
+        File bundle_config_file = new File(bundle_config.getAbsolutePath() + File.separator + "config");
+        bundle_config_file.createNewFile();
+        FileWriter fw = new FileWriter(bundle_config_file);
+        fw.write("---\n");
+        fw.write("BUNDLE_PATH: " + gem_path + "\n");
+        fw.write("BUNDLE_WITHOUT: test:development\n");
+        fw.close();
+    }
 }

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.0"
-  VERSION_DATE = "2023-04-20"
+  VERSION = "0.1.2"
+  VERSION_DATE = "2023-04-24"
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: jarbler
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Peter Ramm
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-23 00:00:00.000000000 Z
+date: 2023-04-24 00:00:00.000000000 Z
 dependencies: []
-description: Pack a Rails application into an executable jar file
+description: Pack Ruby combined with jRuby runtime into a jar file to simply run the
+  app on any Java platform by '> java -jar file.jar'
 email:
 - Peter@ramm-oberhermsdorf.de
 executables:
@@ -40,7 +41,7 @@ metadata:
   homepage_uri: https://github.com/rammpeter/jarbler
   source_code_uri: https://github.com/rammpeter/jarbler
   changelog_uri: https://github.com/rammpeter/jarbler/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -55,8 +56,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.12
-signing_key:
+rubygems_version: 3.3.26
+signing_key: 
 specification_version: 4
-summary: Create jar file from Rails app
+summary: Pack a Ruby app into a Java jar file
 test_files: []