puck 1.2.3-java → 1.2.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 915fd487fbad1cda697f8974d1fd5a243d16c3b9
-  data.tar.gz: aaf0d58dc6b0176378fc51c0d9aec86ede2d8338
+  metadata.gz: 593ab2878f9ef64489c26b851aa8ed1d291ded5b
+  data.tar.gz: 26d158ed3125a8a6147f525f65611c319cd17c9e
 SHA512:
-  metadata.gz: 8c745b19923f564b0682677f6980be60ac9ff1b9ef10b82eb19fdf379d22370f34a412925d295de9e6e07c8331f74e465f5ca034e0425013722b5f73d49228a7
-  data.tar.gz: b9482c59fe8b4ae78068f88f2c7c60ff344f36c4c57ca0ee30ae23419c1a9bd8a9bdcbb50327b78cf219c16d8f823b4318ab27963126f53343cc2c8c76716b96
+  metadata.gz: 88f6fa4f01d16be5d5a23c6ce3cdc3bc2e873e091df89fa4bfe688666164f766ab4aa51c2330dbbf5302c48b452976dd312c96df77b39e8b014ab9cf1348d5ac
+  data.tar.gz: e486f063e930cfb7b866870a4f9f12ff9052dd93ad4a172bc05f38e2c2da3e771d7ea7604d3e4e3937ebc16295b784766b2a0243b9b44120539c31c1d1fe4ec0

data/lib/puck/dependency_resolver.rb

@@ -26,6 +26,7 @@ module Puck
           :base_path => base_path,
           :load_paths => load_paths,
           :bin_path => spec[:bindir],
+          :spec_file => spec[:spec_file],
         }
       end
     end
@@ -54,6 +55,7 @@ module Puck
                   :full_gem_path => gem_spec.full_gem_path,
                   :load_paths => gem_spec.load_paths,
                   :bindir => gem_spec.bindir,
+                  :spec_file => gem_spec.loaded_from,
                 }
               end
               Marshal.dump([specs]).to_java_bytes

data/lib/puck/jar.rb

@@ -144,7 +144,8 @@ module Puck
             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])
+                zipfileset dir: spec[:base_path], prefix: File.join(JAR_GEM_HOME, 'gems', spec[:versioned_name])
+                zipfileset file: spec[:spec_file], fullpath: File.join(JAR_GEM_HOME, 'specifications', File.basename(spec[:spec_file]))
               end
             end
 
@@ -184,14 +185,10 @@ module Puck
         io.puts(%(PUCK_ROOT = JRuby.runtime.jruby_class_loader.get_resource('jar-bootstrap.rb').to_s.chomp('jar-bootstrap.rb')))
         io.puts(%(PUCK_BIN_PATH = ['#{JAR_APP_HOME}/bin', '#{JAR_JRUBY_HOME}/bin']))
         gem_dependencies.each do |spec|
-          io.puts("PUCK_BIN_PATH << '#{JAR_GEM_HOME}/#{spec[:versioned_name]}/#{spec[:bin_path]}'")
+          io.puts("PUCK_BIN_PATH << '#{JAR_GEM_HOME}/gems/#{spec[:versioned_name]}/#{spec[:bin_path]}'")
         end
         io.puts
-        gem_dependencies.each do |spec|
-          spec[:load_paths].each do |load_path|
-            io.puts(%($LOAD_PATH << File.join(PUCK_ROOT, '#{JAR_GEM_HOME}/#{spec[:versioned_name]}/#{load_path}')))
-          end
-        end
+        io.puts(%(Gem.paths = {'GEM_HOME' => File.join(PUCK_ROOT, '#{JAR_GEM_HOME}')}))
         io.puts
         io.puts(File.read(File.expand_path('../bootstrap.rb', __FILE__)))
       end

data/lib/puck/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puck
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: java
 authors:
 - Theo Hultberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-28 00:00:00.000000000 Z
+date: 2016-05-20 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: