lib/maven/tools/dsl.rb in maven-tools-0.34.0 vs lib/maven/tools/dsl.rb in maven-tools-0.34.1

@@ -129,26 +129,31 @@
         else
           require_path = spec.require_path
           name = spec.name
         end
         
-        unless model.repositories.detect { |r| r.id == 'rubygems-releases' }
-          repository( 'http://rubygems-proxy.torquebox.org/releases',
-                      :id => 'rubygems-releases' )
+        unless options[ :only_metadata ]
+        
+          unless model.repositories.detect { |r| r.id == 'rubygems-releases' }
+            repository( 'http://rubygems-proxy.torquebox.org/releases',
+                        :id => 'rubygems-releases' )
+          end
+          if ! model.repositories.detect { |r| r.id == 'rubygems-prereleases' }  && model.dependencies.detect { |d| d.group_id == 'rubygems' && d.version.match( /[a-zA-Z]/ ) }
+            
+            snapshot_repository( 'http://rubygems-proxy.torquebox.org/prereleases',
+                                 :id => 'rubygems-prereleases' )
+          end
+
+          setup_jruby_plugins_version
         end
-        unless model.repositories.detect { |r| r.id == 'rubygems-prereleases' }
-          snapshot_repository( 'http://rubygems-proxy.torquebox.org/prereleases',
-                               :id => 'rubygems-prereleases' )
-        end
 
-        setup_jruby_plugins_version
-
         if options.key?( :jar ) || options.key?( 'jar' )
           jarpath = options[ :jar ] || options[ 'jar' ]
           if jarpath
             jar = File.basename( jarpath ).sub( /.jar$/, '' )
-            output = "#{require_path}/#{jarpath.sub( /#{jar}/, '' )}".sub( /\/$/, '' )
+            output = File.dirname( "#{require_path}/#{jarpath}" )
+            output.sub!( /\/$/, '' )
           end
         else
           jar = "#{name}"
           output = "#{require_path}"
         end
@@ -258,24 +263,28 @@
           version = spec.version.to_s
           version += '-SNAPSHOT' if spec.version.prerelease?
           id "rubygems:#{spec.name}:#{version}"
           name( spec.summary || spec.name )
           description spec.description
-          packaging 'gem'
           url spec.homepage
-          extension 'de.saumya.mojo:gem-extension:${jruby.plugins.version}'
+          unless options[ :only_metadata ]
+            packaging 'gem'
+            extension 'de.saumya.mojo:gem-extension:${jruby.plugins.version}'
+          end
         end
 
         setup_gem_support( options, spec )
         
+        return if options[ :only_metadata ]
+
         config = { :gemspec => name.sub( /^#{basedir}\/?/, '' ) }
         if options[ :include_jars ] || options[ 'include_jars' ] 
           config[ :includeDependencies ] = true
         end
         plugin( 'de.saumya.mojo:gem-maven-plugin:${jruby.plugins.version}',
                 config )
-      
+        
         deps = Maven::Tools::GemspecDependencies.new( spec )
         deps.runtime.each do |d|
           gem d
         end
         unless deps.development.empty?
@@ -1020,10 +1029,10 @@
         else
           r = Repository.new
           c = options.delete( :snapshots )
           c = options.delete( 'snapshots' ) if c.nil?
           unless c.nil?
-            r.snapshot = repository_policy( c )
+            r.snapshots = repository_policy( c )
           end
           c = options.delete( :releases )
           c = options.delete( 'releases' ) if c.nil?
           unless c.nil?
             r.releases = repository_policy( c )