jbundler 0.5.4 → 0.5.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 84995673fbb7c47e7f3ad1b2b8c6973dc97feb43
+  data.tar.gz: 002ded9ef8e351737ac6e0202beec5fab700f643
+SHA512:
+  metadata.gz: 63904f8bb1cc95824bbe7d57deeedc7edb510ec17dd0a2aea2cdf7877945565a41733d446f5557ecdff71e518b9894bac1d19f650cdd070c2d4e23079c7b33ee
+  data.tar.gz: e3e4d92cd282bace89e3ea1f29a6d9d63809b087cd1b91532c855c57d990ad2ba93328423e02c00915370750c21856557882c4cb2377eda7b1bff9464e369da9

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    jbundler (0.5.4)
-      bundler (~> 1.2)
+    jbundler (0.5.5)
+      bundler (~> 1.5)
       ruby-maven (>= 3.1.1.0.1, < 3.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    backports (3.3.5)
+    backports (3.4.0)
     copyright-header (1.0.8)
     descendants_tracker (0.0.3)
     maven-tools (0.34.2)
       virtus (~> 0.5)
     minitest (4.7.5)
     rake (10.1.0)
-    ruby-maven (3.1.1.0.1)
+    ruby-maven (3.1.1.0.2)
       maven-tools (~> 0.33)
       ruby-maven-libs (= 3.1.1)
     ruby-maven-libs (3.1.1)
-    thor (0.15.4)
+    thor (0.18.1)
     virtus (0.5.5)
       backports (~> 3.3)
       descendants_tracker (~> 0.0.1)
@@ -33,4 +33,4 @@ DEPENDENCIES
   jbundler!
   minitest (~> 4.0)
   rake (~> 10.0)
-  thor (> 0.14.0, < 0.16.0)
+  thor (~> 0.18.0)

data/Readme.md

@@ -129,15 +129,17 @@ jbundler does not completely obey the **$HOME/.m2/settings.xml** from maven wher
 
 some tests did not work with RVM and/or rubygems-bundler - there are some weird classloader issue popping up. there is a problem with the way the classloader gets setup. but a manual jruby installion or using rbenv is just working fine.
 
-those issue might pop up with ```jbunle tree``` and ```jbundle executable```
+those issue might pop up with ```jbundle tree``` and ```jbundle executable```
 
 ## running tests ##
 
-* ```rake``` will just execute all tests (skips some with rvm)
+* ```rake``` will execute all tests without integration tests
+* ```rake all``` will execute all tests
 * ```rake minitest``` runs the minitest specs
+* ```rake integration``` runs the integration tests where poms are used (might fail due to hardcoded absolute paths)
 * ```rake junit``` runs the junit java tests
 * ```jruby spec/abc_spec.rb``` runs that given tests (just use the right file)
-* ```mvn test``` will also run all tests (skips some)
+* ```mvn test``` will also run all tests
 * ```rmvn test`` same as ```mvn test```
 
 ## update ##

data/lib/jbundler.rb

@@ -24,6 +24,16 @@ require 'jbundler/vendor'
 require 'jbundler/gemfile_lock'
 require 'jbundler/aether'
 
+module JBundler
+
+  def setup_test
+    config = JBundler::Config.new
+    JBundler::ClasspathFile.new(config.classpath_file).require_test_classpath
+    config
+  end
+
+end
+
 config = JBundler::Config.new
 
 jarfile = Maven::Tools::Jarfile.new(config.jarfile)

data/lib/jbundler/classpath_file.rb

@@ -28,6 +28,12 @@ module JBundler
 
     def require_classpath
       load File.expand_path @classpathfile
+      JBUNDLER_CLASSPATH.each { |c| require c }
+    end
+
+    def require_test_classpath
+      load File.expand_path @classpathfile unless defined? JBUNLDER_TEST_CLASSPATH
+      JBUNDLER_TEST_CLASSPATH.each { |c| require c }
     end
 
     def mtime
@@ -42,18 +48,24 @@ module JBundler
       (jarfile.exists? || gemfile_lock.exists? || jarfile.exists_lock?) && (!exists? || !jarfile.exists_lock? || (jarfile.exists? && (jarfile.mtime > mtime)) || (jarfile.exists_lock? && (jarfile.mtime_lock > mtime)) || (gemfile_lock.exists? && (gemfile_lock.mtime > mtime)))
     end
 
-    def generate(classpath_array)
+    def generate( classpath_array, test_array = [], jruby_array = [] )
       FileUtils.mkdir_p(File.dirname(@classpathfile))
       File.open(@classpathfile, 'w') do |f|
-        f.puts "JBUNDLER_CLASSPATH = []"
-        classpath_array.each do |path|
-          f.puts "JBUNDLER_CLASSPATH << '#{path}'" unless path =~ /pom$/
-        end
-        f.puts "JBUNDLER_CLASSPATH.freeze"
+        dump_array( f, jruby_array || [], 'JRUBY_' )
+        dump_array( f, test_array || [], 'TEST_' )
+        dump_array( f, classpath_array || [], '' )
         f.puts "JBUNDLER_CLASSPATH.each { |c| require c }"
         f.close
       end
     end
     
+    private
+    def dump_array( file, array, prefix )
+      file.puts "JBUNDLER_#{prefix}CLASSPATH = []"
+      array.each do |path|
+        file.puts "JBUNDLER_#{prefix}CLASSPATH << '#{path}'" unless path =~ /pom$/
+      end
+      file.puts "JBUNDLER_#{prefix}CLASSPATH.freeze"
+    end
   end
 end

data/lib/jbundler/cli.rb

@@ -22,6 +22,7 @@ require 'thor'
 require 'jbundler/config'
 require 'jbundler/executable'
 require 'jbundler/tree'
+require 'jbundler/lock_down'
 module JBundler
   class Cli < Thor
     no_tasks do
@@ -58,6 +59,14 @@ module JBundler
       JBundler::Tree.new( config ).show_it
     end
 
+    desc 'lock_down', 'using a different library to create the Jarfile.lock - experimental'
+    method_option :vendor, :type => :boolean, :default => false, :desc => 'vendor jars in given vendor directory.'
+    method_option :debug, :type => :boolean, :default => false, :desc => 'enable maven output'
+    def lock_down
+      JBundler::LockDown.new( config ).lock_down( options[ :vendor ],
+                                                  options[ :debug ] )
+    end
+
     desc 'executable', 'create an executable jar with a given bootstrap.rb file\nLIMITATION: only for jruby 1.6.x and newer'
     method_option :bootstrap, :type => :string, :aliases => '-b', :required => true, :desc => 'file which will be executed when the jar gets executed'
     method_option :compile, :type => :boolean, :aliases => '-c', :default => false, :desc => 'compile the ruby files from the lib directory'
@@ -76,6 +85,17 @@ module JBundler
     desc 'install', "first `bundle install` is called and then the jar dependencies will be installed. for more details see `bundle help install`, jbundler will ignore all options. the install command is also the default when no command is given."
     method_option :deployment, :type => :boolean, :default => false, :desc => "copy the jars into the vendor/jars directory (or as configured). these vendored jars have preference before the classpath jars !"
     method_option :no_deployment, :type => :boolean, :default => false, :desc => 'clears the vendored jars'
+    method_option :path, :type => :string
+    method_option :without, :type => :array
+    method_option :system, :type => :boolean
+    method_option :local, :type => :boolean
+    method_option :binstubs, :type => :string
+    method_option :trust_policy, :type => :string
+    method_option :gemfile, :type => :string
+    method_option :jobs, :type => :string
+    method_option :retry, :type => :string
+    method_option :no_cache, :type => :boolean
+    method_option :quiet, :type => :boolean
     def install
       require 'jbundler'
       if options[ :no_deployment ]

data/lib/jbundler/config.rb

@@ -102,24 +102,32 @@ module JBundler
 
     def proxy
       @proxy ||= jbundler_env('JBUNDLE_PROXY')
+      if @proxy
+        warn 'proxy config is deprecated, use settings.xml instead'
+      end
+      @proxy
     end
 
     def mirror
       @mirror ||= jbundler_env('JBUNDLE_MIRROR')
       # nice to have no leading slash
       @mirror = @mirror.sub( /\/$/, '' ) if @mirror
+      if @mirror
+        warn 'mirror config is deprecated, use settings.xml instead'
+      end
       @mirror
     end
 
     def rubygems_mirror
       @rubygems_mirror ||= jbundler_env('BUNDLE_RUBYGEMS_MIRROR')
       # here a leading slash is needed !!
-     @rubygems_mirror =  @rubygems_mirror.sub( /([^\/])$/ , "\\1/" ) if @rubygems_mirror
+      @rubygems_mirror =  @rubygems_mirror.sub( /([^\/])$/ , "\\1/" ) if @rubygems_mirror
+      warn 'reubygems mirror config is deprecated, use bundler >=1.5 and its mirror config'
       @rubygems_mirror
     end
 
     def work_dir
-      @work_dir ||= jbundler_env('JBUNDLE_WORK_DIR') || 'target'
+      @work_dir ||= jbundler_env('JBUNDLE_WORK_DIR') || 'pkg'
     end
 
     def vendor_dir

data/lib/jbundler/executable.rb

@@ -31,11 +31,10 @@ module JBundler
       m.verbose = @config.verbose
       m.package( '-P', @config.compile ? :compile : :no_compile )
 
-      #FileUtils.rm_f( 'dependency-reduced-pom.xml' )
       puts
       puts 'now you can execute your jar like this'
       puts
-      puts "\tjava -jar #{@config.work_dir}/executable/*.jar"
+      puts "\tjava -jar #{File.basename( File.expand_path( '.' ) )}_exec.jar"
       puts
     end
   end

data/lib/jbundler/executable_pom.rb

@@ -26,7 +26,7 @@ end
 jfile.locked.each do |dep|
   artifact( dep )
 end
-build.final_name = model.artifact_id
+
 build.directory = jworkdir
 resource do 
   directory jworkdir
@@ -49,6 +49,7 @@ Gem.loaded_specs.values.each do |s|
 end
 
 properties( 'maven.test.skip' => true,
+            'tesla.dump.pom' => 'pom.xml',
             'project.build.sourceEncoding' => 'utf-8' )
 
 jfile.populate_unlocked do |dsl|
@@ -104,6 +105,7 @@ profile :no_compile do
 end
 
 plugin( :shade, '2.1',
+        :outputFile => "${user.dir}/#{File.basename( File.expand_path( '.' ) )}_exec.jar",
         :transformers => [ { '@implementation' => 'org.apache.maven.plugins.shade.resource.ManifestResourceTransformer',
                              :mainClass => 'org.jruby.JarBootstrapMain' } ] ) do
   execute_goals( 'shade', :phase => 'package' )

data/lib/jbundler/lock_down.rb

@@ -0,0 +1,105 @@
+require 'jbundler/configurator'
+require 'jbundler/classpath_file'
+require 'jbundler/vendor'
+require 'jbundler/gemfile_lock'
+require 'jbundler/show'
+require 'maven/tools/jarfile'
+require 'maven/ruby/maven'
+require 'fileutils'
+module JBundler
+  class LockDown
+
+    def initialize( config )
+      @config = config
+      @configurator = Configurator.new( config )
+    end
+
+    def lock_down( needs_vendor = false, debug = false )
+      jarfile = Maven::Tools::Jarfile.new( @config.jarfile )
+      vendor = JBundler::Vendor.new( @config.vendor_dir )
+      classpath_file = JBundler::ClasspathFile.new( @config.classpath_file )
+      gemfile_lock = JBundler::GemfileLock.new( jarfile, 
+                                                @config.gemfile_lock )
+
+      needs_update = classpath_file.needs_update?( jarfile, gemfile_lock )
+      if( ( ! needs_update ||
+            vendor.vendored? ) && ! vendor )
+
+        puts 'up to date'
+
+      else
+
+        puts '...'
+
+        exec_maven( debug )
+
+        deps_file = File.join( File.expand_path( @config.work_dir ), 
+                               'dependencies.txt' )
+        deps = StringIO.new
+        jars = {}
+        vendor_map = {}
+        File.read( deps_file ).each_line do |line| 
+          if line.match /:jar:/
+            jar = line.sub( /.+:/, '' ).sub( /\s$/, '' )
+            unless line.match /:provided/
+              vendor_map[ line.sub( /:[^:]+:[^:]+$/, '' )
+                            .sub( /^\s+/, '' ) ] = jar
+            end
+            case line
+            when /:provided:/
+              ( jars[ :jruby ] ||= [] ) << jar
+            when /:test:/
+              ( jars[ :test ] ||= [] ) << jar
+            else
+              ( jars[ :runtime ] ||= [] ) << jar
+            end
+          end
+          # TODO make lock depend on jruby version as well on
+          # include test as well, i.e. keep the scope in place
+          if( line.match( /:compile:|:runtime:/ ) &&
+              ! line.match( /^ruby.bundler:/ ) )
+            deps.puts line.sub( /:[^:]+:[^:]+$/, '' ).sub( /^\s+/, '' )
+          end
+        end
+        if needs_update
+          if deps.string.empty?
+            FileUtils.rm_f @config.jarfile_lock
+          else
+            File.open( @config.jarfile_lock, 'w' ) do |f|
+              f.print deps.string
+            end
+          end
+          classpath_file.generate( jars[ :runtime ],
+                                   jars[ :test ],
+                                   jars[ :jruby ] )
+        end
+        if needs_vendor
+          puts "vendor directory: #{@config.vendor_dir}"
+          vendor_map.each do |key, file|
+            vendor.copy_jar( key, file )
+          end
+          puts
+        end
+        if @config.verbose
+          Show.new( @config ).show_classpath
+          puts
+        end
+        puts 'jbundle complete'
+      end
+    end
+
+    private
+    
+    def exec_maven( debug )
+      m = Maven::Ruby::Maven.new
+      m.options[ '-f' ] = File.join( File.dirname( __FILE__ ), 
+                                     'lock_down_pom.rb' )
+      m.options[ '-q' ] = nil unless debug
+      m.verbose = debug
+      
+      @configurator.configure( m )
+      
+      m.exec
+    end
+  end
+end

data/lib/jbundler/lock_down_pom.rb

@@ -0,0 +1,23 @@
+jfile = java.lang.System.getProperty( "jbundler.jarfile" )
+gfile = java.lang.System.getProperty( "jbundler.gemfile" )
+jworkdir = java.lang.System.getProperty( "jbundler.workdir" )
+
+basedir( File.dirname( jfile ) )
+
+gemfile( gfile ) if File.exists? gfile
+
+jarfile( jfile )
+
+build do
+  directory = jworkdir
+  default_goal 'dependency:list'
+end
+        
+plugin( :dependency, '2.8',
+        :includeTypes => 'jar',
+        :outputAbsoluteArtifactFilename => true,
+        :outputFile => "#{jworkdir}/dependencies.txt" )
+
+properties( 'project.build.sourceEncoding' => 'utf-8',
+            'tesla.dump.readOnly' => true,
+            'tesla.dump.pom' => 'lockdown.pom.xml'  )

data/lib/jbundler/show.rb

@@ -0,0 +1,43 @@
+require 'jbundler/configurator'
+require 'jbundler/classpath_file'
+require 'jbundler/vendor'
+require 'jbundler/gemfile_lock'
+require 'maven/tools/jarfile'
+require 'maven/ruby/maven'
+require 'fileutils'
+module JBundler
+  class Show
+
+    def initialize( config )
+      @config = config
+      @classpath_file = JBundler::ClasspathFile.new( @config.classpath_file )
+    end
+
+    def do_it( debug = false )
+      jarfile = Maven::Tools::Jarfile.new( @config.jarfile )
+      vendor = JBundler::Vendor.new( @config.vendor_dir )
+      gemfile_lock = JBundler::GemfileLock.new( jarfile, 
+                                                @config.gemfile_lock )
+    end
+
+    def show_classpath
+      @classpath_file.require_classpath
+      warn "jruby core classpath:"
+      JBUNDLER_JRUBY_CLASSPATH.each do |path|
+        warn "\t#{path}"
+      end
+      warn "jbundler runtime classpath:"
+      JBUNDLER_CLASSPATH.each do |path|
+        warn "\t#{path}"
+      end
+      warn "jbundler test classpath:"
+      if JBUNDLER_TEST_CLASSPATH.empty?
+        warn "\t--- empty ---"
+      else
+        JBUNDLER_TEST_CLASSPATH.each do |path|
+          warn "\t#{path}"
+        end
+      end
+    end
+  end
+end

data/lib/jbundler/tree.rb

@@ -1,14 +1,9 @@
 require 'jbundler/configurator'
-require 'maven/tools/jarfile'
-require 'maven/tools/dsl'
-require 'maven/tools/model'
 require 'maven/ruby/maven'
 require 'fileutils'
 module JBundler
   class Tree
 
-    include Maven::Tools::DSL
-
     def initialize( config )
       @config = Configurator.new( config )
     end
@@ -16,21 +11,17 @@ module JBundler
     def show_it( debug = false )
       m = Maven::Ruby::Maven.new
       m.options[ '-f' ] = File.join( File.dirname( __FILE__ ), 'tree_pom.rb' )
+      m.options[ '-q' ] = nil unless debug
+      m.verbose = debug
+
       @config.configure( m )
 
-      unless debug
-        # silence the output
-        old = java.lang.System.err
-        java.lang.System.err = java.io.PrintStream.new( java.io.ByteArrayOutputStream.new )
-      end
+      puts '...'
 
       m.exec( 'org.apache.maven.plugins:maven-dependency-plugin:2.8:tree' )
 
       puts File.read( File.join( File.expand_path( @config.work_dir ), 
                                  'tree.txt' ) )
-      
-    ensure
-      java.lang.System.err = old if old
     end
   end
 end

data/lib/jbundler/tree_pom.rb

@@ -16,4 +16,4 @@ end
 properties( 'project.build.sourceEncoding' => 'utf-8',
             'tesla.dump.readOnly' => true,
             'tesla.dump.pom' => 'tree.pom.xml',
-            'outputFile' => '${project.build.directory}/tree.txt' )
+            'outputFile' => "#{jworkdir}/tree.txt" )

data/lib/jbundler/vendor.rb

@@ -10,7 +10,7 @@ module JBundler
     end
 
     def require_jars
-      Dir[ File.join( @dir, '*' ) ].each do |f|
+      Dir[ File.join( @dir, '**', '*' ) ].each do |f|
         require f
       end
     end
@@ -18,7 +18,7 @@ module JBundler
     def clear
       FileUtils.mkdir_p( @dir )
       Dir[ File.join( @dir, '*' ) ].each do |f|
-        FileUtils.rm_f( f )
+        FileUtils.rm_rf( f )
       end
     end
 
@@ -31,6 +31,13 @@ module JBundler
       end
     end
 
+    def copy_jar( coord, file )
+      target = File.join( *coord.sub( /:jar:/, '-') .split( /:/ ) )
+      target_file = File.join( @dir, target ) + '.jar'
+      FileUtils.mkdir_p( File.dirname( target_file ) )
+      FileUtils.cp( file, target_file )
+      puts "\t#{coord} to #{target}"
+    end
   end
 end
 

data/spec/classpath_file_spec.rb

@@ -77,6 +77,10 @@ describe JBundler::ClasspathFile do
   it 'generates a classpath ruby file' do
     subject.generate("a:b:c:d:f:".split(File::PATH_SEPARATOR))
     File.read(cpfile).must_equal <<-EOF
+JBUNDLER_JRUBY_CLASSPATH = []
+JBUNDLER_JRUBY_CLASSPATH.freeze
+JBUNDLER_TEST_CLASSPATH = []
+JBUNDLER_TEST_CLASSPATH.freeze
 JBUNDLER_CLASSPATH = []
 JBUNDLER_CLASSPATH << 'a'
 JBUNDLER_CLASSPATH << 'b'

data/spec/config_spec.rb

@@ -27,7 +27,7 @@ describe JBundler::Config do
       c.skip.must_equal nil
       c.settings.must_equal nil 
       c.offline.must_equal false
-      c.work_dir.must_equal 'target'
+      c.work_dir.must_equal 'pkg'
       c.vendor_dir.must_equal 'vendor/jars'
     end
   end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jbundler
 version: !ruby/object:Gem::Version
-  version: 0.5.4
-  prerelease:
+  version: 0.5.5
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-maven
@@ -21,7 +20,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.1.2
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -30,7 +28,6 @@ dependencies:
     - - <
       - !ruby/object:Gem::Version
         version: 3.1.2
-    none: false
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -39,14 +36,12 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-    none: false
+        version: '1.5'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
-    none: false
+        version: '1.5'
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
@@ -56,35 +51,25 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
-    none: false
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
   name: thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - '>'
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
-    none: false
+        version: 0.18.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: 0.16.0
-    - - '>'
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.14.0
-    none: false
+        version: 0.18.0
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -94,13 +79,11 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-    none: false
   prerelease: false
   type: :development
 description: |
@@ -118,8 +101,10 @@ files:
 - lib/jbundler/classpath_file.rb
 - lib/jbundler/tree_pom.rb
 - lib/jbundler/tree.rb
+- lib/jbundler/lock_down_pom.rb
 - lib/jbundler/gemfile_lock.rb
 - lib/jbundler/executable_pom.rb
+- lib/jbundler/lock_down.rb
 - lib/jbundler/configurator.rb
 - lib/jbundler/cli.rb
 - lib/jbundler/config.rb
@@ -127,6 +112,7 @@ files:
 - lib/jbundler/lazy.rb
 - lib/jbundler/executable.rb
 - lib/jbundler/vendor.rb
+- lib/jbundler/show.rb
 - lib/jbundler.jar
 - spec/config_spec.rb
 - spec/vendor_spec.rb
@@ -142,6 +128,7 @@ files:
 homepage: https://github.com/mkristian/jbundler
 licenses:
 - MIT
+metadata: {}
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -151,18 +138,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-  none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: managing jar dependencies
 test_files:
 - spec/config_spec.rb