jarbler 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b0f184ae1d09ac0464ed7c607600571e77873ae91a1aa2c20578856cd2b8404
-  data.tar.gz: 0dce28c9d7e4856d5903da84f8ea4f5ec5f173931fe4fca6ec5e8e849bbcbc4b
+  metadata.gz: 1496bf31678cf15945cd367d656a6717df35552c3deacf4e44d0f0d8267e26a0
+  data.tar.gz: 401efdc3ab67e9e913de4550ea108dc13899ececc0ab1b14267451e731803159
 SHA512:
-  metadata.gz: 7b4383469571b3ce72c7e97123f8a8a0b25834848970921ae84dd445f3ea9268fec77193b796dddd2444831d5854e477d13d912de9d962fea3bcdd74ecb9d56d
-  data.tar.gz: dfcfdd76de3397adabb0e8677c09dedc112486387addeca59f8b85b50b40f8d7230c337b61c191f2d2752eb1cf9514011905579818add6665cce66dc38db0b66
+  metadata.gz: 39a464b266c5f06ebf2270e117ba0f81a7fae012c70d5a18737b89e72ab9c3f99ea44d0aa5d898e55b4381789a21e7b2c2e1a1abbc3e781a0d10da12f272cce2
+  data.tar.gz: 449426ef9a89c170efc469fc87ad179c2c89438580fac0cecbf19c6b06d7af048f0e345f3569aa46a6d4578ef3422602ea5f6acc84b3102544da8a43f7b4863c

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.3.6] - 2025-03-31
+
+- remove temporary folder with extracted jar content after termination of Ruby code even if Ruby code terminates the JVM hard with 'exit' or 'System.exit'
+- provide exit code of Ruby code as exit code of the jar file execution
+
 ## [0.3.5] - 2025-03-22
 
 - new config attribute "config.compile_java_version" allows control of setting for "javac -source and -target" for AOT compilation

data/lib/jarbler/JarMain.java

@@ -33,6 +33,9 @@ import java.security.ProtectionDomain;
 
 class JarMain {
 
+    // declare as class variable to be used in addShutdownHook
+    private static URLClassLoader classLoader = null;
+
     // executed by java -jar <jar file name>
     public static void main(String[] args) {
         debug("Start java process in jar file "+jar_file_name());
@@ -113,7 +116,7 @@ class JarMain {
             create_bundle_config(app_root, gem_home);
 
             // Load the Jar file
-            URLClassLoader classLoader = new URLClassLoader(new URL[]{
+            classLoader = new URLClassLoader(new URL[]{
                 jrubyCoreFile.toURI().toURL(),
                 jrubyStdlibFile.toURI().toURL()
                 //new URL("file:/" + jrubyCoreFile.getAbsolutePath()),
@@ -159,19 +162,39 @@ class JarMain {
                 debug(" - " + arg);
             }
 
+            // Add code to execute at System.exit
+            // ensure cleanup of the temporary directory also at hard exit in Ruby code like 'exit' or 'System.exit'
+            Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+                debug("Execute shutdown hook");
+                try {
+                    if (classLoader != null) {
+                        // Free the JRuby jars to allow deletion of the temporary directory
+                        classLoader.close();
+                        classLoader = null; // Remove reference
+                        System.gc(); // Suggest garbage collection
+                    }
+                    // remove the temp directory newFolder if not DEBUG mode
+                    if (debug_active()) {
+                        System.out.println("DEBUG mode is active, temporary folder is not removed at process termination: "+ newFolder.getAbsolutePath());
+                    } else {
+                        deleteFolder(newFolder);
+                    }
+                } catch (Exception e) {
+                    System.err.println("Exception in shutdown hook: "+ e.getMessage());
+                    e.printStackTrace();
+                }
+            }));
+
             // call the method org.jruby.Main.main
             debug("Calling org.jruby.Main.main with: "+ mainArgs);
             mainMethod.invoke(null, (Object)mainArgs.toArray(new String[mainArgs.size()]));
-            // TODO: evaluate return value
         } catch (Exception e) {
             e.printStackTrace();
+            System.exit(1); // signal unsuccessful termination
         } finally {
-            // 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);
-            }
+            // Called only if the JVM is not terminated by System.exit before, see addShutdownHook
+            // This code is not executed if called 'exit' or 'System.exit' in Ruby code before
+            debug("Applicaton finished in finalize block");
         }
     }
 
@@ -240,24 +263,32 @@ class JarMain {
 
     }
 
+    private static boolean debug_active() {
+        String debug = System.getenv("DEBUG");
+        return debug != null && debug.toUpperCase().equals("TRUE");
+    }
+
     private static void debug(String msg) {
-        if (System.getenv("DEBUG") != null) {
+        if (debug_active()) {
             System.err.println(msg);
         }
     }
 
-   private static void deleteFolder(File file){
-      for (File subFile : file.listFiles()) {
-         if(subFile.isDirectory()) {
-            deleteFolder(subFile);
-         } else {
-            subFile.delete();
-         }
-      }
-      file.delete();
+    private static void deleteFolder(File file) {
+        try
+        {
+            if (file.isDirectory()) {
+               File[] entries = file.listFiles();
+               for (File currentFile: entries) {
+                   deleteFolder(currentFile);
+               }
+            }
+            file.delete();
+        } catch(Throwable t) {
+            System.err.println("Could not DELETE file: " + file.getAbsolutePath() + " - " + t.getMessage());
+        }
     }
 
-
     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();

data/lib/jarbler/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Jarbler
-  VERSION = "0.3.5"
-  VERSION_DATE = "2025-03-22"
+  VERSION = "0.3.6"
+  VERSION_DATE = "2025-03-31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarbler
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Peter Ramm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-22 00:00:00.000000000 Z
+date: 2025-04-01 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'