jbundler 0.9.1 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a028f5d6b9bc8ed4678c2f5d85226559ac9651cc
-  data.tar.gz: 2b7a3b9ea68fdc87f825b0804d60f3612b19af7c
+SHA256:
+  metadata.gz: 3bf1c75c37037220f7f47c4a02205fcfa814ef8cab027fa45ef111cca5052f9e
+  data.tar.gz: dc85176e4dc8239f3cfcdaa9006d7265d62d793fcb930c9269ae5f89e969bee1
 SHA512:
-  metadata.gz: 4ae33d191d3bf62976175612a959665bb0f8600c3b7aa32d54fe2607381f95cf71cc1b3251eb4db81327bc11edd5ccc7ead9a20bac6223978f768379bdc8e8fa
-  data.tar.gz: fcfb318878419c342c29427fb0820d7d84199e260173c6cd40ca2777978ed8a44df879bf134ade1a9536c083b567bfca14aa596eeb8f96cc336ba5a134def957
+  metadata.gz: 4663268fac15d1938833a253276280f652a8c82e039d7103100e7132d764e2e6371d27e188fc133d564bc9ef922fb74165da4c1c41d670a0e21e49d6ccdc43e8
+  data.tar.gz: eb2d73a9246bb8f5a5b30c967868e73db16eb08aa6717bff993737b5cc65043503410a06f6e8698099abda97d67bd705ba529606940ee22ac3b97642eb15f167

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    jbundler (0.9.1)
-      bundler (~> 1.5)
-      jar-dependencies (~> 0.2)
-      maven-tools (~> 1.0.10)
-      ruby-maven (~> 3.3, >= 3.3.3)
+    jbundler (0.9.4)
+      bundler (> 1.5, < 3.0.0)
+      jar-dependencies (~> 0.3)
+      maven-tools (~> 1.1)
+      ruby-maven (~> 3.3, >= 3.3.8)
 
 GEM
   remote: https://rubygems.org/
@@ -19,16 +19,16 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.11)
-    ice_nine (0.11.1)
-    jar-dependencies (0.2.1)
-    maven-tools (1.0.11)
+    ice_nine (0.11.2)
+    jar-dependencies (0.4.0)
+    maven-tools (1.1.6)
       virtus (~> 1.0)
-    minitest (5.8.0)
-    rake (10.4.2)
-    ruby-maven (3.3.3)
-      ruby-maven-libs (~> 3.3.1)
-    ruby-maven-libs (3.3.3)
-    thread_safe (0.3.5-java)
+    minitest (5.14.0)
+    rake (10.5.0)
+    ruby-maven (3.3.12)
+      ruby-maven-libs (~> 3.3.9)
+    ruby-maven-libs (3.3.9)
+    thread_safe (0.3.6-java)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
@@ -45,4 +45,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.10.6
+   2.1.4

data/Readme.md

@@ -1,68 +1,101 @@
-# jbundler 
+# jbundler
 
-* [![Build Status](https://secure.travis-ci.org/mkristian/jbundler.png)](http://travis-ci.org/mkristian/jbundler) #
+* [![Build Status](https://secure.travis-ci.org/mkristian/jbundler.svg)](http://travis-ci.org/mkristian/jbundler)
 
-manage jar dependencies similar than **bundler** manages gem dependencies.
+Manage jar dependencies similar to how **bundler** manages gem dependencies:
 
 * the DSL mimics the one from bundler
-* you can use maven like version declaration or rubygems/bundler like version ranges
+* you can use maven-like version declarations or rubygems/bundler version ranges
 * it locks down the jar versions inside "Jarfile.lock"
-* 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
+* you can declare jar dependencies within a gem using the requirements directive of the gem specification. jbundler will include those jar dependencies into its classpath
 
-the difference to **bundler**
+differences compared 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.
+* you need to run ```bundle install``` first if any of the gems have jar dependencies.
+* all one command ```jbundle```, see ```jbundle help``` on the possible options and how to update a single jar, etc.
 
-## get started
+## Get started
 
-install JBundler with
+Install JBundler with:
+```bash
+jruby -S gem install jbundler
+```
 
-    jruby -S gem install jbundler
-	
-first create a **Jarfile**, something like
-    
-	jar 'org.yaml:snakeyaml', '1.14'
-	jar 'org.slf4j:slf4j-simple', '>1.1'
+First, create a **Jarfile**, something like:
+```bash
+jar 'org.yaml:snakeyaml', '1.14'
+jar 'org.slf4j:slf4j-simple', '>1.1'
+```
+
+Install jar dependencies
+```bash
+jruby -S jbundle install
+```
+
+Loading the jar files
+```bash
+require 'jbundler'
+```
+
+It will add all the jar dependencies in the java classpath from the `Jarfile.lock`.
 
 ### 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).
+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).
+For adding a maven repository see [Jarfile](https://github.com/torquebox/maven-tools/wiki/Jarfile).
 
-# Building the jbundler gem
+## Building the jbundler gem
 
-running the integration test
+Running the integration test
 
-    ./mvnw verify
+```bash
+./mvnw verify
+./mvnw clean verify
+```
+or a single integration test
+```bash
+./mvnw verify -Dinvoker.test=running_rspec_via_rake
+./mvnw clean verify -Dinvoker.test=running_rspec_via_rake
+```
 
-building the gem (see ./pkg)
+Building the gem (see ./pkg)
+```bash
+./mvnw package -Dinvoker.skip
+```
 
-    ./mvnw package -Dinvoker.skip
+Or just
+```bash
+gem build jbundler.gemspec
+```
 
-or just
+## Usage
 
-    gem build jbundler.gemspec
+Here is an example usage of the AliasEvent class from the snakeyaml package
 
-## example ##
+```ruby
+#test_file.rb
+require 'jbundler'
+require 'java'
 
-*src/example/my_project* has a Gemfile which uses a gem which depends on jar dependency. see *src/example/gem_with_jar/gem_with_jar.gemspec* how the jar gets declared.
+java_import 'org.yaml.snakeyaml.events.AliasEvent'
 
-execute *src/example/my_project/info.rb* to see it in action:
+class TestClass
+  def my_method
+    puts AliasEvent.methods
+  end
+end
 
-      cd src/example/my_project
-      jbundle install
-      bundle exec info.rb
+TestClass.new.my_method
+```
 
-## limitations ##
+## Limitations
 
-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)
+Since the version resolution happens in two steps - first the gems, and 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).
 
-# special thanks #
+## 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.
+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 not much left of the original code, but many thanks to [ANithian](https://github.com/ANithian) for giving the seed of that project.
 
 License
 -------
@@ -78,7 +111,7 @@ Contributing
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
-meta-fu
+Meta-fu
 -------
 
-enjoy :) 
+enjoy :)

data/lib/jbundler/cli.rb

@@ -93,7 +93,7 @@ module JBundler
     def console
       # dummy - never executed !!!
     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). 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'
@@ -123,18 +123,20 @@ module JBundler
     end
 
     desc 'update', "first `bundle update` is called and if there are no options then the jar dependencies will be updated. for more details see `bundle help update`."
-    method_option :debug, :type => :boolean, :default => false, :desc => 'enable maven debug output (jbundler only).'
+    method_option :debug,   :type => :boolean, :default => false, :desc => 'enable maven debug output (jbundler only).'
     method_option :verbose, :type => :boolean, :default => false, :desc => 'enable maven output (jbundler only).'
+    method_option :quiet,   :type => :boolean
     def update
-      return unless ARGV.size == 1
-        
-      JBundler::LockDown.new( config ).update( options[ :debug ] ,
-                                               options[ :verbose ] )
+      msg = JBundler::LockDown.new( config ).update( options[ :debug ] ,
+                                                     options[ :verbose ] )
 
       config.verbose = ! options[ :quiet ]
       Show.new( config ).show_classpath
-      puts ''
-      puts 'Your jbundle is updated! Use `jbundle show` to see where the bundled jars are installed.'
+      unless options[ :quiet ]
+        puts ''
+        puts 'Your jbundle is updated! Use `jbundle show` to see where the bundled jars are installed.'
+      end
+      puts msg if msg
     end
 
     desc 'show', "first `bundle show` is called and if there are no options then the jar dependencies will be displayed. for more details see `bundle help show`."

data/lib/jbundler/lock_down.rb

@@ -23,7 +23,7 @@ module JBundler
 
     def update( debug = false, verbose = false )
       if vendor.vendored?
-        raise 'can not update vendored jars'
+        raise 'Cannot update vendored jars'
       end
 
       FileUtils.rm_f( @config.jarfile_lock )

data/lib/jbundler/vendor.rb

@@ -58,7 +58,7 @@ module JBundler
       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" )
+                    "ENV['JARS_LOCK'] = File.join( File.dirname( __FILE__ ), 'Jars.lock' )\nrequire 'jars/setup'" )
       end
     end
 

data/spec/config_spec.rb

@@ -35,7 +35,7 @@ describe JBundler::Config do
       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.settings.must_equal File.expand_path("settings.xml")
       c.offline.must_equal false
       c.work_dir.must_equal File.join( basedir, 'spec','pkg' )
       c.vendor_dir.must_equal File.join( basedir, 'spec', 'vendor', 'jars' )
@@ -138,7 +138,8 @@ describe JBundler::Config do
             c.jarfile.must_equal File.join( pdir, 'JarFile' )
             c.gemfile.must_equal File.join( pdir, 'GemFile' )
             c.skip.must_equal false
-            c.settings.must_equal File.join( pdir, 'Settings.xml' )
+            # names are case insensitive
+            c.settings.downcase.must_equal File.join( pdir, 'Settings.xml' ).downcase
             c.offline.must_equal true
             c.work_dir.must_equal File.join( pdir, 'pkg/work' )
             c.vendor_dir.must_equal File.join( pdir, 'vendor/localjars' )

metadata

@@ -1,107 +1,115 @@
 --- !ruby/object:Gem::Specification
 name: jbundler
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.4
 platform: ruby
 authors:
 - Christian Meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: maven-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
-  name: maven-tools
-  prerelease: false
+        version: '1.1'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: '1.1'
 - !ruby/object:Gem::Dependency
+  name: ruby-maven
   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
+        version: 3.3.8
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.8
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.5'
-  name: bundler
-  prerelease: false
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">"
       - !ruby/object:Gem::Version
         version: '1.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
+  name: jar-dependencies
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-  name: jar-dependencies
-  prerelease: false
+        version: '0.3'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   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.
+description: 'managing jar dependencies with or without bundler. adding bundler like
+  handling of version ranges for jar dependencies.
+
+  '
 email:
 - m.kristian@web.de
 executables:
@@ -135,6 +143,7 @@ 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
@@ -148,17 +157,16 @@ 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.8
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: managing jar dependencies