maven-tools 0.33.5 → 0.34.0

data/lib/maven/tools/artifact.rb

@@ -134,6 +134,16 @@ module Maven
         [ self[:group_id], self[:artifact_id], self[:version], self[:classifier] ].select { |o| o }.join( ':' )
       end
 
+      def exclusions
+        if key?( :exclusions )
+          self[:exclusions].inspect.gsub( /[\[\]" ]/, '' ).split /,/
+        end
+      end
+
+      def to_coordinate
+        [ self[:group_id], self[:artifact_id], self[:type], self[:classifier], self[:version] ].select { |o| o }.join( ':' )
+      end
+
       def to_s
         [ self[:group_id], self[:artifact_id], self[:type], self[:classifier], self[:version], key?( :exclusions )? self[:exclusions].inspect.gsub( /[" ]/, '' ) : nil ].select { |o| o }.join( ':' )
       end

data/lib/maven/tools/coordinate.rb

@@ -120,29 +120,38 @@ module Maven
           end
         end
       end
-      
+
+      def snapshot_version( val )
+        if val.match /[a-z]|[A-Z]/ and not val.match /-SNAPSHOT|[${}]/
+          val + '-SNAPSHOT'
+        else
+          val
+        end
+      end
+
       def convert(arg, low = nil, high = nil)
         if arg =~ /~>/
           val = arg.sub(/~>\s*/, '')
           last = val.sub(/\.[0-9]*[a-z]+.*$/, '').sub(/\.[^.]+$/, '.99999')
-          ["[#{val}", "#{last}]"]
+          ["[#{snapshot_version(val)}", "#{snapshot_version(last)}]"]
         elsif arg =~ />=/
           val = arg.sub(/>=\s*/, '')
-          ["[#{val}", (nil || high)]
+          ["[#{snapshot_version(val)}", (nil || high)]
         elsif arg =~ /<=/
           val = arg.sub(/<=\s*/, '')
-          [(nil || low), "#{val}]"]
+          [(nil || low), "#{snapshot_version(val)}]"]
           # treat '!' the same way as '>' since maven can not describe such range
         elsif arg =~ /[!>]/  
           val = arg.sub(/[!>]\s*/, '')
-          ["(#{val}", (nil || high)]
+          ["(#{snapshot_version(val)}", (nil || high)]
         elsif arg =~ /</
           val = arg.sub(/<\s*/, '')
-          [(nil || low), "#{val})"]
+          [(nil || low), "#{snapshot_version(val)})"]
         elsif arg =~ /\=/
           val = arg.sub(/=\s*/, '')
-          ["[" + val, val + '.0.0.0.0.1)']
-        else
+          ["[#{snapshot_version(val)}", val + '.0.0.0.0.1)']
+       else
+          # no conversion here, i.e. assume maven version
           [arg, arg]
         end
       end

data/lib/maven/tools/dsl.rb

@@ -135,6 +135,10 @@ module Maven
           repository( 'http://rubygems-proxy.torquebox.org/releases',
                       :id => 'rubygems-releases' )
         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
 
@@ -215,11 +219,6 @@ module Maven
       end
 
       def gemspec( name = nil, options = @gemfile_options || {} )
-        unless model.properties.member?( 'project.build.sourceEncoding' )
-          properties( 'project.build.sourceEncoding' => 'utf-8' ) 
-        end
-
-        @gemfile_options = nil
         if name.is_a? Hash
           options = name
           name = nil
@@ -233,13 +232,32 @@ module Maven
           name = gemspecs.first
         end
         spec = nil
-        FileUtils.cd( basedir ) do
-          spec = eval( File.read( File.expand_path( name ) ) )
+        spec_file = File.read( File.expand_path( name ) )
+        begin
+          FileUtils.cd( basedir ) do
+            # TODO jruby java user.dir
+            spec = eval( spec_file )
+          end
+        rescue
+          spec = Gem::Specification.from_yaml( spec_file )
         end
+        
+        self.spec( spec, name, options )
+      end
+
+      def spec( spec, name = nil, options = {} )
+        name ||= "#{spec.name}-#{spec.version}.gemspec"
+        unless model.properties.member?( 'project.build.sourceEncoding' )
+          properties( 'project.build.sourceEncoding' => 'utf-8' ) 
+        end
+
+        @gemfile_options = nil
 
         if @context == :project
           build.directory = '${basedir}/pkg'
-          id "rubygems:#{spec.name}:#{spec.version}"
+          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'
@@ -478,24 +496,26 @@ module Maven
       end
 
       def snapshot_repository( url, options = {}, &block )
+        options[ :releases ] = false unless options.key?( :releases ) || options.key?( 'releases' )
+        options[ :snapshots ] = true unless options.key?( :snapshots ) || options.key?( 'snapshots' )
         do_repository( :snapshot_repository=, url, options, block )
       end
 
       def releases( config )
-        respository_policy( :releases=, config )
+        @current.releases = respository_policy( config )
       end
 
       def snapshots( config )
-        respository_policy( :snapshots=, config )
+        @current.snapshots = respository_policy( config )
       end
 
-      def respository_policy( method, config )
+      def repository_policy( config )
         rp = RepositoryPolicy.new
         case config
         when Hash
-          rp.enabled = snapshot[ :enabled ]
-          rp.update_policy = snapshot[ :update ]
-          rp.checksum_policy = snapshot[ :checksum ]
+          rp.enabled = config[ :enabled ]
+          rp.update_policy = config[ :update ]
+          rp.checksum_policy = config[ :checksum ]
         when TrueClass
           rp.enabled = true
         when FalseClass
@@ -503,7 +523,7 @@ module Maven
         else
           rp.enabled = 'true' == config
         end
-        @current.send( method, rp )
+        rp
       end
 
       def args_and_options( *args )
@@ -564,13 +584,21 @@ module Maven
         end
       end
 
-      def jruby_plugin( *gav, &block )
+      def do_jruby_plugin( method, *gav, &block )
         gav[ 0 ] = "de.saumya.mojo:#{gav[ 0 ]}-maven-plugin"
         if gav.size == 1 || gav[ 1 ].is_a?( Hash )
           setup_jruby_plugins_version
           gav.insert( 1, '${jruby.plugins.version}' )
         end
-        plugin( *gav, &block )
+        send( method, *gav, &block )
+      end
+
+      def jruby_plugin( *gav, &block )
+        do_jruby_plugin( :plugin, *gav, &block )
+      end
+
+      def jruby_plugin!( *gav, &block )
+        do_jruby_plugin( :plugin!, *gav, &block )
       end
 
       def plugin!( *gav, &block )
@@ -991,15 +1019,17 @@ module Maven
           r = DeploymentRepository.new
         else
           r = Repository.new
+          c = options.delete( :snapshots )
+          c = options.delete( 'snapshots' ) if c.nil?
+          unless c.nil?
+            r.snapshot = repository_policy( c )
+          end
+          c = options.delete( :releases )
+          c = options.delete( 'releases' ) if c.nil?
+          unless c.nil?
+            r.releases = repository_policy( c )
+          end
         end
-        # if config = ( options.delete( :snapshot ) ||
-        #               options.delete( 'snapshot' ) )
-        #   r.snapshot( repository_policy( config ) )
-        # end
-        # if config = ( options.delete( :release ) ||
-        #               options.delete( 'release' ) )
-        #   r.snapshot( repository_policy( config ) )
-        # end
         nested_block( :repository, r, block ) if block
         options.merge!( :url => url )
         fill_options( r, options )

data/lib/maven/tools/jarfile.rb

@@ -140,12 +140,18 @@ module Maven
           if block
             block.call( dsl )
           end
+          # TODO all that container stuff needs to go into jbundler !!!
           if container
             dsl.artifacts.each do |a|
               if path = a[ :system_path ]
                 container.add_local_jar( path )
-              elsif not locked?( a.to_s )
-                container.add_artifact( a.to_s )
+              elsif not locked?( coord = a.to_coordinate )
+                if exclusions = a.exclusions
+                  container.add_artifact_with_exclusions( coord,
+                                                          exclusions )
+                else
+                  container.add_artifact( coord )
+                end
               end
             end
             dsl.repositories.each do |repo|

data/lib/maven/tools/pom.rb

@@ -24,13 +24,20 @@ require 'stringio'
 require 'maven/tools/model'
 require 'maven/tools/dsl'
 require 'maven/tools/visitor'
+require 'rubygems/specification'
 
 module Maven
   module Tools
     class POM
       include Maven::Tools::DSL
 
-      def initialize( file = nil )
+      def eval_spec( s )
+        @model = tesla do
+          spec s
+        end
+      end
+
+      def eval_file( file )
         if file && File.directory?( file )
           dir = file
           file = nil
@@ -46,9 +53,19 @@ module Maven
           file ||= pom_file( '*.gemspec', dir )
         end
 
-        FileUtils.cd( dir ) do
-          @model = to_model( File.basename( file ) )
-        end if file
+        if file
+          FileUtils.cd( dir ) do
+            @model = to_model( File.basename( file ) )
+          end
+        end
+      end
+
+      def initialize( file = nil )
+        if file.is_a? Gem::Specification
+          eval_spec( file )
+        else
+          eval_file( file )
+        end
       end
 
       def pom_file( pom, dir = '.' )

data/lib/maven/tools/version.rb

@@ -20,6 +20,6 @@
 #
 module Maven
   module Tools
-    VERSION = '0.33.5'.freeze
+    VERSION = '0.34.0'.freeze
   end
 end

data/spec/coordinate_spec.rb

@@ -11,16 +11,22 @@ describe Maven::Tools::Coordinate do
   it 'should convert ruby version to maven version ranges' do
     subject.to_version.must_equal "[0,)"
     subject.to_version('!2.3.4').must_equal "(2.3.4,)"
+    subject.to_version('!2.3.4.rc').must_equal "(2.3.4.rc-SNAPSHOT,)"
     subject.to_version('=2.3.4').must_equal "[2.3.4,2.3.4.0.0.0.0.1)"
+    subject.to_version('=2.3.4.alpha').must_equal "[2.3.4.alpha-SNAPSHOT,2.3.4.alpha.0.0.0.0.1)"
     subject.to_version('~>1.8.2').must_equal "[1.8.2,1.8.99999]"
-    subject.to_version('~>1.8.2.beta').must_equal "[1.8.2.beta,1.8.99999]"
-    subject.to_version('~>1.8.2.beta123.12').must_equal "[1.8.2.beta123.12,1.8.99999]"
-    subject.to_version('~>1.8.2.1beta').must_equal "[1.8.2.1beta,1.8.99999]"
+    subject.to_version('~>1.8.2.beta').must_equal "[1.8.2.beta-SNAPSHOT,1.8.99999]"
+    subject.to_version('~>1.8.2.beta123.12').must_equal "[1.8.2.beta123.12-SNAPSHOT,1.8.99999]"
+    subject.to_version('~>1.8.2.1beta').must_equal "[1.8.2.1beta-SNAPSHOT,1.8.99999]"
     subject.to_version('~>1.8').must_equal "[1.8,1.99999]"
     subject.to_version('>1.2').must_equal "(1.2,)"
+    subject.to_version('>1.2.GA').must_equal "(1.2.GA-SNAPSHOT,)"
     subject.to_version('<1.2').must_equal "[0,1.2)"
+    subject.to_version('<1.2.dev').must_equal "[0,1.2.dev-SNAPSHOT)"
     subject.to_version('>=1.2').must_equal "[1.2,)"
+    subject.to_version('>=1.2.gamma').must_equal "[1.2.gamma-SNAPSHOT,)"
     subject.to_version('<=1.2').must_equal "[0,1.2]"
+    subject.to_version('<=1.2.pre').must_equal "[0,1.2.pre-SNAPSHOT]"
     subject.to_version('>=1.2', '<2.0').must_equal "[1.2,2.0)"
     subject.to_version('>=1.2', '<=2.0').must_equal "[1.2,2.0]"
     subject.to_version('>1.2', '<2.0').must_equal "(1.2,2.0)"
@@ -35,6 +41,14 @@ describe Maven::Tools::Coordinate do
     subject.to_version('[1,2]').must_equal "[1,2]"
   end
 
+  it 'should keep maven snapshot version and ranges as they are' do
+    subject.to_version('1.2.3-SNAPSHOT').must_equal "1.2.3-SNAPSHOT"
+    subject.to_version('(1,2-SNAPSHOT)').must_equal "(1,2-SNAPSHOT)"
+    subject.to_version('[1-SNAPSHOT,2)').must_equal "[1-SNAPSHOT,2)"
+    subject.to_version('(1,2-SNAPSHOT]').must_equal "(1,2-SNAPSHOT]"
+    subject.to_version('[1-SNAPSHOT,2]').must_equal "[1-SNAPSHOT,2]"
+  end
+
   it 'should convert pom of jar deps to maven coordinate' do
     subject.to_coordinate('something "a:b"').must_be_nil
     subject.to_coordinate('#jar "a:b"').must_be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 0.33.5
+  version: 0.34.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-03 00:00:00.000000000 Z
+date: 2013-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus