jar-dependencies 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bd8d100f1b60a90cfe7a66415f8413dcdf93dfa
-  data.tar.gz: 655a3e16c92bc6f43023d139c64935b096b0e18f
+  metadata.gz: fa36ecd310e85a018381f6f1a619c697873b7f1f
+  data.tar.gz: 0db8878e2c8825d1e037ac99aa07b5d7b1f065f6
 SHA512:
-  metadata.gz: a0a071dd5b2d2950b227b19f8a3f66f54e5d51581ba580cbf3b731a47b052f5d3ff40a44a683e3a18bcc4c9867adf452734427acc19bea0986ed0044791be813
-  data.tar.gz: dcf7a0895ae39e501d2e6a61bff7f4e6ae5ebd6fa3ece8f0976dc6c3b73f912ef8cea23e86550ad919e5a0a4add03687a9b6aa4b23e641728e996285b0e5d51d
+  metadata.gz: 4a2452584a7508da029a4d4c6c8bf3913e792869e3b20c03950a05975cf4f14e45d395787b22d5a082b36f2a151be129af22582cd45b9d31d42ef8d9df027336
+  data.tar.gz: 625eb01f0d0aaed9d4d017f1dbb11167ab087e2230b4553c337737710592f434ad581aae72f12c17316047164fa83102d8059114825217bb44fba306dfa73d69

data/Gemfile

@@ -5,6 +5,3 @@ gemspec
 
 gem "copyright-header", "1.0.8", :platform => :mri, :group => :copyright
 
-gem 'rake', '~> 10.0'
-gem 'minitest', '~> 5.3'
-

data/Mavenfile

@@ -0,0 +1,19 @@
+#-*- mode: ruby -*-
+
+gemfile
+
+jruby_plugin( :minitest, :minispecDirectory => "specs/*_spec.rb" ) do
+  execute_goals(:spec)
+end
+
+snapshot_repository :jruby, 'http://ci.jruby.org/snapshots/maven'
+
+# (jruby-1.6.8 produces a lot of yaml errors parsing gemspecs)
+properties( 'jruby.versions' => ['1.6.8', '1.7.13','9000.dev-SNAPSHOT'].join(','),
+            'jruby.modes' => ['1.9', '2.0','2.1'].join(','),
+            # just lock the version
+            'jruby.version' => '1.7.13',
+            'tesla.dump.pom' => 'pom.xml',
+            'tesla.dump.readonly' => true )
+
+# vim: syntax=Ruby

data/jar-dependencies.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'jar-dependencies'
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.author = 'christian meier'
   s.email = [ 'mkristian@web.de' ]
   s.summary = 'manage jar dependencies for gems'
@@ -18,7 +18,8 @@ Gem::Specification.new do |s|
 
   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.'
 
-  s.add_development_dependency 'rake', '~> 10.2.2'
+  s.add_development_dependency 'minitest', '~> 5.3'
+  s.add_development_dependency 'rake', '~> 10.2'
   s.add_development_dependency 'ruby-maven', '~> 3.1.1.0'
 end
 

data/lib/jar_dependencies.rb

@@ -22,6 +22,10 @@
 module Jars
   HOME = 'JARS_HOME'
   MAVEN_SETTINGS = 'JARS_MAVEN_SETTINGS'
+  SKIP = 'JARS_SKIP'
+  VERBOSE = 'JARS_VERBOSE'
+  DEBUG = 'JARS_DEBUG'
+  VENDOR = 'JARS_VENDOR'
 
   if defined? JRUBY_VERSION
     def self.to_prop( key )
@@ -34,6 +38,30 @@ module Jars
     end
   end
 
+  def self.to_boolean( key )
+    prop = to_prop( key )
+    # prop == nil => false
+    # prop == 'false' => false
+    # anything else => true
+    prop == '' or prop == 'true'
+  end
+
+  def self.skip?
+    to_boolean( SKIP )
+  end
+
+  def self.verbose?
+    to_boolean( VERBOSE )
+  end
+
+  def self.debug?
+    to_boolean( DEBUG )
+  end
+
+  def self.vendor?
+    to_boolean( VENDOR )
+  end
+
   def self.absolute( file )
     File.expand_path( file ) if file
   end
@@ -115,17 +143,21 @@ module Jars
       # otherwise try to find it on the load path
       require jar
     end
+  rescue LoadError => e
+    raise "\n\n\tyou might need to reinstall the gem which depends on the missing jar\n\n" + e.message + " (LoadError)"
+  end
+
+  def self.freeze_loading
+    ENV[ SKIP ] = 'true'
   end
 end
 
 def require_jar( *args )
+  return false if Jars.skip?
   result = Jars.require_jar( *args )
   if result.is_a? String
     warn "jar coordinate #{args[0..-2].join( ':' )} already loaded with version #{result}"
     return false
   end
   result
-rescue LoadError => e
-  warn 'you might need to reinstall the gem which depends on the missing jar.'
-  raise e
 end

data/lib/jar_installer.rb

@@ -94,6 +94,7 @@ module Jars
         vendor_file( dir, dep ) if vendor
         f.puts( "require_jar( '#{args}' )" ) if f
       end
+      yield f if block_given?
     ensure
       f.close if f
     end
@@ -119,27 +120,42 @@ module Jars
         @basedir = File.dirname( File.expand_path( spec ) )
         @specfile = spec
         spec =  eval( File.read( spec ) )
-      else
-        @basedir = spec.gem_dir
-        @specfile = spec.spec_file
+      when
+        if File.exists?( spec.spec_file )
+          @basedir = spec.gem_dir
+          @specfile = spec.spec_file
+        else
+          initialize( nil )
+        end
       end
 
       @spec = spec
     end
 
+    def ruby_maven_install_options=( options )
+      @options = options
+    end
+
     def vendor_jars
-      return if @spec.requirements.empty?
-      really_vendor = Jars.to_prop( "JARS_VENDOR" ) || 'true'
-      do_install( really_vendor == 'true', false )
+      return unless has_jars?
+      # do not vendor only if set explicitly via ENV/system-properties
+      do_install( Jars.to_prop( Jars::VENDOR ) != 'false', false )
     end
 
     def install_jars
-      return if @spec.requirements.empty?
+      return unless has_jars?
       do_install( false, true )
     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
+      ! @spec.requirements.empty? && @spec.dependencies.detect { |d| d.name == 'jar-dependencies' }
+    end
+
     def do_install( vendor, write_require_file )
       vendor_dir = File.join( @basedir, @spec.require_path )
       if write_require_file
@@ -158,23 +174,38 @@ module Jars
     def setup_arguments( deps )
       args = [ 'dependency:list', "-DoutputFile=#{deps}", '-DincludeScope=runtime', '-DoutputAbsoluteArtifactFilename=true', '-DincludeTypes=jar', '-DoutputScope=true', '-f', @specfile ]
       
-      verbose = Jars.to_prop( 'JARS_VERBOSE' ) == 'true'
-      debug = Jars.to_prop( 'JARS_DEBUG' ) == 'true'
-
-      if debug
+      if Jars.debug?
         args << '-X'
-      elsif ! verbose
+      elsif not Jars.verbose?
         args << '--quiet'
       end
 
-      args << "-Dmaven.repo.local=#{java.io.File.new( Jars.home ).absolute_path}"
+      if defined? JRUBY_VERSION
+        args << "-Dmaven.repo.local=#{java.io.File.new( Jars.home ).absolute_path}"
+      else
+        args << "-Dmaven.repo.local=#{File.expand_path( Jars.home )}"
+      end
+
       args
     end
 
     def lazy_load_maven
       require 'maven/ruby/maven'
     rescue LoadError
-      raise "please install ruby-maven gem which is needed to install the jar dependencies\n\n\tgem install ruby-maven\n\n"
+      install_ruby_maven
+      require 'maven/ruby/maven'
+    end
+
+    def install_ruby_maven
+      require 'rubygems/dependency_installer'
+      jars = Gem.loaded_specs[ 'jar-dependencies' ]
+      dep = jars.dependencies.detect { |d| d.name == 'ruby-maven' }
+      req = dep ? Gem::Requirement.create( '>0' ) : dep.requirement
+      inst = Gem::DependencyInstaller.new( @options || {} )
+      inst.install 'ruby-maven', req
+    rescue => e
+      warn e.backtrace.join( "\n" ) if Jars.verbose?
+      raise "there was an error installing 'ruby-maven'. please install it manually: " + e.message
     end
 
     def monkey_path_gem_dependencies

data/lib/rubygems_plugin.rb

@@ -22,6 +22,8 @@
 if defined?( JRUBY_VERSION ) && Gem.post_install_hooks.empty?
   Gem.post_install do |gem_installer|
     require 'jar_installer'
-    Jars::JarInstaller.new( gem_installer.spec ).vendor_jars
+    jars = Jars::JarInstaller.new( gem_installer.spec )
+    jars.ruby_maven_install_options = gem_installer.options 
+    jars.vendor_jars
   end
 end

metadata

@@ -1,27 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: jar-dependencies
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-06-30 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'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.2.2
+        version: '10.2'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.2.2
+        version: '10.2'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -52,6 +66,7 @@ files:
 - lib/rubygems_plugin.rb
 - bin/bundle-with-jars
 - Rakefile
+- Mavenfile
 - Gemfile
 - Readme.md
 - jar-dependencies.gemspec