jar-dependencies 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4792c4d6bd31872ceda20216a0731b78ec12ffe1
-  data.tar.gz: d87b5dcaa7942e50b4563548b4fdeb07eea89da8
+  metadata.gz: 53767c5745bde116c2f6cbf6b4c44247590ddfdb
+  data.tar.gz: d6bded82c09871123d5782102b1b6116bbd922fe
 SHA512:
-  metadata.gz: dabd28099a91a7cf7fc45e54788defa80d73639ddfce69998713a33aced404a4eb69b3502dcaf739f1dd3d154cc1aa3c41ededb81435c8680c2cfad2005992d9
-  data.tar.gz: 996b8b52713274079ad388d9be3ce64a3455f1bd4c69360f0612a8e937203c98a525f3d37613a98b4e65c65ba3fcef71e296157b8a212e6893351c0db8c7b3bd
+  metadata.gz: 33c19ed63947debdc596d5323baaba1a0c47888f0a9263ed6ef882496f312c627e95b7b5b04a1be1f7fc7c811823d803b532414db1b95a4a613bdd8a7f0d53f8
+  data.tar.gz: fd02f03753fe532f4289aa44f93678bbaf0428451b45b1c691ae7fd504f2fbaf0ed07fc3db3f323c06c7325a115a8bdd8361fe99dab3f93e5964eb330b2f7390

data/Mavenfile

@@ -14,14 +14,14 @@ end
 pro = @model.profiles.detect { |p| p.id.to_sym == :gemfile } || @model
 ruby_maven = pro.dependencies.detect { |d| d.artifact_id == 'ruby-maven' }
 
-properties( 'jruby.versions' => ['1.7.12', '${jruby.version}', '9.0.1.0'
+properties( 'jruby.versions' => ['1.7.12', '1.7.22', '${jruby.version}'
                                 ].join(','),
-            'jruby.modes' => ['1.9', '2.0', '2.1'].join(','),
+            'jruby.modes' => ['1.9', '2.0', '2.2'].join(','),
             # just lock the version
             'bundler.version' => '1.9.2',
             'ruby-maven.version' => ruby_maven.version,
-            'jruby.version' => '1.7.22',
-            'jruby.plugins.version' => '1.0.9',
+            'jruby.version' => '9.0.3.0',
+            'jruby.plugins.version' => '1.1.2',
             'push.skip' => true  )
 
 plugin :invoker, '1.8' do

data/lib/jars/lock_down.rb

@@ -38,13 +38,15 @@ module Jars
 
     def attach_jar_coordinates_from_bundler_dependencies( maven )
       load_path = $LOAD_PATH.dup
-      require 'bundler/setup'
+      require 'bundler'
+      #TODO make this group a commandline option
+      Bundler.setup( 'default' )
       done = []
       index = 0
       Gem.loaded_specs.each do |name, spec|
         deps = GemspecArtifacts.new( spec )
         deps.artifacts.each do |a|
-          unless done.include? a.key
+          if !done.include?( a.key ) and a.scope != 'provided' and a.scope != 'test'
             maven.property( "jars.#{index}", a.to_coord )
             if a.exclusions
               jndex = 0
@@ -58,13 +60,17 @@ module Jars
           end
         end
       end
+    rescue Gem::LoadError => e
+      # not sure why to reraise the exception
+      raise e
     rescue LoadError => e
       if Jars.verbose?
         warn e.message
         warn "no bundler found - ignore Gemfile if exists"
       end
-    rescue SystemExit
-      # we want to continue
+    rescue Bundler::GemNotFound => e
+      warn "can not setup bundler with #{Bundler.default_lockfile}"
+      raise e
     ensure
       $LOAD_PATH.replace( load_path )
     end

data/lib/jars/maven_factory.rb

@@ -10,6 +10,7 @@ module Jars
       @options.delete( :ignore_dependencies )
       @debug = debug
       @verbose = verbose
+      @installed_maven = false
     end
 
     def maven_new( pom )
@@ -58,6 +59,14 @@ module Jars
     def lazy_load_maven
       add_gem_to_load_path( 'ruby-maven' )
       add_gem_to_load_path( 'ruby-maven-libs' )
+      if @installed_maven
+        puts
+        puts 'using maven for the first time results in maven'
+        puts 'downloading all its default plugin and can take time.'
+        puts 'as those plugins get cached on disk and further execution'
+        puts 'of maven is much faster then the first time.'
+        puts
+      end
       require 'maven/ruby/maven'
     end
 
@@ -89,6 +98,7 @@ module Jars
     end
 
     def install_gem( name, req )
+      @installed_maven = true
       puts "Installing gem '#{name}' . . ."
       require 'rubygems/dependency_installer'
       inst = Gem::DependencyInstaller.new( @options ||= {} )
@@ -98,7 +108,7 @@ module Jars
         warn "#{e.inspect}"
         warn e.backtrace.join( "\n" )
       end
-      raise "there was an error installing '#{name} (#{req})' #{@option[:domain]}. please install it manually: #{e.inspect}"
+      raise "there was an error installing '#{name} (#{req})' #{@options[:domain]}. please install it manually: #{e.inspect}"
     end
   end
 end

data/lib/jars/version.rb

@@ -1,5 +1,5 @@
 module Jars
-  VERSION = '0.2.2'.freeze
-  JRUBY_PLUGINS_VERSION = '1.0.10'.freeze
+  VERSION = '0.2.3'.freeze
+  JRUBY_PLUGINS_VERSION = '1.1.2'.freeze
   DEPENDENCY_PLUGIN_VERSION = '2.8'.freeze
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-16 00:00:00.000000000 Z
+date: 2015-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: minitest
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
-  name: minitest
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
+        version: '10.2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
-  name: rake
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: ruby-maven
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.2'
-- !ruby/object:Gem::Dependency
+        version: 3.3.3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.3
-  name: ruby-maven
   prerelease: false
   type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.3.3
 description: manage jar dependencies for gems and keep track which jar was already loaded using maven artifact coordinates. it warns on version conflicts and loads only ONE jar assuming the first one is compatible to the second one otherwise your project needs to lock down the right version by providing a Jars.lock file.
 email:
 - mkristian@web.de
@@ -96,12 +96,12 @@ 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: []