puck 1.0.0-java → 1.1.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d3c8ed8c414ffb5241dd8dd7b903686ea9d1bf5
-  data.tar.gz: 67e2972eaafcac0792998786d3d65b96942dc4f2
+  metadata.gz: 1d2fa619bd5d33c67783df7f02b076b8d8fb7d61
+  data.tar.gz: a2d9a4ceaf07a7c12c8d0f156633ff65627ee8b2
 SHA512:
-  metadata.gz: 32db0d6f29e15a77dc05cb24078c18333c1bf2de228ee1bf8b5fcd113c1eab0c1a4308d972411b6690e1f6da2f2b828376e704d94eba27e63cdcc0c4a20b89cd
-  data.tar.gz: 9fd222f28c53f4d6f61a4532b14d56cbd077d09efccdd68b05a334f891084e930cf541ac6e97d989bf4d6e0fe6637d8d6b0fe0daa50f8f59e82c52e1b0fa3fe9
+  metadata.gz: f1d492499c49e043bbc2f2b9585e79437b76d7ad32539024378ba1fc2b0d49006083e8f376ddc3d83aa46697aeae1ad4adb8a1d72b00c16352bba9c92186b688
+  data.tar.gz: 0882d65123098436d26afdbd499afb254f1aa883623e1daae7edf8fa7c114edf67267209d2de814f0bdfacf0f3554f255b2a1b75788846b71f5e85654d8e282a

data/lib/puck/jar.rb

@@ -48,8 +48,11 @@ module Puck
     # is the same as the name of the directory containing the "lib" directory.
     #
     # @param [Hash] configuration
-    # @option configuration [String] :extra_files a list of files to include in
-    #   the Jar. The paths must be below the `:app_dir`.
+    # @option configuration [Array<String>, Hash<String,String>] :extra_files a
+    #   list of files to include in the Jar. The option can be either an Array,
+    #   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 [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.
@@ -97,42 +100,49 @@ module Puck
         create_jar_bootstrap!(tmp_dir, gem_dependencies)
 
         ant = Ant.new(output_level: 1)
-        ant.jar(destfile: output_path) do
-          manifest do
-            attribute name: 'Main-Class', value: 'org.jruby.JarBootstrapMain'
-            attribute name: 'Created-By', value: "Puck v#{Puck::VERSION}"
-          end
+        begin
+          ant.jar(destfile: output_path) do
+            manifest do
+              attribute name: 'Main-Class', value: 'org.jruby.JarBootstrapMain'
+              attribute name: 'Created-By', value: "Puck v#{Puck::VERSION}"
+            end
 
-          zipfileset dir: tmp_dir, includes: 'jar-bootstrap.rb'
+            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
+            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)
-              zipfileset dir: path, prefix: File.join(JAR_APP_HOME, sub_dir)
+            %w[bin lib].each do |sub_dir|
+              path = project_dir + sub_dir
+              if File.exists?(path)
+                zipfileset dir: path, prefix: File.join(JAR_APP_HOME, sub_dir)
+              end
             end
-          end
 
-          extra_files.each do |ef|
-            path = Pathname.new(ef).expand_path.cleanpath
-            prefix = File.join(JAR_APP_HOME, path.relative_path_from(project_dir).dirname.to_s)
-            zipfileset dir: path.dirname, prefix: prefix, includes: path.basename
-          end
+            extra_files.each do |file, target_path|
+              path = Pathname.new(file).expand_path.cleanpath
+              if target_path
+                zipfileset file: path, fullpath: target_path
+              else
+                prefix = File.join(JAR_APP_HOME, path.relative_path_from(project_dir).dirname.to_s)
+                zipfileset dir: path.dirname, prefix: prefix, includes: path.basename
+              end
+            end
 
-          gem_dependencies.each do |spec|
-            base_path = Pathname.new(spec[:base_path]).expand_path.cleanpath
-            unless project_dir == base_path
-              zipfileset dir: spec[:base_path], prefix: File.join(JAR_GEM_HOME, spec[:versioned_name])
+            gem_dependencies.each do |spec|
+              base_path = Pathname.new(spec[:base_path]).expand_path.cleanpath
+              unless project_dir == base_path
+                zipfileset dir: spec[:base_path], prefix: File.join(JAR_GEM_HOME, spec[:versioned_name])
+              end
             end
           end
+        rescue Java::OrgApacheToolsAnt::BuildException => e
+          raise PuckError, sprintf('Error when building JAR: %s (%s)', e.message, e.class), e.backtrace
         end
-
         output_path
       end
     end

data/lib/puck/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puck
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: java
 authors:
 - Theo Hultberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-09-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: