jarbler 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97f5261d55e15e23454414413af5f467bfdf5c2554916574269d6fa99f4a411a
-  data.tar.gz: 5a77de393585a7fa444157ebc2e7835d6d39e2e0e004ade0f840d9f2f9abcff9
+  metadata.gz: bba70c5fbf20494c82fc683d2e4ad8c39952000e8a525c7070f142219f7c38bd
+  data.tar.gz: '085db112eb0163afbad08545074af2a3994ec6cc498f56b6da16910833c2fe62'
 SHA512:
-  metadata.gz: ad30f274db2a26f844df82f295b95f9bdcd9a023f35bbc83a6d2b7ec44b77a4dd0b8ca5ca66bb3f46818acf927d2e72efefb0f8b2669b058f5f51b9dacdb6d49
-  data.tar.gz: e07c531aa6082b3d186d2d3687d6a784b9b07593f4145e4d51bdd28247f57c710a35ed15196c18a0d3cb5a9f503808b242833709780b71442e0f293de1fe0db4
+  metadata.gz: 3a18adb5dfd17593a8c9fa8fb0c997b1e65544705a1074f39984923c6bfd9d82eb938c30b32b09339d349a17cb2e591ed817812060228bb94ecdb6e8cc890e2f
+  data.tar.gz: 36b98d4f3293ffcc11bbec6ef8e53f57a934d7885d30be43c6ed4c0dbcf3c54802d606d6a5d11292c37a4e1681077a92ecc7f9d23a49008ada7b95c1b0634d17

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 ## [Unreleased]
 
+## [0.2.3] - 2024-06-13
+
+- Show used configuration values in log output
+
+## [0.2.2] - 2024-06-13
+
+- Exclude certain dirs or files from compilation with 'excludes_from_compile' option in config file
+
 ## [0.2.1] - 2024-06-13
 
 - Ruby files remain originally in jar if compile fails for a single file. 

data/README.md

@@ -58,7 +58,8 @@ The default configuration is focused on Ruby on Rails applications.<br>
 | compile_ruby_files      | false                                                                          | Ahead of time compilation of all .rb files of application and Gem dependencies to .class files. Only store .class files in jar. Requires JRuby runtime. |
 | executable              | "bin/rails"                                                                    | The ruby start file to run at execution of jar file. File extension .class is used automatically if start file is .rb and AOT compilation is used.      |
 | 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                                                                                     |
+| excludes_from_compile   | ["config"]                                                                     | The files and dirs of the project to exclude from the compilation of .rb files                                                                          |
+| excludes                | ["tmp/cache", "tmp/pids", ...] (see generated template file for whole content) | The files and dirs of the project to exclude from the include option                                                                                    |
 | include_gems_to_compile | false                                                                          | Should .rb files of the project gems also be compiled if compile_ruby_files = true                                                                      |
 | 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                                                                                                                      |

data/lib/jarbler/builder.rb

@@ -275,6 +275,11 @@ module Jarbler
         ruby_files = ruby_files.select { |f| !(f =~ /\.#{File::SEPARATOR}gems#{File::SEPARATOR}/) } # Exclude ./gems/* directories from compiling
       end
 
+      # Exclude named files or directories from compiling
+      config.excludes_from_compile.each do |exclude|
+        ruby_files = ruby_files.select { |f| !(f =~ /\.#{File::SEPARATOR}app_root#{File::SEPARATOR}#{exclude}/) }
+      end
+
       ruby_files.each do |ruby_file|
         debug "Compile Ruby file #{ruby_file}"
         full_file_name = File.join(Dir.pwd, ruby_file)                          # full name including path is required by the JRuby compiler

data/lib/jarbler/config.rb

@@ -3,7 +3,7 @@ require 'json'
 
 module Jarbler
   class Config
-    attr_accessor :jar_name, :includes, :excludes, :jruby_version, :executable, :executable_params, :compile_ruby_files, :include_gems_to_compile
+    attr_accessor :jar_name, :includes, :excludes, :jruby_version, :executable, :executable_params, :compile_ruby_files, :include_gems_to_compile, :excludes_from_compile
 
     CONFIG_FILE = 'config/jarble.rb'
     # create instance of Config class with defaults or from config file
@@ -23,12 +23,31 @@ module Jarbler
       config.executable = config.executable.sub(/\.rb$/, '.class') if config.compile_ruby_files
 
       config.validate_values
+
+      puts ""
+      if File.exist?(CONFIG_FILE)
+        puts "Configuration loaded from file #{File.join(Dir.pwd, CONFIG_FILE)}"
+      else
+        puts "No configuration file found at #{File.join(Dir.pwd, CONFIG_FILE)}. Using default values."
+      end
+      puts "Used configuration values are:"
+      puts "  compile_ruby_files:       #{config.compile_ruby_files}" if config.compile_ruby_files
+      puts "  excludes:                 #{config.excludes}" unless config.excludes.empty?
+      puts "  excludes_from_compile:    #{config.excludes_from_compile}" unless config.excludes_from_compile.empty?
+      puts "  executable:               #{config.executable}"
+      puts "  executable_params:        #{config.executable_params}" unless config.executable_params.empty?
+      puts "  include_gems_to_compile:  #{config.include_gems_to_compile}" if config.include_gems_to_compile
+      puts "  includes:                 #{config.includes}" unless config.includes.empty?
+      puts "  jar_name:                 #{config.jar_name}"
+      puts "  jruby_version:            #{config.jruby_version}"
+      puts ""
       config
     end
 
     def initialize
       @compile_ruby_files = false
       @excludes = %w(tmp/cache tmp/pids tmp/sockets vendor/bundle vendor/cache vendor/ruby)
+      @excludes_from_compile = %w(config)
       @executable = 'bin/rails'
       @executable_params = %w(server -e production -p 8080)
       @include_gems_to_compile = false
@@ -72,6 +91,9 @@ module Jarbler
 # Compile also the .rb files of the gems of the project to Java .class files?
 # config.include_gems_to_compile = #{include_gems_to_compile}
 
+# Directories or files to exclude from the compilation if compile_ruby_files = true
+# config.excludes_from_compile = #{excludes_from_compile}
+
       ".split("\n"))
     end
 
@@ -137,6 +159,7 @@ module Jarbler
       raise "Invalid config value for compile_ruby_files: #{compile_ruby_files}" unless [true, false].include?(compile_ruby_files)
       raise "compile_ruby_files = true is supported only with JRuby! Current runtime is '#{RUBY_ENGINE}'" if compile_ruby_files && (defined?(RUBY_ENGINE) && RUBY_ENGINE != 'jruby')
       raise "include_gems_to_compile = true is supported only if compile_ruby_files = true!" if include_gems_to_compile && !compile_ruby_files
+      raise "Invalid config value for excludes_from_compile: #{excludes_from_compile}" unless excludes_from_compile.is_a?(Array)
     end
   end
 end

data/lib/jarbler/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Jarbler
-  VERSION = "0.2.1"
+  VERSION = "0.2.3"
   VERSION_DATE = "2024-06-13"
 end

metadata

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