puck 1.2.4-java → 1.2.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 593ab2878f9ef64489c26b851aa8ed1d291ded5b
-  data.tar.gz: 26d158ed3125a8a6147f525f65611c319cd17c9e
+  metadata.gz: 17cca3541c05ec6b0a8efe5f9f723566fd0af794
+  data.tar.gz: 7c8a221797f16bce9db06fd29c6331e143cea01d
 SHA512:
-  metadata.gz: 88f6fa4f01d16be5d5a23c6ce3cdc3bc2e873e091df89fa4bfe688666164f766ab4aa51c2330dbbf5302c48b452976dd312c96df77b39e8b014ab9cf1348d5ac
-  data.tar.gz: e486f063e930cfb7b866870a4f9f12ff9052dd93ad4a172bc05f38e2c2da3e771d7ea7604d3e4e3937ebc16295b784766b2a0243b9b44120539c31c1d1fe4ec0
+  metadata.gz: 9bcc9fd469b3a5496868a9b251c5335c6374180ffcfd045ac14dfaaa34abbeeab1b0797c4316a0556d38e8d3caaded429a872e38cde3e44492d81f215bc441c7
+  data.tar.gz: ebbce216bae674fc8700764daa909c13efbf44c7aa37586469e85cea6f6ea2d222a41b416e670193ad5f721e5782cfdda6370889efd09350798be10dedb0e8ea

data/lib/puck/dependency_resolver.rb

@@ -38,7 +38,7 @@ module Puck
         scripting_container = Java::OrgJrubyEmbed::ScriptingContainer.new(Java::OrgJrubyEmbed::LocalContextScope::SINGLETHREAD)
         scripting_container.compat_version = Java::OrgJruby::CompatVersion::RUBY1_9
         scripting_container.current_directory = Dir.pwd
-        scripting_container.environment = Hash[ENV.merge('GEM_HOME' => gem_home).map { |k,v| [k.to_java, v.to_java] }]
+        scripting_container.environment = Hash[ENV.merge('GEM_HOME' => gem_home, 'BUNDLE_PATH' => gem_home).map { |k,v| [k.to_java, v.to_java] }]
         scripting_container.put('arguments', Marshal.dump([gemfile, lockfile, groups]).to_java_bytes)
         begin
           line = __LINE__ + 1 # as __LINE__ represents next statement line i JRuby, and that becomes difficult to offset
@@ -60,12 +60,13 @@ module Puck
               end
               Marshal.dump([specs]).to_java_bytes
             rescue => e
-              Marshal.dump([nil, e.class, e.message, e.backtrace]).to_java_bytes
+              Marshal.dump([nil, e, e.backtrace]).to_java_bytes
             end
           EOS
-          result, error, message, backtrace = Marshal.load(String.from_java_bytes(unit.run))
+          result, error, backtrace = Marshal.load(String.from_java_bytes(unit.run))
           if error
-            raise error, message, Array(backtrace)+caller
+            error.set_backtrace(Array(backtrace) + caller)
+            raise error
           end
           result
         ensure

data/lib/puck/jar.rb

@@ -99,14 +99,15 @@ 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
+        if jruby_complete_path
+          merge_archives << jruby_complete_path
         else
           merge_archives.push(JRubyJars.core_jar_path, JRubyJars.stdlib_jar_path)
         end

data/lib/puck/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puck
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: java
 authors:
 - Theo Hultberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-20 00:00:00.000000000 Z
+date: 2016-10-07 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:
@@ -18,7 +18,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .yardopts
+- ".yardopts"
 - bin/puck
 - lib/puck.rb
 - lib/puck/bootstrap.rb
@@ -36,17 +36,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: puck
-rubygems_version: 2.4.5
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: Packs your JRuby app as a standalone Jar file