jbundler 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f4ee68ce151f31442231dd2d93cf9f9d14d396f
-  data.tar.gz: 3e3db7d5cd818ab00b3799f703e4e8ec7d63f52c
+  metadata.gz: b80e3d23bf241019a06ab19e7420b8d5f19f60d0
+  data.tar.gz: 1201ee4b2f4848826b5597d7bfef605448ad8021
 SHA512:
-  metadata.gz: 578a38f91c36e41b1b18a92d388040c054f640397cec75074e68c05fa0e1a03ea9ac7f60b49b0d1b7d4574186d7602167a2fa0ed5a6a8dabddf3c2c004b899bc
-  data.tar.gz: f987bf0a11a547083d8841ccdf9ade3e9e759c5804d139921e6cf6e36107d01d592d619cc7b9bd23d08304a068c1473446eb1272cf6368836b6f5afbeb4b11c7
+  metadata.gz: db40392138c0bf75b2551a85c2e108c2510d2465d7f4fefa7a4cae80e8bdfcf4d3fd81019ded4fd5301d0530f984daf5ff251502805b2ba3e856ff3e0a621671
+  data.tar.gz: 313931856c7b2f97433df2bebaa89738661f934c1224073b40b84f203688c76a1ff23ade0072e9ed04619d977549e1ab5f60353f703e6b2d149568e22a3d518f

data/bin/jbundle

@@ -1,10 +1,9 @@
 #!/usr/bin/env ruby
-require 'rubygems'
-# ensure we use the right version
-gem 'ruby-maven', '>=3.1.0'
-
 if ARGV[0] == 'help'
 
+  # ensure we use the right version
+  gem 'ruby-maven', '>=3.1.0'
+
   require 'jbundler/cli'
 
   JBundler::Cli.start
@@ -16,51 +15,44 @@ else
   end
 
   if ARGV[0] == 'console'
+    # ensure we use the right version
+    gem 'ruby-maven', '>=3.1.0'
+
     require 'irb'
     require 'jbundler'
     require 'jbundler/lazy'
     include JBundler::Lazy
-  end
 
-  require 'jbundler/config'
-  config = JBundler::Config.new
+    ARGV.shift
+    require 'jbundler'
+    if defined? JBUNDLER_CLASSPATH
+      warn 'Jarfile dependencies loaded'
+    else
+      warn 'Could not locate a Jarfile'
+    end
+
+    IRB.start
+
+  else
+    if ['lock_down', 'install', 'update', 'show'].member?( ARGV[0] )
 
-  if ['lock_down', 'install', 'update', 'show', 'console'].member?( ARGV[0] )
-    begin
       is_lock_down = ARGV.delete( 'lock_down' )
-      ARGV.delete( 0 ) if is_lock_down
       is_vendor = ARGV.delete( '--vendor' ) 
-      is_debug = ARGV.delete( '--debug' )  
-      is_verbose = ARGV.delete( '--verbose' ) 
+      is_debug = ARGV.delete( '--debug' )
       ARGV.delete( '--skip-vendor' )
       ARGV.delete( '--skip-debug' )
       ARGV.delete( '--skip-verbose' )
-
+      
       load Gem.bin_path('bundler', 'bundle') 
-
+      
       ARGV.insert( 0, 'lock_down' ) if is_lock_down
       ARGV.insert( 1, '--debug' ) if is_debug
       ARGV.insert( 1, '--vendor' ) if is_vendor
-      ARGV.insert( 1, '--verbose' ) if is_verbose
-
-      require 'jbundler/cli'
-      JBundler::Cli.start
-    rescue Exception => e
-      if ARGV[0] == 'console'
-        ARGV.shift
-        require 'jbundler'
-        if defined? JBUNDLER_CLASSPATH
-          warn 'Jarfile dependencies loaded'
-        else
-          warn 'Could not locate Jarfile'
-          
-        end
-        IRB.start
-      else
-        raise e
-      end
     end
-  else
+
+    # ensure we use the right version
+    gem 'ruby-maven', '>=3.1.0'
+    
     require 'jbundler/cli'
     JBundler::Cli.start
   end

data/lib/jbundler/dependency_pom.rb

@@ -9,10 +9,12 @@ if basedir != bdir
   self.instance_variable_set( :@basedir, bdir )
 end
 
-gemfile( gfile ) if File.exists? gfile
-
 jarfile( jfile, :skip_locked => true )
 
+( 0..(java.lang.System.getProperty( "jbundler.jars.size" ).to_i - 1) ).each do |i|
+  dependency_artifact Maven::Tools::Artifact.from_coordinate( java.lang.System.getProperty( "jbundler.jars.#{i}" ).to_s )
+end
+
 build do
   directory = jworkdir
 end

data/lib/jbundler/lock_down.rb

@@ -3,6 +3,7 @@ require 'jbundler/classpath_file'
 require 'jbundler/vendor'
 require 'jbundler/gemfile_lock'
 require 'jbundler/show'
+require 'maven/tools/gemspec_dependencies'
 require 'maven/tools/jarfile'
 require 'maven/ruby/maven'
 require 'fileutils'
@@ -123,16 +124,42 @@ module JBundler
       m = Maven::Ruby::Maven.new
       m.options[ '-f' ] = File.join( File.dirname( __FILE__ ), 
                                      'dependency_pom.rb' )
-          m.property( 'verbose', debug || verbose )
-          m.options[ '-q' ] = nil if !debug and !verbose
-          m.options[ '-e' ] = nil if !debug and verbose
-          m.options[ '-X' ] = nil if debug
+      m.property( 'verbose', debug || verbose )
+      m.options[ '-q' ] = nil if !debug and !verbose
+      m.options[ '-e' ] = nil if !debug and verbose
+      m.options[ '-X' ] = nil if debug
       m.verbose = debug
       m.property( 'jbundler.outputFile', output )
 
       @configurator.configure( m )
 
+      attach_jar_coordinates( m )
+
       m.exec( 'dependency:list' )
     end
+
+    private
+
+    def attach_jar_coordinates( maven )
+      load_path = $LOAD_PATH.dup
+      require 'bundler/setup'
+      done = []
+      index = 0
+      Gem.loaded_specs.each do |name, spec|
+        deps = Maven::Tools::GemspecDependencies.new( spec )
+        deps.java_dependency_artifacts.each do |a|
+          unless done.include? a.key
+            maven.property( "jbundler.jars.#{index}", a.to_s )
+            index += 1
+            done << a.key
+          end
+        end
+      end
+      if index > 0
+        maven.property( "jbundler.jars.size", index )
+      end
+    ensure
+      $LOAD_PATH.replace( load_path )
+    end
   end
 end

data/lib/jbundler.rb

@@ -37,7 +37,10 @@ module JBundler
                                          context.gemfile_lock ) and
         not context.vendor.vendored? )
       
-      warn 'deprecated - use jbundle install to update bundle'
+      warn ''
+      warn 'jar bundle is outdated - use jbundle install to update bundle'
+      warn ''
+
       aether = JBundler::AetherRuby.new( context.config )
       
       context.jarfile.populate_unlocked( aether )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbundler
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-maven
@@ -50,12 +50,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.6
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency