jar-dependencies 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8eb8cba64115cb2e8051ccdcae9fcb547795c7
-  data.tar.gz: 6887fefbfe325001e00fa2a6e35cd4bf19649775
+  metadata.gz: 4792c4d6bd31872ceda20216a0731b78ec12ffe1
+  data.tar.gz: d87b5dcaa7942e50b4563548b4fdeb07eea89da8
 SHA512:
-  metadata.gz: 5be5306505b67b6872d483c504b0abdfef02d99b39c1d2e39f8d18dca1795e5ef0e02590b1ffb9162b2d3cb407f5e57a9f0118f15bbd42094b6ad96f8e01db4c
-  data.tar.gz: f99747cdc5985dcaedd93d9d30f6d614f7c0e8e132217cdb5339eba7757528c1cbc696a6131fe186de7899c486598a462239c4917463aa6af9ddcb69ee3830b6
+  metadata.gz: dabd28099a91a7cf7fc45e54788defa80d73639ddfce69998713a33aced404a4eb69b3502dcaf739f1dd3d154cc1aa3c41ededb81435c8680c2cfad2005992d9
+  data.tar.gz: 996b8b52713274079ad388d9be3ce64a3455f1bd4c69360f0612a8e937203c98a525f3d37613a98b4e65c65ba3fcef71e296157b8a212e6893351c0db8c7b3bd

data/Mavenfile

@@ -34,7 +34,8 @@ plugin :invoker, '1.8' do
                  :postBuildHookScript => 'verify.bsh',
                  :cloneProjectsTo => '${project.build.directory}',
                  :properties => { 'jar-dependencies.version' => '${project.version}',
-                   'jruby.version' => '${jruby.version}',
+                   # use an old jruby with old ruby-maven here
+                   'jruby.version' => '1.7.20',
                    'jruby.plugins.version' => '${jruby.plugins.version}',
                    'bundler.version' => '${bundler.version}',
                    'ruby-maven.version' => '${ruby-maven.version}',

data/jar-dependencies.gemspec

@@ -34,11 +34,11 @@ Gem::Specification.new do |s|
 
 if you want to use the executable #{LOCK_JARS} then install ruby-maven gem before using #{LOCK_JARS} 
 
-   $ gem install ruby-maven #{RUBY_MAVEN_VERSION}
+   $ gem install ruby-maven -v '#{RUBY_MAVEN_VERSION}'
 
 or add it as deveopment dependency to your Gemfile
 
-   gem 'ruby-maven', #{RUBY_MAVEN_VERSION}
+   gem 'ruby-maven', '#{RUBY_MAVEN_VERSION}'
 
 EOF
 end

data/lib/jars/maven_factory.rb

@@ -56,14 +56,14 @@ module Jars
     private
 
     def lazy_load_maven
-      add_gem_to_load_path( 'ruby-maven-libs' )
       add_gem_to_load_path( 'ruby-maven' )
+      add_gem_to_load_path( 'ruby-maven-libs' )
       require 'maven/ruby/maven'
     end
 
-    def find_spec_via_rubygems( name )
+    def find_spec_via_rubygems( name, req )
       require 'rubygems/dependency'
-      dep = Gem::Dependency.new( name )
+      dep = Gem::Dependency.new( name, req )
       dep.matching_specs( true ).last
     end
 
@@ -72,8 +72,9 @@ module Jars
       return if Gem.loaded_specs[ name ]
       # just install gem if needed and add it to the load_path
       # and leave activated gems as they are
-      unless spec = find_spec_via_rubygems( name )
-        spec = install_gem( name )
+      req = requirement( name )
+      unless spec = find_spec_via_rubygems( name, req )
+        spec = install_gem( name, req )
       end
       unless spec
         raise "failed to resolve gem '#{name}' if you're using Bundler add it as a dependency"
@@ -81,12 +82,15 @@ module Jars
       $LOAD_PATH << File.join( spec.full_gem_path, spec.require_path )
     end
 
-    def install_gem( name )
+    def requirement( name )
+      jars = Gem.loaded_specs[ 'jar-dependencies' ]
+      dep = jars.nil? ? nil : jars.dependencies.detect { |d| d.name == name }
+      dep.nil? ? Gem::Requirement.create( '>0' ) : dep.requirement
+    end
+
+    def install_gem( name, req )
       puts "Installing gem '#{name}' . . ."
       require 'rubygems/dependency_installer'
-      jars = Gem.loaded_specs[ 'jar-dependencies' ]
-      dep = jars.dependencies.detect { |d| d.name == name }
-      req = dep.nil? ? Gem::Requirement.create( '>0' ) : dep.requirement
       inst = Gem::DependencyInstaller.new( @options ||= {} )
       inst.install( name, req ).first
     rescue => e

data/lib/jars/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -88,9 +88,9 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: "\nif you want to use the executable lock_jars then install\
-  \ ruby-maven gem before using lock_jars \n\n   $ gem install ruby-maven ~> 3.3.3\n\
-  \nor add it as deveopment dependency to your Gemfile\n\n   gem 'ruby-maven', ~>\
-  \ 3.3.3\n\n"
+  \ ruby-maven gem before using lock_jars \n\n   $ gem install ruby-maven -v '~> 3.3.3'\n\
+  \nor add it as deveopment dependency to your Gemfile\n\n   gem 'ruby-maven', '~>\
+  \ 3.3.3'\n\n"
 rdoc_options: []
 require_paths:
 - lib