jbundler 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c9e585f4468a32aa458da2a1a78b497aa84af54
-  data.tar.gz: 39edf54af322a15bc17822eb8df7bf84cdca9f8a
+  metadata.gz: 1032ec7fb4658f5ebea74a639002fb3c9f205932
+  data.tar.gz: 9a23448861d6470af9f18c9edfbe2f7083c89303
 SHA512:
-  metadata.gz: 506c7136901ba6d97a11309b09aaa2a4e65f2708197d8f07188a2a3d7611251609a830bcba242e185ac70a12249254a80dd41484f4ca4b6f788bb57a1eb4358a
-  data.tar.gz: 6ac1b2f582b3222f13ff00431b4a70ddb21165737f42bfeae1ca05c96a82afc16259f5c0200415befd1e11e10f6e754d3bd7853e14dd6ac12d902fad03b14ad0
+  metadata.gz: 776cd6d1e16fcf25d01dd988dab5257c3a64e2cc364471252e1b6c431cfd85c622dee76eda85fc79c503c911b5c98a1d31c909c482d04b0bea13b8ef07df55f4
+  data.tar.gz: 2f744824474566cbfe8fb2f8af3f9aed330eef732d9ffe0af416dbbae6766cea2e5ad41e4f5565b11b7db656c81c01133ad40fce76bbce1ba6cddb424b45828e

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    jbundler (0.8.0)
+    jbundler (0.9.0)
       bundler (~> 1.5)
-      jar-dependencies (~> 0.1.15)
+      jar-dependencies (~> 0.2)
       maven-tools (~> 1.0.10)
       ruby-maven (~> 3.3, >= 3.3.3)
 
@@ -20,10 +20,10 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.11)
     ice_nine (0.11.1)
-    jar-dependencies (0.1.15)
-    maven-tools (1.0.10)
+    jar-dependencies (0.2.1)
+    maven-tools (1.0.11)
       virtus (~> 1.0)
-    minitest (5.7.0)
+    minitest (5.8.0)
     rake (10.4.2)
     ruby-maven (3.3.3)
       ruby-maven-libs (~> 3.3.1)
@@ -45,4 +45,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.10.4
+   1.10.6

data/Readme.md

@@ -7,9 +7,13 @@ manage jar dependencies similar than **bundler** manages gem dependencies.
 * the DSL mimics the one from bundler
 * you can use maven like version declaration or rubygems/bundler like version ranges
 * it locks down the jar versions inside "Jarfile.lock"
-* you can declare jar dependency within a rubygems using the requirements directive of the gem specification. jbundler will include those jar dependencies into its classpath
-* on the first run everything get resolved, any further run just the setup of classpath is done (without any maven involved)
-* it integrates nicely with bundler when Bundler.require is used (like Rails does it)
+* you can declare jar dependency within a gem using the requirements directive of the gem specification. jbundler will include those jar dependencies into its classpath
+
+the difference to **bundler**
+
+* it is just a development gem - no need for it during runtime. just add ```Jars.require_jars_lock!``` to your code and for older JRuby add ```gem 'jar-dependencies', '~> 0.1.11'``` as runtime dependency.
+* you need to run ```bundle install``` first if any of the gems has jar dependencies.
+* all one command ```jbundle```, see ```jbundle --help``` on the possible options and how to update a single jar, etc.
 
 ## get started
 
@@ -19,91 +23,28 @@ install JBundler with
 	
 first create a **Jarfile**, something like
     
-	jar 'org.yaml:snakeyaml'
+	jar 'org.yaml:snakeyaml', '1.14'
 	jar 'org.slf4j:slf4j-simple', '>1.1'
 
-### together with Bundler
-
-just add it as **first** entry in your *Gemfile* 
-
-```gem 'jbundler'```
-
-and now install the bundle both **gems and jars**
-
-    jbundle install
-
-#### Building
-
-building the jar
-```rake jar```
-
-building the gem
-```rake build```
-
-running the junit test
-```rake junit```
-
-running the minitest
-```rake minitest```
-
-make sure you use jruby ;)
-
-#### Gemfile and Jarfile
-
-if there is only a **Gemfile** and no Jarfile **jbundler** handles all the declared [jar dependencies of gems](https://github.com/mkristian/jbundler/wiki/Build) as well all the jars from the Jarfile. it will only look into gems which bundler loaded.
-
-### without Bundler - Jarfile only
-
-requiring **jbundler** will trigger the classpath setup
-
-```require 'jbundler'```
-
-this you can use with **rubygems** or **isolate** or . . .
-
 ### Jarfile
 
 more info about the **[Jarfile](https://github.com/torquebox/maven-tools/wiki/Jarfile)** and about [versions](https://github.com/torquebox/maven-tools/wiki/Versions).
 
 for adding a maven repository see [Jarfile](https://github.com/torquebox/maven-tools/wiki/Jarfile).
-    
-## console ##
-
-like bundler there is a console which sets up the gems (if there is Gemfile otherwise that part get skipped) and sets up the classloader:
 
-    jbundle console
+# Building the jbundler gem
 
-further it adds two methods to the root level:
+running the integration test
 
-    > jars
+    ./mvnw verify
 
-to list the loaded jars and
+building the gem (see ./pkg)
 
-    > jar 'org.yaml:snakeyaml'
+    ./mvnw package -Dinvoker.skip
 
-using the same syntax as use in the **Jarfile**. there are limitations with such a lazy jar loading but it is very convenient when trying out things.
+or just
 
-## lazy jar loading ##
-
-    require 'jbundler/lazy'
-	include JBundler::Lazy
-	
-will offer the same `jar`/`jars` method than you have inside the console.
-
-# extra commands
-
-## jbundler tree
-
-shows the dependency tree - without the locked version. i.e. an install or update would result in the shown version.
-
-with locked down versions that tree is more hint then a real picture of the situation !!
-
-## jruby executable -b start.rb
-
-will create an executable jar file using the given ruby script as bootstrap script. it will include the comple jruby and all the dependent jars as well all the gems packed into it as well. the
-
-     jruby '1.7.4'
-
-declaration in the *Jarfile* will determinate the jruby version to use for the executable jar.
+    gem build jbundler.gemspec
 
 ## example ##
 
@@ -117,37 +58,8 @@ execute *src/example/my_project/info.rb* to see it in action:
 
 ## limitations ##
 
-update of single artifacts is not possible.
-
 since the version resolution happens in two steps - first the gems then the jars/poms - it is possible in case of a failure that there is a valid gems/jars version resolution which satisfies all version contraints. so there is plenty of space for improvements (like maven could resolve the gems as well, etc)
 
-**Jarfile** is **not** a DSL but it could use a ruby DSL to read the data (any contribution welcome).
-
-jbundler does not completely obey the **$HOME/.m2/settings.xml** from maven where you usually declare proxies, mirrors, etc. see [jbundler configuration](https://github.com/mkristian/jbundler/wiki/Configuration) for what is already possible.
-
-## RVM and/or rubygems-bundler ##
-
-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 ```jbundle tree``` and ```jbundle executable```
-
-## running tests ##
-
-* ```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
-* ```rmvn test`` same as ```mvn test```
-
-## update ##
-
-update of a single artifact is not possible (yet). but to update the whole set of artifacts just delete the lockfile *Jarfile.lock*
-
-if jbundler sees that **Gemfile.lock** or **Jarfile** is newer then the **.jbundler/classpath.rb** file then jbundler tries to gracefully upgrade towards the changes.
-
 # special thanks #
 
 the whole project actually started with a controversial discussion on a [pull request on bundler](https://github.com/carlhuda/bundler/pull/1683). this very same pull request were the starting point of that project here. probably by now there is no much left of the original code but many thanks to [ANithian](https://github.com/ANithian) for given the seed of that project.

data/lib/jbundler/classpath_file.rb

@@ -99,7 +99,7 @@ module JBundler
     def dump_jar( file, path, prefix, local_repo )
       return if path =~ /pom$/
       if local_repo
-        path.sub!( /#{local_repo}/, '' )
+        path = path.sub( /#{local_repo}/, '' )
         unless File.exists?( path )
           file.puts "JBUNDLER_#{prefix}CLASSPATH << (JBUNDLER_LOCAL_REPO + '#{path}')"
           path = nil

data/lib/jbundler/cli.rb

@@ -95,7 +95,7 @@ module JBundler
     end
     
     desc 'lock_down', "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. that is kept as fall back in cases where the new install does not work as before."
-    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 :deployment, :type => :boolean, :default => false, :desc => "copy the jars into the vendor/jars directory (or as configured). add the vendor/jars $LOAD_PATH and Jars.require_jars_lock! - no need for any jbundler files at runtime !"
     method_option :no_deployment, :type => :boolean, :default => false, :desc => 'clears the vendored jars'
     method_option :path, :type => :string
     method_option :without, :type => :array

data/lib/jbundler/config.rb

@@ -138,7 +138,7 @@ module JBundler
       local_maven_repository = absolute( jbundler_env('JBUNDLE_LOCAL_REPOSITORY') )
       if local_maven_repository
         warn "JBUNDLE_LOCAL_REPOSITORY environment or jbundle.local.repository' system property is deprecated use JARS_HOME or jars.home instead"
-        ENV[ Jars::HOME ] ||= local_maven_repository
+        ENV[ 'JARS_HOME' ] ||= local_maven_repository
       else
         # first load the right settings
         self.settings

data/lib/jbundler/lock_down.rb

@@ -149,7 +149,7 @@ module JBundler
         # TODO get rid of this somehow
         deps = Maven::Tools::GemspecDependencies.new( spec )
         deps.java_dependency_artifacts.each do |a|
-          unless done.include? a.key
+          if not done.include?( a.key ) and (a.scope.nil? or a.scope == :compile or a.scope == :runtime)
             maven.property( "jbundler.jars.#{index}", a.to_s )
             index += 1
             done << a.key

data/lib/jbundler/vendor.rb

@@ -4,6 +4,7 @@ module JBundler
 
     def initialize( dir )
       @dir = File.expand_path( dir )
+      @jars_lock = File.join( @dir, 'Jars.lock' )
     end
 
     def vendored?
@@ -11,6 +12,17 @@ module JBundler
     end
 
     def require_jars
+      if File.exists?(@jars_lock)
+        $LOAD_PATH << @dir unless $LOAD_PATH.include? @dir
+        ENV_JAVA['jars.lock'] = @jars_lock
+        Jars.require_jars_lock!
+        true
+      else
+        require_jars_legacy
+      end
+    end
+
+    def require_jars_legacy
       jars = File.join( @dir, 'jbundler.rb' )
       if File.exists?( jars )
         $LOAD_PATH << @dir unless $LOAD_PATH.include? @dir
@@ -19,7 +31,7 @@ module JBundler
         Dir[ File.join( @dir, '**', '*' ) ].each do |f|
           require f
         end
-        Jars.freeze_loading
+        Jars.no_more_warnings
         true
       end
     end
@@ -32,10 +44,16 @@ module JBundler
     end
 
     def vendor_dependencies( deps )
-      require_file = File.join( @dir, 'jbundler.rb' )
-      Jars::JarInstaller.install_deps( deps, @dir, require_file, true ) do |f|
-        f.puts
-        f.puts 'Jars.freeze_loading'
+      FileUtils.mkdir_p( @dir )
+      File.open(@jars_lock, 'w') do |f|
+        deps.each do |dep|
+          line = dep.gav + ':runtime:'
+          f.puts line
+        end
+      end
+      ['jbundler.rb', 'jbundle.rb'].each do |filename|
+        File.write( File.join( @dir, filename ), 
+                    "ENV['JARS_LOCK'] = File.join( File.dirname( __FILE__ ), 'Jars.lock' )\nrequire 'jars/setup" )
       end
     end
 

data/spec/config_spec.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 
 describe JBundler::Config do
 
-  let( :basedir ){ File.dirname( File.dirname( File.expand_path( __FILE__ ) ) ) }
+  let( :basedir ){ File.dirname( File.expand_path( "../", __FILE__ ) ) }
   let( :spec ){ 'spec' }
   let( :spec_dir ){ File.join( basedir, spec ) }
   let( :project ){ File.join( spec, 'project' ) }
@@ -32,13 +32,13 @@ describe JBundler::Config do
       c = JBundler::Config.new
       c.verbose.must_equal nil
       c.local_repository.must_equal './.m2/repository'
-      c.jarfile.must_equal File.join( basedir, 'Jarfile' )
-      c.gemfile.must_equal File.join( basedir, 'Gemfile' )
+      c.jarfile.must_equal File.join( basedir, 'spec', 'Jarfile' )
+      c.gemfile.must_equal File.join( basedir, 'spec', 'Gemfile' )
       c.skip.must_equal nil
       c.settings.must_equal "./.m2/settings.xml"
       c.offline.must_equal false
-      c.work_dir.must_equal File.join( basedir, 'pkg' )
-      c.vendor_dir.must_equal File.join( basedir, 'vendor/jars' )
+      c.work_dir.must_equal File.join( basedir, 'spec','pkg' )
+      c.vendor_dir.must_equal File.join( basedir, 'spec', 'vendor', 'jars' )
     end
   end
 
@@ -59,20 +59,20 @@ describe JBundler::Config do
   end
 
   it 'has following defaults with home and without local config' do
-    ENV['HOME'] = File.join( 'home' )
+    home = ENV['HOME'] = File.join( File.expand_path( '../home', __FILE__ ) )
 
-    FileUtils.cd( spec ) do
+    FileUtils.cd( home ) do
       c = JBundler::Config.new
-          
+
       c.verbose.must_equal false
-      c.local_repository.must_equal File.join( spec_dir, 'localrepo' )
-      c.jarfile.must_equal File.join( spec_dir, 'jarfile' )
-      c.gemfile.must_equal File.join( spec_dir, 'Gem_file' )
+      c.local_repository.must_equal File.join( spec_dir, 'home', 'localrepo' )
+      c.jarfile.must_equal File.join( spec_dir, 'home', 'jarfile' )
+      c.gemfile.must_equal File.join( spec_dir, 'home', 'Gem_file' )
       c.skip.must_equal true
-      c.settings.must_equal File.join( spec_dir, 'Settings.xml' )
+      c.settings.must_equal nil
       c.offline.must_equal false
-      c.work_dir.must_equal File.join( spec_dir, 'target/pkg' )
-      c.vendor_dir.must_equal File.join( spec_dir, 'vendor/my_jars' )
+      c.work_dir.must_equal File.join( spec_dir, 'home', 'target/pkg' )
+      c.vendor_dir.must_equal File.join( spec_dir, 'home', 'vendor/my_jars' )
     end
   end
 
@@ -129,7 +129,6 @@ describe JBundler::Config do
 
         it "uses ENV with home #{home} and local dir #{dir}" do
           ENV['HOME'] = eval "\"#{File.expand_path( home )}\""
-          
           FileUtils.cd eval "\"#{dir}\"" do
             pdir = eval "#{File.basename( dir )}_dir"
             Jars.reset

metadata

@@ -1,107 +1,109 @@
 --- !ruby/object:Gem::Specification
 name: jbundler
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: maven-tools
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.11
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 1.0.10
+  name: maven-tools
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.3'
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 1.0.10
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.3.3
+  name: ruby-maven
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '3.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.3.3
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+  name: bundler
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: jar-dependencies
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: '1.5'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.15
+        version: '0.2'
+  name: jar-dependencies
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0.2'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '10.0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
+  name: minitest
   prerelease: false
   type: :development
-description: |
-  managing jar dependencies with or without bundler. adding bundler like handling of version ranges for jar dependencies.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+description: 'managing jar dependencies with or without bundler. adding bundler like
+  handling of version ranges for jar dependencies.
+
+  '
 email:
 - m.kristian@web.de
 executables:
@@ -111,7 +113,6 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Gemfile.lock
-- Gemfile.lock~
 - MIT-LICENSE
 - Readme.md
 - bin/jbundle
@@ -136,7 +137,6 @@ files:
 - spec/classpath_file_spec.rb
 - spec/config_spec.rb
 - spec/pom_spec.rb
-- spec/project/Settings.xml
 - spec/project/settings.xml
 - spec/setup.rb
 - spec/vendor_spec.rb
@@ -150,22 +150,23 @@ 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:
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: managing jar dependencies
 test_files:
 - spec/classpath_file_spec.rb
-- spec/vendor_spec.rb
 - spec/config_spec.rb
 - spec/pom_spec.rb
+- spec/vendor_spec.rb
+has_rdoc:

data/Gemfile.lock~

@@ -1,46 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jbundler (0.7.3)
-      bundler (~> 1.5)
-      jar-dependencies (~> 0.1.8)
-      maven-tools (~> 1.0.6)
-      ruby-maven (>= 3.1.1.0.6, < 3.1.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    equalizer (0.0.9)
-    ice_nine (0.11.1)
-    jar-dependencies (0.1.8)
-    maven-tools (1.0.8)
-      virtus (~> 1.0)
-    minitest (5.5.1)
-    rake (10.4.2)
-    ruby-maven (3.1.1.0.11)
-      maven-tools (~> 1.0.8)
-      ruby-maven-libs (= 3.1.1)
-    ruby-maven-libs (3.1.1)
-    thread_safe (0.3.5-java)
-    virtus (1.0.4)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
-  java
-
-DEPENDENCIES
-  copyright-header (= 1.0.8)
-  jbundler!
-  minitest (~> 5.3)
-  rake (~> 10.0)