jar-dependencies 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8046f88d8efe9b20de38785a7f2ba5b9cafc963
-  data.tar.gz: dcb3af6f3d1763359e5a00386582a37ebd1963c1
+  metadata.gz: 67596525df0c9a029290a56e4c2e0fbca74fc298
+  data.tar.gz: 44fe4eb030153ed7e44dc790ea65d3bbc59f0633
 SHA512:
-  metadata.gz: f2bd6d2d4eb6139407e04d67956643b34d60e9110baa6a769d16d2cfbc7a5e7ad586b0b84fd631cafcf7becd643bff5ee8611e046ee41faf642af732507dfba2
-  data.tar.gz: 8f52b67493e13f75cfbe93507fcfa3199631883ef05b9971de0b87f9294f0b84126725e4e5aadb709843c013109be78ebf33aa7fe9f22393693a7aa9e305da43
+  metadata.gz: f1ecf583501d0d4c8214c8e376100afa426db341dd8f0ea86af1478426321dfb6aaaa7512a3f0dfccc0601ed652d5f3cd2964051986c495576462f316015013d
+  data.tar.gz: c0f829b0e0dda85a4f9f8696c4b7d7f9a55323b2fcac1cdf1c6658c0fc424a98b521f628b9e8674edfed19b4d34b5f0d9f7ec45cd9e852fd6b0c6c747ce92980

data/Mavenfile

@@ -25,6 +25,7 @@ plugin :invoker, '1.8' do
                  :projectsDirectory => 'integration',
                  :streamLogs => true,
                  :goals => ['install'],
+                 :postBuildHookScript =>  'verify.bsh',
                  :cloneProjectsTo => '${project.build.directory}',
                  :properties => { 'jar-dependencies.version' => '${project.version}',
                    'jruby.version' => '${jruby.version}',

data/jar-dependencies.gemspec

@@ -1,10 +1,11 @@
 #-*- mode: ruby -*-
 
-require './lib/jars/version'
-
 Gem::Specification.new do |s|
   s.name = 'jar-dependencies'
-  s.version = Jars::VERSION
+
+  path = File.expand_path('lib/jars/version.rb', File.dirname(__FILE__))
+  s.version = File.read(path).match( /.*VERSION\s*=\s*['"](.*)['"]/m )[1]
+  
   s.author = 'christian meier'
   s.email = [ 'mkristian@web.de' ]
   s.summary = 'manage jar dependencies for gems'
@@ -12,15 +13,17 @@ Gem::Specification.new do |s|
 
   s.license = 'MIT'
 
-  s.files = Dir[ 'lib/**/*rb' ]
-  s.files += Dir[ '*file' ]
-  s.files += [ 'Readme.md', 'jar-dependencies.gemspec', 'MIT-LICENSE' ]
+  s.files = `git ls-files`.split($/).select do |file|
+    file =~ /^lib\// ||
+    [ 'Mavenfile', 'Rakefile' ].include?(file) ||
+    [ 'Readme.md', 'jar-dependencies.gemspec', 'MIT-LICENSE' ].include?(file)
+  end
 
   s.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.'
 
   s.add_development_dependency 'minitest', '~> 5.3'
   s.add_development_dependency 'rake', '~> 10.2'
-  s.add_development_dependency "ruby-maven", "~> 3.1.1.0.11"
+  s.add_development_dependency 'ruby-maven', '~> 3.1.1.0.11'
 end
 
 # vim: syntax=Ruby

data/lib/jar_dependencies.rb

@@ -195,7 +195,7 @@ module Jars
 
       @@jars ||= {}
       coordinate = "#{group_id}:#{artifact_id}"
-      coordinate += ":#{classifier}" if classifier
+      coordinate << ":#{classifier}" if classifier
       if @@jars.key? coordinate
         if @@jars[ coordinate ] == version
           false
@@ -240,8 +240,8 @@ module Jars
       local_repo
     end
 
-    def to_jar( group_id, artifact_id, version, classifier )
-      file = "#{group_id.gsub( /\./, '/' )}/#{artifact_id}/#{version}/#{artifact_id}-#{version}"
+    def to_jar( group_id, artifact_id, version, classifier = nil )
+      file = "#{group_id.gsub( '.', '/' )}/#{artifact_id}/#{version}/#{artifact_id}-#{version}"
       file << "-#{classifier}" if classifier
       file << '.jar'
       file

data/lib/jars/installer.rb

@@ -15,9 +15,9 @@ module Jars
       end
 
       def setup_type( line )
-        if line.match /:pom:/
+        if line.index(':pom:')
           @type = :pom
-        elsif line.match /:jar:/
+        elsif line.index(':jar:')
           @type = :jar
         end
       end
@@ -39,21 +39,21 @@ module Jars
       def initialize( line )
         setup_type( line )
 
-        line.sub!( /^\s+/, '' )
-        @coord = line.sub( /:[^:]+:([A-Z]:\\)?[^:]+$/, '' )
+        line.sub!( /^\s+/, empty = '' )
+        @coord = line.sub( /:[^:]+:([A-Z]:\\)?[^:]+$/, empty )
         first, second = @coord.split( /:#{type}:/ )
         group_id, artifact_id = first.split( /:/ )
         parts = group_id.split( '.' )
         parts << artifact_id
-        parts << second.split( /:/ )[ -1 ]
-        parts << File.basename( line.sub /.:/, '' )
+        parts << second.split( ':' )[ -1 ]
+        parts << File.basename( line.sub( /.:/, empty ) )
         @path = File.join( parts ).strip
 
         setup_scope( line )
 
         reg = /:jar:|:pom:|:test:|:compile:|:runtime:|:provided:|:system:/
-        @file = line.slice(@coord.length, line.length).sub(reg, '').strip
-        @system = nil != (line =~ /:system:/)
+        @file = line.slice(@coord.length, line.length).sub(reg, empty).strip
+        @system = line.index(':system:') != nil
         @gav = @coord.sub(reg, ':')
       end
 
@@ -103,7 +103,7 @@ module Jars
         file.puts( "require( '#{dep.file}' )" ) if file
       elsif dep.scope == :runtime
         vendor_file( dir, dep ) if vendor
-        file.puts( "require_jar( '#{dep.gav.gsub( /:/, "', '" )}' )" ) if file
+        file.puts( "require_jar( '#{dep.gav.gsub( ':', "', '" )}' )" ) if file
       end
     end
 
@@ -117,6 +117,12 @@ module Jars
       f.close if f
     end
 
+    def initialize( spec = nil )
+      @mvn = MavenExec.new( spec )
+    end
+
+    def spec; @mvn.spec end
+
     def vendor_jars( write_require_file = true )
       return unless has_jars?
       case Jars.to_prop( Jars::VENDOR )
@@ -127,7 +133,7 @@ module Jars
       else
         # if the spec_file does not exists this means it is a local gem
         # coming via bundle :path or :git
-        do_vendor = File.exists?( @mvn.spec.spec_file )
+        do_vendor = File.exists?( spec.spec_file )
       end
       do_install( do_vendor, write_require_file )
     end
@@ -137,26 +143,24 @@ module Jars
       do_install( false, write_require_file )
     end
 
-    def initialize( spec = nil )
-      @mvn = MavenExec.new( spec )
-    end
-
     def ruby_maven_install_options=( options )
       @mvn.ruby_maven_install_options=( options )
     end
 
-    private
-
     def has_jars?
       # first look if there are any requirements in the spec
       # and then if gem depends on jar-dependencies
       # only then install the jars declared in the requirements
-      @mvn.spec != nil && ! @mvn.spec.requirements.empty? && @mvn.spec.dependencies.detect { |d| d.name == 'jar-dependencies' && d.type == :runtime }
+      spec && ! spec.requirements.empty? &&
+          spec.dependencies.detect { |d| d.name == 'jar-dependencies' && d.type == :runtime }
     end
+    alias_method :jars?, :has_jars?
+
+    private
 
     def do_install( vendor, write_require_file )
-      vendor_dir = File.join( @mvn.basedir, @mvn.spec.require_path )
-      jars_file = File.join( vendor_dir, "#{@mvn.spec.name}_jars.rb" )
+      vendor_dir = File.join( @mvn.basedir, spec.require_path )
+      jars_file = File.join( vendor_dir, "#{spec.name}_jars.rb" )
 
       # write out new jars_file it write_require_file is true or
       # check timestamps:
@@ -174,7 +178,7 @@ module Jars
     def install_dependencies
       deps = File.join( @mvn.basedir, 'deps.lst' )
 
-      puts "  jar dependencies for #{@mvn.spec.spec_name} . . ." unless Jars.quiet?
+      puts "  jar dependencies for #{spec.spec_name} . . ." unless Jars.quiet?
       @mvn.resolve_dependencies_list( deps )
 
       self.class.load_from_maven( deps )

data/lib/jars/maven_exec.rb

@@ -113,22 +113,39 @@ module Jars
     end
 
     def lazy_load_maven
+      add_gem_to_load_path( 'ruby-maven' )
+      add_gem_to_load_path( 'ruby-maven-libs' )
       require 'maven/ruby/maven'
-    rescue LoadError
-      install_ruby_maven
-      require 'maven/ruby/maven'
     end
 
-    def install_ruby_maven
+    def find_spec_via_rubygems( name )
+      require 'rubygems/dependency'
+      dep = Gem::Dependency.new( name )
+      dep.matching_specs( true ).last
+    end
+
+    def add_gem_to_load_path( name )
+      # if the gem is already activated => good
+      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 )
+        install_gem( name )
+        spec = find_spec_via_rubygems( name )
+      end
+      $LOAD_PATH << File.join( spec.full_gem_path, spec.require_path )
+    end
+
+    def install_gem( name )
       require 'rubygems/dependency_installer'
       jars = Gem.loaded_specs[ 'jar-dependencies' ]
-      dep = jars.dependencies.detect { |d| d.name == 'ruby-maven' }
+      dep = jars.dependencies.detect { |d| d.name == name }
       req = dep.nil? ? Gem::Requirement.create( '>0' ) : dep.requirement
-      inst = Gem::DependencyInstaller.new( @options || {} )
-      inst.install 'ruby-maven', req
+      inst = Gem::DependencyInstaller.new( @options ||= {} )
+      inst.install name, req
     rescue => e
       warn e.backtrace.join( "\n" ) if Jars.verbose?
-      raise "there was an error installing 'ruby-maven'. please install it manually: #{e.inspect}"
+      raise "there was an error installing '#{name}'. please install it manually: #{e.inspect}"
     end
   end
 end

data/lib/jars/setup.rb

@@ -0,0 +1,7 @@
+# to do as bundler does and allow to load Jars.lock via 
+# require 'jars/setup'. can be useful via commandline -rjars/setup
+# or tell bundler autorequire to load it
+
+require 'jar_dependencies'
+
+Jars.require_jars_lock!

data/lib/jars/version.rb

@@ -1,3 +1,3 @@
 module Jars
-  VERSION = '0.1.12'.freeze
+  VERSION = '0.1.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -59,25 +59,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rubygems_plugin.rb
+- MIT-LICENSE
+- Mavenfile
+- Rakefile
+- Readme.md
+- jar-dependencies.gemspec
 - lib/jar-dependencies.rb
-- lib/jar_install_post_install_hook.rb
 - lib/jar_dependencies.rb
+- lib/jar_install_post_install_hook.rb
 - lib/jar_installer.rb
 - lib/jars/classpath.rb
-- lib/jars/jars_lock_pom.rb
-- lib/jars/maven_exec.rb
-- lib/jars/version.rb
 - lib/jars/installer.rb
 - lib/jars/jar_pom.rb
-- lib/jars/post_install_hook.rb
+- lib/jars/jars_lock_pom.rb
 - lib/jars/lock.rb
-- Mavenfile
-- Rakefile
-- Gemfile
-- Readme.md
-- jar-dependencies.gemspec
-- MIT-LICENSE
+- lib/jars/maven_exec.rb
+- lib/jars/post_install_hook.rb
+- lib/jars/setup.rb
+- lib/jars/version.rb
+- lib/rubygems_plugin.rb
 homepage: https://github.com/mkristian/jar-dependencies
 licenses:
 - MIT

data/Gemfile

@@ -1,7 +0,0 @@
-#-*- mode: ruby -*-
-source 'https://rubygems.org'
-
-gemspec
-
-gem "copyright-header", "1.0.8", :platform => :mri, :group => :copyright
-