puck 1.0.0.pre3 → 1.0.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 432986a4cfe6119ebfc1f5b8c9edb661391c4d3f
-  data.tar.gz: 13ff7d59ffc31670bab672f4e53049c72e4a73c1
+  metadata.gz: 3a3b334379dcfae40844e870c93ce61732db4d84
+  data.tar.gz: acb8397baabc28a89948612c4ed1d40828eee215
 SHA512:
-  metadata.gz: a4f379593f83a960811fed5754fc009eeb122945cd8a68e3d2feabd6a46a5669afc2fe21519de2c8c9908a979df9524521db67b018afe06fa202f666ef2bd342
-  data.tar.gz: fbf8b392a18397da8c9db81b5e7af6665c314910fa8b306ccf5da3be9081fdc365a84b2b34dc0825a2d616f912451c532615bc4139f514a67d9ac2e0a78de02c
+  metadata.gz: a45da0b368ade1e40e679041958dc041a75bff04b4ac6432457952d943ce0979bed946a347ebfeb58a0f062b38e1868158ced1a09635b3c90f19fb528d22aff8
+  data.tar.gz: 509bd3b10056e731e9ee5c09d0d3903b2a57c7de9df696fdb06caa393d7b22cc6022b4dcf426d4f92b04535a63819f0920f8c9ed47ce39156d83aadb7fb8ec3a

data/lib/puck.rb

@@ -6,4 +6,5 @@ module Puck
 end
 
 require 'puck/configuration'
+require 'puck/dependency_resolver'
 require 'puck/jar'

data/lib/puck/bootstrap.rb

@@ -3,6 +3,7 @@ if ARGV.any?
   PUCK_BIN_PATH.each do |dir|
     path = __FILE__.sub('jar-bootstrap.rb', File.join(dir, file_name))
     if File.exists?(path)
+      $0 = path
       load(path)
       return
     end

data/lib/puck/dependency_resolver.rb

@@ -0,0 +1,75 @@
+
+require 'bundler'
+
+module Puck
+  class DependencyResolver
+    def resolve_gem_dependencies(options = {})
+      gem_home = options[:gem_home] || ENV['GEM_HOME']
+      gemfile = options[:gemfile] || File.expand_path('Gemfile', options[:app_dir] || Dir.pwd)
+      lockfile = options[:lockfile] || "#{gemfile}.lock"
+      groups = options[:gem_groups] || [:default]
+
+      bundler_specs = contained_bundler(gem_home, gemfile, lockfile, groups)
+      bundler_specs.delete_if { |spec| spec[:name] == 'bundler' }
+      bundler_specs.map do |spec|
+        base_path = spec[:full_gem_path].chomp('/')
+        load_paths = spec[:load_paths].map do |load_path|
+          unless load_path.start_with?(base_path)
+            raise PuckError, 'Unsupported load path "%s" in gem "%s"' % [load_path, bundler_spec.name]
+          end
+          load_path[base_path.size + 1, load_path.length - base_path.size - 1]
+        end
+        {
+          :name => spec[:name],
+          :versioned_name => spec[:full_name],
+          :base_path => base_path,
+          :load_paths => load_paths,
+          :bin_path => spec[:bindir],
+        }
+      end
+    end
+
+    private
+
+    def contained_bundler(gem_home, gemfile, lockfile, groups)
+      Bundler.with_clean_env do
+        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.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
+          unit = scripting_container.parse(StringIO.new(<<-"EOS").to_inputstream, __FILE__, line)
+            require 'stringio'
+            begin
+              require 'bundler'
+              gemfile, lockfile, groups = Marshal.load(String.from_java_bytes(arguments))
+              definition = Bundler::Definition.build(gemfile, lockfile, false)
+              ENV['BUNDLE_WITHOUT'] = (definition.groups - groups).join(':')
+              specs = definition.specs.map do |gem_spec|
+                {
+                  :name => gem_spec.name,
+                  :full_name => gem_spec.full_name,
+                  :full_gem_path => gem_spec.full_gem_path,
+                  :load_paths => gem_spec.load_paths,
+                  :bindir => gem_spec.bindir,
+                }
+              end
+              Marshal.dump([specs]).to_java_bytes
+            rescue => e
+              Marshal.dump([nil, e.class, e.message, e.backtrace]).to_java_bytes
+            end
+          EOS
+          result, error, message, backtrace = Marshal.load(String.from_java_bytes(unit.run))
+          if error
+            raise error, message, Array(backtrace)+caller
+          end
+          result
+        ensure
+          scripting_container.terminate
+        end
+      end
+    end
+  end
+end

data/lib/puck/jar.rb

@@ -5,7 +5,6 @@ require 'tmpdir'
 require 'pathname'
 require 'set'
 require 'ant'
-require 'bundler'
 require 'puck/version'
 
 begin
@@ -74,6 +73,7 @@ module Puck
       @configuration[:build_dir] ||= File.join(@configuration[:app_dir], 'build')
       @configuration[:jar_name] ||= @configuration[:app_name] + '.jar'
       @configuration[:gem_groups] ||= [:default]
+      @dependency_resolver = @configuration[:dependency_resolver] || DependencyResolver.new
     end
 
     # Create the Jar file using the instance's configuration.
@@ -83,7 +83,7 @@ module Puck
 
       Dir.mktmpdir do |tmp_dir|
         output_path = File.join(@configuration[:build_dir], @configuration[:jar_name])
-        project_dir = Pathname.new(@configuration[:app_dir])
+        project_dir = Pathname.new(@configuration[:app_dir]).expand_path.cleanpath
         extra_files = @configuration[:extra_files] || []
         jruby_complete_path = @configuration[:jruby_complete]
 
@@ -91,7 +91,7 @@ module Puck
           raise PuckError, 'Cannot build Jar: jruby-jars must be installed, or :jruby_complete must be specified'
         end
 
-        gem_dependencies = resolve_gem_dependencies
+        gem_dependencies = @dependency_resolver.resolve_gem_dependencies(@configuration)
         create_jar_bootstrap!(tmp_dir, gem_dependencies)
 
         ant = Ant.new(output_level: 1)
@@ -121,7 +121,10 @@ module Puck
           end
 
           gem_dependencies.each do |spec|
-            zipfileset dir: spec[:base_path], prefix: spec[:jar_path]
+            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
       end
@@ -133,60 +136,16 @@ module Puck
     JAR_GEM_HOME = 'META-INF/gem.home'.freeze
     JAR_JRUBY_HOME = 'META-INF/jruby.home'.freeze
 
-    def resolve_gem_dependencies
-      gem_specs = Bundler::LockfileParser.new(File.read('Gemfile.lock')).specs.group_by(&:name)
-      definition = Bundler::Definition.build('Gemfile', 'Gemfile.lock', false)
-      dependencies = definition.dependencies.select { |d| (d.groups & @configuration[:gem_groups]).any? }.map(&:name)
-      specs = resolve_gem_specs(gem_specs, dependencies)
-      specs = specs.map do |bundler_spec|
-        case bundler_spec.source
-        when Bundler::Source::Git
-          gemspec_path = File.join(ENV['GEM_HOME'], 'bundler', 'gems', "#{bundler_spec.source.extension_dir_name}", "#{bundler_spec.name}.gemspec")
-          base_path = File.dirname(gemspec_path)
-        else
-          gemspec_path = File.join(ENV['GEM_HOME'], 'specifications', "#{bundler_spec.full_name}.gemspec")
-          base_path = File.join(ENV['GEM_HOME'], 'gems', bundler_spec.full_name)
-        end
-        if File.exists?(gemspec_path)
-          gem_spec = Gem::Specification.load(gemspec_path)
-          load_paths = gem_spec.load_paths.map do |load_path|
-            index = load_path.index(gem_spec.full_name)
-            File.join(JAR_GEM_HOME, load_path[index, load_path.length - index])
-          end
-          bin_path = File.join(JAR_GEM_HOME, gem_spec.full_name, gem_spec.bindir)
-          {
-            :name => gem_spec.name,
-            :versioned_name => gem_spec.full_name,
-            :base_path => base_path,
-            :jar_path => File.join(JAR_GEM_HOME, gem_spec.full_name),
-            :load_paths => load_paths,
-            :bin_path => bin_path,
-          }
-        else
-          raise GemNotFoundError, "Could not package #{bundler_spec.name} because no gemspec could be found at #{gemspec_path}."
-        end
-      end
-      specs.uniq { |s| s[:versioned_name] }
-    end
-
-    def resolve_gem_specs(gem_specs, gem_names)
-      gem_names.flat_map do |name|
-        gem_specs[name].flat_map do |spec|
-          [spec, *resolve_gem_specs(gem_specs, spec.dependencies.map(&:name))]
-        end
-      end
-    end
-
     def create_jar_bootstrap!(tmp_dir, gem_dependencies)
       File.open(File.join(tmp_dir, 'jar-bootstrap.rb'), 'w') do |io|
         io.puts(%(PUCK_BIN_PATH = ['/#{JAR_APP_HOME}/bin', '/#{JAR_JRUBY_HOME}/bin']))
         gem_dependencies.each do |spec|
-          io.puts("PUCK_BIN_PATH << '/#{spec[:bin_path]}'")
+          io.puts("PUCK_BIN_PATH << '/#{JAR_GEM_HOME}/#{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 << 'classpath:#{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.0.0.pre3'.freeze
+  VERSION = '1.0.0.pre4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puck
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre3
+  version: 1.0.0.pre4
 platform: ruby
 authors:
 - Theo Hultberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-27 00:00:00.000000000 Z
+date: 2015-01-28 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:
@@ -22,6 +22,7 @@ files:
 - lib/puck.rb
 - lib/puck/bootstrap.rb
 - lib/puck/configuration.rb
+- lib/puck/dependency_resolver.rb
 - lib/puck/jar.rb
 - lib/puck/version.rb
 homepage: http://github.com/iconara/puck