jar-dependencies 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 285c3578922ce5e751b875aac6728649d38a174f
-  data.tar.gz: a20d84a454308495cc0c10475bcbda345df89037
+  metadata.gz: 3fce3cb6f86473d79460870d971844bfb91470be
+  data.tar.gz: 87fb942e560b8dfab98597223893d92e5dfad355
 SHA512:
-  metadata.gz: 02086bfa2664b6ab0bc185d007f9504903ec24bcf94b4053f23d611297e0932c6fd5c0b02d6d7f6ac485b66d8c443f8f0f0e7b01853d65f8feca4849ca412f57
-  data.tar.gz: a096cc1e27693b6898ba1eabb315cd54b55c5ac65bf7f8da4031ba44b682367b62658063a8fdc494444a3e54e329c74783b546864d3b928f0b75880440ba4a0d
+  metadata.gz: 20290f1446c65aadd4d19ee7a82f247e69c5cb9015f172ee554b131b7582b9aa14ceae3d1d85921dba95d94ca842a7b2668d570f2484d02fd4c2930548381771
+  data.tar.gz: b19132532e867e06eaa204f9d8aaafec89b65014b2392210f3f1e999035574c8005c5fa40987f8a0ac380443820fd9adf04b818756172592666aace2a6cc373a

data/Mavenfile

@@ -2,9 +2,7 @@
 
 gemfile
 
-# TODO should be setup whenever a plugin uses gems by the pom-ruby-dsl
-repository :id => :mavengems, :url => 'mavengem:http://rubygems.org'
-extension 'de.saumya.mojo:mavengem-wagon:0.1.0'
+plugin_repository :id => :maven_gems, :url => 'mavengem:https://rubygems.org'
 
 jruby_plugin( :minitest, :minispecDirectory => "specs/*_spec.rb" ) do
   execute_goals(:spec)
@@ -19,13 +17,13 @@ ruby_maven = gemfile_profile.dependencies.detect do |d|
   d.artifact_id == 'ruby-maven'
 end
 
-properties( 'jruby.versions' => ['1.7.12', '1.7.23', '${jruby.version}'
+properties( 'jruby.versions' => ['1.7.12', '1.7.25', '${jruby.version}'
                                 ].join(','),
             'jruby.modes' => ['1.9', '2.0', '2.2'].join(','),
             # just lock the version
             'bundler.version' => '1.10.6',
             'ruby-maven.version' => ruby_maven.version,
-            'jruby.version' => '9.0.4.0',
+            'jruby.version' => '9.0.5.0',
             'jruby.plugins.version' => '1.1.3',
             'push.skip' => true  )
 
@@ -44,9 +42,7 @@ plugin :invoker, '1.8' do
                    'jruby.version' => '${jruby.version}',
                    'jruby.plugins.version' => '${jruby.plugins.version}',
                    'bundler.version' => '${bundler.version}',
-                   'ruby-maven.version' => '${ruby-maven.version}',
-                   # dump pom for the time being - for travis
-                   'polyglot.dump.pom' => 'pom.xml'})
+                   'ruby-maven.version' => '${ruby-maven.version}' })
 end
 
 distribution_management do

data/Readme.md

@@ -128,6 +128,16 @@ since jar-dependencies does not declare ruby-maven as runtime dependency
 setup the project it is needed) it is advicable to have it as
 development dependency in you Gemfile.
 
+# proxy and mirror setup
+
+proxied and mirrors can be setup by the usual configuration of maven itself: [settings.xml](https://maven.apache.org/settings.html) - see the mirrors and proxy sections.
+
+as jar-dependencies does only deal with jar and all jars need to come from maven central, it is only neccessary to mirror maven-central. an example of such a [settings-example.xml](setting.xml is here).
+
+you also can add such a settings.xml to your project which jar-dependencies will use instad of the default maven locations. this allows to have a per project configuration and also removes the need to users of your ruby project to dive into maven in case your have company policy to use a local mirror for gem and jar artifacts.
+
+jar-dependencies itself uses maven **only** for the jars and all gems are managed by rubygems or bundler or your favourit management tool. so any proxy/mirror settings which should affect gems need to be done in those tools.
+
 # gradle, maven, etc
 
 for dependency management frameworks like gradle (via

data/jar-dependencies.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'minitest', '~> 5.3'
   s.add_development_dependency 'rake', '~> 10.2'
-  RUBY_MAVEN_VERSION = '~> 3.3.3'
+  RUBY_MAVEN_VERSION = '~> 3.3.11'
   s.add_development_dependency 'ruby-maven', RUBY_MAVEN_VERSION
 
   s.post_install_message = <<EOF

data/lib/jar_dependencies.rb

@@ -393,5 +393,6 @@ def require_jar( *args )
     Jars.debug { "    try to load from #{caller.join("\n\t")}" }
     return false
   end
+  Jars.debug { "    register #{args.inspect} - #{result == true}" }
   result
 end

data/lib/jars/installer.rb

@@ -100,12 +100,16 @@ module Jars
       print_require_jar( file, dep )
     end
 
-    def self.print_require_jar( file, dep )
+    def self.print_require_jar( file, dep, fallback = false )
       return if dep.type != :jar || dep.scope != :runtime
       if dep.system?
         file.puts( "require( '#{dep.file}' )" ) if file
       elsif dep.scope == :runtime
-        file.puts( "require_jar( '#{dep.gav.gsub( ':', "', '" )}' )" ) if file
+        if fallback
+          file.puts( "  require '#{dep.path}'" ) if file
+        else
+          file.puts( "  require_jar( '#{dep.gav.gsub( ':', "', '" )}' )" ) if file
+        end
       end
     end
 
@@ -125,11 +129,20 @@ module Jars
         FileUtils.mkdir_p( File.dirname( require_filename ) )
         File.open( require_filename, 'w' ) do |f|
           f.puts COMMENT
-          f.puts "require 'jar_dependencies'"
+          f.puts "begin"
+          f.puts "  require 'jar_dependencies'"
+          f.puts "rescue LoadError"
+          deps.each do |dep|
+             # do not use require_jar method
+            print_require_jar( f, dep, true )
+          end
+          f.puts "end"
           f.puts
+          f.puts "if defined? Jars"
           deps.each do |dep|
             print_require_jar( f, dep )
           end
+          f.puts "end"
           yield f if block_given?
         end
       end
@@ -147,30 +160,28 @@ module Jars
 
     def spec; @mvn.spec end
 
-    def vendor_jars( write_require_file = true )
+    def vendor_jars( write_require_file = true, vendor_dir = nil )
       return unless has_jars?
-      vendor_jars!( write_require_file )
+      if Jars.to_prop( Jars::VENDOR ) == 'false'
+        vendor_dir = nil
+      else
+        vendor_dir ||= spec.require_path
+      end
+      do_install( vendor_dir, write_require_file )
     end
 
-    def self.vendor_jars!
-      new.vendor_jars!
+    def self.vendor_jars!(vendor_dir = nil)
+      new.vendor_jars!(true, vendor_dir)
     end
 
-    def vendor_jars!( write_require_file = true )
-      case Jars.to_prop( Jars::VENDOR )
-      when 'true'
-        do_vendor = true
-      when 'false'
-        do_vendor = false
-      else
-        do_vendor = true
-      end
-      do_install( do_vendor, write_require_file )
+    def vendor_jars!( write_require_file = true, vendor_dir = nil )
+      vendor_dir ||= spec.require_path
+      do_install( vendor_dir, write_require_file )
     end
 
     def install_jars( write_require_file = true )
       return unless has_jars?
-      do_install( false, write_require_file )
+      do_install( nil, write_require_file )
     end
 
     def ruby_maven_install_options=( options )
@@ -194,8 +205,11 @@ module Jars
 
     private
 
-    def do_install( vendor, write_require_file )
-      target_dir = File.join( @mvn.basedir, spec.require_path )
+    def do_install( vendor_dir, write_require_file )
+      if !spec.require_paths.include?(vendor_dir)
+        raise "vendor dir #{vendor_dir} not in require_paths of gemspec #{spec.require_paths}"
+      end
+      target_dir = File.join( @mvn.basedir, vendor_dir || spec.require_path )
       jars_file = File.join( target_dir, "#{spec.name}_jars.rb" )
 
       # write out new jars_file it write_require_file is true or
@@ -209,7 +223,7 @@ module Jars
       end
       deps = install_dependencies()
       self.class.write_require_jars( deps, jars_file )
-      if vendor
+      if vendor_dir
         self.class.vendor_jars( deps, target_dir )
       end
     end

data/lib/jars/maven_exec.rb

@@ -36,7 +36,7 @@ module Jars
         @specfile = File.expand_path( spec )
         @basedir = File.dirname( @specfile )
         Dir.chdir( @basedir ) do
-          spec = eval( File.read( @specfile ) )
+          spec = eval( File.read( @specfile ), TOPLEVEL_BINDING, @specfile )
         end
       when Gem::Specification
         if File.exists?( spec.spec_file )

data/lib/jars/maven_factory.rb

@@ -22,6 +22,7 @@ module Jars
               jndex = 0
               a.exclusions.each do |ex|
                 self[ "jars.#{@index}.exclusions.#{jndex}" ] = ex.to_s
+                jndex += 1
               end
             end
             self[ "jars.#{@index}.scope" ] = a.scope if a.scope
@@ -69,15 +70,6 @@ module Jars
       end
       maven[ 'verbose' ] = (@debug || @verbose) == true
 
-      # TODO what todo with https proxy ?
-      # FIX this proxy settings seems not to work
-      if (proxy = Gem.configuration[ :http_proxy ]).is_a?( String )
-        require 'uri'; uri = URI.parse( proxy )
-        maven['proxySet'] = 'true'
-        maven['proxyHost'] = "#{uri.host}"
-        maven['proxyPort'] = "#{uri.port}"
-      end
-
       if Jars.maven_settings
         maven.options[ '-s' ] = Jars.maven_settings
       end
@@ -121,7 +113,8 @@ module Jars
       unless spec
         raise "failed to resolve gem '#{name}' if you're using Bundler add it as a dependency"
       end
-      $LOAD_PATH << File.join( spec.full_gem_path, spec.require_path )
+      path = File.join( spec.full_gem_path, spec.require_path )
+      $LOAD_PATH << path unless $LOAD_PATH.include?( path )
     end
 
     def requirement( name )

data/lib/jars/version.rb

@@ -1,5 +1,5 @@
 module Jars
-  VERSION = '0.3.2'.freeze
+  VERSION = '0.3.3'.freeze
   JRUBY_PLUGINS_VERSION = '1.1.3'.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.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - christian meier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.11
   name: ruby-maven
   prerelease: false
   type: :development
@@ -51,7 +51,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.3
+        version: 3.3.11
 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
@@ -90,9 +90,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 -v '~> 3.3.3'\n\
+  \ ruby-maven gem before using lock_jars \n\n   $ gem install ruby-maven -v '~> 3.3.11'\n\
   \nor add it as a development dependency to your Gemfile\n\n   gem 'ruby-maven',\
-  \ '~> 3.3.3'\n\n"
+  \ '~> 3.3.11'\n\n"
 rdoc_options: []
 require_paths:
 - lib