jarbler 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69c4dfd51fa32af943ab9ada29536253dc516150cdff7e82e1944216098a92c8
-  data.tar.gz: 63e6752eba98d7cc27642fcbb13a199fc41867a6d044edf28051f025d292ef09
+  metadata.gz: 2be6f0a0ffe320df86b23b1e9f70fd0e1d65be38c9bac0f1a2c4d165f1c62969
+  data.tar.gz: 38fe9c1a73da1682ba09ce8364e6f174a567ad563f7254322a8a2a85fb19e329
 SHA512:
-  metadata.gz: 882f6b8e791b8f7fc9cc4eff3d86867c2667f8d817fd4c46a1f10103bcf98e50aee1e98c10b49fe14ae5e4f5a63a992ff9bf9121d4a9459d87e20ca05560c42a
-  data.tar.gz: e8b9a10dbfacc4180710a62fe84cfa9595049d62cd6ff6625cf520d39d380357f13502f0e0f228057d85d226d4ef29fe255e5cc63cf011f5d00f92bc8c5d2c52
+  metadata.gz: 26346f96a9051a76a5ad7b94d3317dbfd604b52c45ae0b4102d809a2c0d82f26226c81cf27028352b756d56f8a99032ac128827755f0ccfc7f2998b78491f531
+  data.tar.gz: b9b4720764fcaf4cdde6ff2051d1667fe5571ccd3fef3bca71f32a9b129a4d680998657ea8213ac395a1f1e9fc60a1eee21148acf34b5cfb4d09317d255af230

data/CHANGELOG.md

@@ -1,21 +1,33 @@
 ## [Unreleased]
 
-## [0.1.0] - 2023-04-12
+## [0.1.6] - 2023-06-19
 
-- Initial release
+- Bugfix: Do not clone default gems, because they are already included in the jruby jars standard library
 
-## [0.1.1] - 2023-04-24
+## [0.1.5] - 2023-06-15
 
-- Fixed the bug 'java.lang.ClassNotFoundException: org.jruby.Main' with Windows
+- Bugfix: use minor ruby version without patch level for Gem files location
 
-## [0.1.2] - 2023-04-24
+## [0.1.4] - 2023-04-28
 
-- extract valid Gem paths from Bundler instead of using the environment variable GEM_PATH 
+- Jarbler also supports Gemfile references to Gems with git dependencies now
 
 ## [0.1.3] - 2023-04-25
 
 - Removed .jruby-version so that the jruby version is not fixed anymore
 
-## [0.1.4] - 2023-04-28
+## [0.1.2] - 2023-04-24
+
+- extract valid Gem paths from Bundler instead of using the environment variable GEM_PATH
+
+## [0.1.1] - 2023-04-24
+
+- Fixed the bug 'java.lang.ClassNotFoundException: org.jruby.Main' with Windows
+
+## [0.1.0] - 2023-04-12
+
+- Initial release
+
+
+
 
-- Jarbler also supports Gemfile references to Gems with git dependencies now

data/README.md

@@ -15,6 +15,8 @@ Install the gem and add to the application's Gemfile by executing:
 If bundler is not being used to manage dependencies, install the gem by executing:
 
     $ gem install jarbler
+    
+[![Gem Version](https://badge.fury.io/rb/jarbler.svg)](https://badge.fury.io/rb/jarbler)
 
 ## Usage
 
@@ -47,9 +49,18 @@ To create a template config file with information about all the supported config
 
     $ jarble config
 
-The default configuration supports Ruby on Rails applications.<br>
-The executable is set to "bin/rails" by default.<br>
-The default executable parameters are  "server -p 8080 -e production".
+The default configuration if focused on Ruby on Rails applications.<br>
+
+### Configuration options
+| Option            | Default value                                                                  | Description                                                         |
+|-------------------|--------------------------------------------------------------------------------|---------------------------------------------------------------------|
+| executable        | "bin/rails"                                                                    | The ruby file to run at execution of jar file                       |
+| executable_params | ["server", "-e", "production", "-p", "8080"]                                   | Command line parameters to be used for the ruby executable          |
+| excludes          | ["tmp/cache", "tmp/pids", ...] (see generated template file for whole content) | The files and dirs of the project to exlude from the include option |
+| includes          | ["app", "bin", "config", ...] (see generated template file for whole content)  | The files and dirs of the project to include in the jar file        |
+| jar_name          | &lt; Name of project dir &gt;.jar                                              | The name of the generated jar file                                  |
+| jruby_version     | The current most recent jRuby version                                          | The version of the jRuby runtime to use                             |
+
 
 ## Troubleshooting
 * Set DEBUG=true in environment to get additional runtime information

data/build_gem.sh

@@ -3,7 +3,7 @@
 # remove existing gem file
 rm -f jarbler-*.gem
 
-rake test
+bundle exec rake test
 if [ $? -ne 0 ]; then
   echo "Tests failed."
   exit 1

data/lib/jarbler/JarMain.java

@@ -57,7 +57,7 @@ class JarMain {
                 jarPath = jarPath.substring(1); // remove the leading slash
             }
 
-            // extract the jarFile by executing jar -xf jarFileName
+            // extract the jarFile by unzipping it (not using the jar utility which may not be available)
             System.out.println("Extracting files from "+jarPath+" to "+ newFolder.getAbsolutePath());
             unzip(jarPath, newFolder.getAbsolutePath());
 
@@ -135,8 +135,10 @@ class JarMain {
                 debug(" - " + arg);
             }
 
+            debug("jRuby set property 'user.dir' to '" + app_root + "'");
             System.setProperty("user.dir", app_root);
             // 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()]));
         } catch (Exception e) {
             e.printStackTrace();

data/lib/jarbler/builder.rb

@@ -18,7 +18,7 @@ module Jarbler
       app_root = Dir.pwd
       debug "Project dir: #{app_root}"
 
-      ruby_version = copy_jruby_jars_to_staging(staging_dir) # Copy the jruby jars to the staging directory
+      ruby_minor_version = copy_jruby_jars_to_staging(staging_dir) # Copy the jruby jars to the staging directory
       exec_command "javac -nowarn -Xlint:deprecation -source 8 -target 8 -d #{staging_dir} #{__dir__}/JarMain.java" # Compile the Java files
 
       # Copy the application project to the staging directory
@@ -31,7 +31,7 @@ module Jarbler
       raise "Gemfile.lock not found in #{app_root}" unless File.exist?("#{app_root}/Gemfile.lock")
 
       # Copy the needed Gems to the staging directory
-      copy_needed_gems_to_staging(staging_dir, ruby_version)
+      copy_needed_gems_to_staging(staging_dir, ruby_minor_version)
 
       Dir.chdir(staging_dir) do
         # create the manifest file
@@ -101,10 +101,10 @@ module Jarbler
 
     # Copy the needed Gems to the staging directory
     # @param staging_dir [String] the staging directory
-    # @param ruby_version [String] the corresponding ruby version of the jruby jars version
+    # @param ruby_minor_version [String] the corresponding ruby minor version of the jruby jars version
     # @return [void]
-    def copy_needed_gems_to_staging(staging_dir, ruby_version)
-      gem_target_location = "#{staging_dir}/gems/jruby/#{ruby_version}"
+    def copy_needed_gems_to_staging(staging_dir, ruby_minor_version)
+      gem_target_location = "#{staging_dir}/gems/jruby/#{ruby_minor_version}"
       FileUtils.mkdir_p("#{gem_target_location}/gems")
       FileUtils.mkdir_p("#{gem_target_location}/specifications")
       FileUtils.mkdir_p("#{gem_target_location}/bundler/gems")
@@ -121,9 +121,11 @@ module Jarbler
           # Copy the Gem from bundler/gems including the gemspec
           file_utils_copy(spec.gem_dir, "#{gem_target_location}/bundler/gems")
         else  # Gem is from rubygems
-          # copy the Gem and gemspec separately
-          file_utils_copy(spec.gem_dir, "#{gem_target_location}/gems")
-          file_utils_copy("#{spec.gem_dir}/../../specifications/#{needed_gem[:full_name]}.gemspec", "#{gem_target_location}/specifications")
+          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
+            file_utils_copy(spec.gem_dir, "#{gem_target_location}/gems")
+            file_utils_copy("#{spec.gem_dir}/../../specifications/#{needed_gem[:full_name]}.gemspec", "#{gem_target_location}/specifications")
+          end
         end
       end
     end
@@ -200,7 +202,7 @@ module Jarbler
 
     # Copy the jruby-jars to the staging directory
     # @param [String] staging_dir Path to the staging directory
-    # @return [String] the ruby version of the jRuby jars
+    # @return [String] the minor ruby version of the jRuby jars with patch level set to 0
     def copy_jruby_jars_to_staging(staging_dir)
 
       # Ensure that jruby-jars gem is installed, otherwise install it. Accepts also bundler path in .bundle/config
@@ -224,7 +226,9 @@ module Jarbler
       raise "Could not determine Ruby version for jRuby #{config.jruby_version} in following output:\n#{lines}" unless match_result
       ruby_version = match_result[0].tr('()', '')
       debug "Corresponding Ruby version for jRuby (#{config.jruby_version}): #{ruby_version}"
-      ruby_version
+      ruby_minor_version = ruby_version.split('.')[0..1].join('.') + '.0'
+      debug "Corresponding Ruby minor version for jRuby (#{config.jruby_version}): #{ruby_minor_version}"
+      ruby_minor_version
     end
 
     # Execute the command in OS and return the output

data/lib/jarbler/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Jarbler
-  VERSION = "0.1.4"
-  VERSION_DATE = "2023-04-28"
+  VERSION = "0.1.6"
+  VERSION_DATE = "2023-06-19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jarbler
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Peter Ramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-06-19 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'