puck 1.1.2-java → 1.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9be5db817f2a52208fd00d8eb9cd41ea3fe4c2c0
-  data.tar.gz: c1df6a00d10c8a6267ecef863e5c5c1657f54203
+  metadata.gz: 47bef3c027c28957af4b9cee38362eb563da11fc
+  data.tar.gz: feac13fef9a26c7abde2e17dfba0eb8d32d2f1fb
 SHA512:
-  metadata.gz: be33f0e5cd5dcc5d827448a09c3c9beecf2ac315ff5eea48b7f55d70ac6d8095243b36a6d0d2970de5e6a8aa6124c3b0055ed6338945d2042c465fd522cf430e
-  data.tar.gz: a05e6f86f4dad6a3b41f19e4bc031ee7101ea1a5f19591c3b09cca3a3f4436165fc13a1e6b90f7a11c1090f8c2097406b4cdb08e5441bbc6844a6b0ecf056d3b
+  metadata.gz: 184478dc20a2ad1439fec9b1f0a1edd3c967c62c139490c6d76dc05484eb2adc23ea29f1946b64372afbf65cb58b3ab7b683a7c1ea6d180599a16ba87a0b64fb
+  data.tar.gz: 0eccc25eb4cbb0234abddf4b1e4c476500654ad751a1e13a3f29e887a11043fc611e4c6b1cf162d1fda5762a180d35d9f06f35de8bc53d5b5c28c3448849a0a2

data/lib/puck/bootstrap.rb

@@ -1,12 +1,16 @@
 if ARGV.any?
   file_name = ARGV.shift
+  bin_file_found = false
   PUCK_BIN_PATH.each do |dir|
     relative_path = File.join(dir, file_name)
     if File.exists?("classpath:/#{relative_path}")
+      bin_file_found = true
       $0 = relative_path
       load(relative_path)
-      exit
+      break
     end
   end
-  abort(%(No "#{file_name}" in #{PUCK_BIN_PATH.join(File::PATH_SEPARATOR)}))
+  unless bin_file_found
+    abort(%(No "#{file_name}" in #{PUCK_BIN_PATH.join(File::PATH_SEPARATOR)}))
+  end
 end

data/lib/puck/configuration.rb

@@ -21,7 +21,7 @@ module Puck
     private
 
     SCALAR_ARGS = [:app_name, :app_dir, :build_dir, :jruby_complete].freeze
-    LIST_ARGS = [:extra_files].freeze
+    LIST_ARGS = [:extra_files, :merge_archives].freeze
     ARG_PREFIX = '--'.freeze
 
     def command_line_options

data/lib/puck/jar.rb

@@ -33,7 +33,8 @@ module Puck
   #   task :jar do
   #     jar = Puck::Jar.new(
   #       extra_files: Dir['config/*.yml'],
-  #       jruby_complete: 'build/custom-jruby-complete.jar'
+  #       jruby_complete: 'build/custom-jruby-complete.jar',
+  #       merge_archives: Dir['external.jar']
   #     )
   #     jar.create
   #   end
@@ -53,6 +54,13 @@ module Puck
     #   in which case paths must be below the `:app_dir`, or a Hash, in which
     #   case the file specified by the key is included at the path specified by
     #   the corresponding value.
+    # @option configuration [Array<String>, Hash<String,String>] :merge_archives
+    #   a list of Jars to be merged into the Jar. The option can be either an Array,
+    #   in which case the source Jar or zip file will be merged at the root,
+    #   or a Hash, in which case the Jar specified by the key is merged at the path
+    #   specified by its value. Signature files ('META-INF/*.SF', 'META-INF/*.RSA',
+    #   'META-INF/*.DSA' and 'META-INF/SIG-*') are discarded in the merge,
+    #   since they describe the source Jar and will not match the Jar produced by Puck.
     # @option configuration [String] :gem_groups ([:default]) a list of gem
     #   groups to include in the Jar. Remember to include the default group if
     #   you override this option.
@@ -91,12 +99,18 @@ module Puck
         temporary_output_path = File.join(Dir.mktmpdir, @configuration[:jar_name])
         project_dir = Pathname.new(@configuration[:app_dir]).expand_path.cleanpath
         extra_files = @configuration[:extra_files] || []
-        jruby_complete_path = @configuration[:jruby_complete]
 
         if !(defined? JRubyJars) && !(jruby_complete_path && File.exists?(jruby_complete_path))
           raise PuckError, 'Cannot build Jar: jruby-jars must be installed, or :jruby_complete must be specified'
         end
 
+        merge_archives = (@configuration[:merge_archives] || []).to_a
+        if (jruby_complete = @configuration[:jruby_complete])
+          merge_archives << jruby_complete
+        else
+          merge_archives.push(JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path)
+        end
+
         gem_dependencies = @dependency_resolver.resolve_gem_dependencies(@configuration)
         create_jar_bootstrap!(tmp_dir, gem_dependencies)
 
@@ -110,13 +124,6 @@ module Puck
 
             zipfileset dir: tmp_dir, includes: 'jar-bootstrap.rb'
 
-            if jruby_complete_path
-              zipfileset src: jruby_complete_path
-            else
-              zipfileset src: JRubyJars.core_jar_path
-              zipfileset src: JRubyJars.stdlib_jar_path
-            end
-
             %w[bin lib].each do |sub_dir|
               path = project_dir + sub_dir
               if File.exists?(path)
@@ -140,6 +147,14 @@ module Puck
                 zipfileset dir: spec[:base_path], prefix: File.join(JAR_GEM_HOME, spec[:versioned_name])
               end
             end
+
+            merge_archives.each do |archive, target_path|
+              if target_path
+                zipfileset src: archive, prefix: target_path, excludes: SIGNATURE_FILES
+              else
+                zipfileset src: archive, excludes: SIGNATURE_FILES
+              end
+            end
           end
 
           FileUtils.mv(temporary_output_path, output_path)
@@ -162,6 +177,7 @@ module Puck
     JAR_APP_HOME = 'META-INF/app.home'.freeze
     JAR_GEM_HOME = 'META-INF/gem.home'.freeze
     JAR_JRUBY_HOME = 'META-INF/jruby.home'.freeze
+    SIGNATURE_FILES = ['META-INF/*.SF', 'META-INF/*.RSA', 'META-INF/*.DSA', 'META-INF/SIG-*'].join(',').freeze
 
     def create_jar_bootstrap!(tmp_dir, gem_dependencies)
       File.open(File.join(tmp_dir, 'jar-bootstrap.rb'), 'w') do |io|
@@ -172,7 +188,7 @@ module Puck
         io.puts
         gem_dependencies.each do |spec|
           spec[:load_paths].each do |load_path|
-            io.puts(%($LOAD_PATH << 'classpath:#{JAR_GEM_HOME}/#{spec[:versioned_name]}/#{load_path}'))
+            io.puts(%($LOAD_PATH << 'classpath:/#{JAR_GEM_HOME}/#{spec[:versioned_name]}/#{load_path}'))
           end
         end
         io.puts

data/lib/puck/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Puck
-  VERSION = '1.1.2'.freeze
+  VERSION = '1.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puck
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.1
 platform: java
 authors:
 - Theo Hultberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Puck takes your app and packs it along with all your gems and a complete JRuby runtime in a standalone Jar file that can be run with just `java -jar …`
 email: