maven-tools 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3a1e2faf85a820d7df2139034b073b91dd9990d9334012ba5269a7600ec4309
-  data.tar.gz: 7aed58046f3ef3345b331615a32dbd6ad371909220a5ec2294970448bb8946d1
+  metadata.gz: 7df3379b00c374b3f52bb3ad9a9ff736ec174c7d6d2280345ce520ffc186d791
+  data.tar.gz: 6b3ab54d4c36beb6c29605006305502a058b62a19af4b2b1c622469030935be1
 SHA512:
-  metadata.gz: b0ced7f5aec33e99473e6622dbe3310e4983d8730211e9389d4dd429ba186250b0bb3244a238a7f022a91870ca4ee827f2d5f38fd2103c29f597bd17141bf6a6
-  data.tar.gz: 96b1e18452419249f44f9189fb4530e5d6b9ac02a38d3e4f7e6225a27df612ecccb202309afd9e1eb877bf3d7840c9343772659e7a8ce1e837932da163542b24
+  metadata.gz: d2f730a516e94724ee81ed07317701600aaa1d4847ed7204f02c3cca3f76c957787fb672e3bd64ae96ca03d6d90f3aefd74c96040be88b6626e2cdaa5f3beba9
+  data.tar.gz: 28215e1fe8ab6e5d919248e911cb36de86f6e32f434033b9676fa2d76e85416ad5c44ac13e57b81ecefa3cea0764f271f88c3ee9baa2aeb88433dbdb292db941

data/README.md

@@ -1,8 +1,7 @@
 maven tools 
 ===========
 
-* [![Build Status](https://github.com/torquebox/maven-tools/actions/workflows/ci.yml/badge.svg)](https://github.com/torquebox/maven-tools/actions/workflows/ci.yml)
-* [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/torquebox/maven-tools)
+* [![Build Status](https://github.com/jruby/maven-tools/actions/workflows/ci.yml/badge.svg)](https://github.com/jruby/maven-tools/actions/workflows/ci.yml)
 
 Note on Ruby-1.8
 ----------------
@@ -18,6 +17,14 @@ Contributing
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+Building and releasing
+----------------------
+
+Specs can be run with `rake spec` but will also be run as part of maven test phase.
+
+Build the gem with mvn package, making sure that both lib/maven-tools/version.rb and pom.xml are updated to the new
+release version. The built gem will be in the pkg/ dir.
+
 meta-fu
 -------
 

data/lib/maven/tools/dsl/gem_support.rb

@@ -47,7 +47,6 @@ module Maven
             @parent.repository( 'mavengems',
                                 'mavengem:https://rubygems.org' )
           end
-          @parent.needs_torquebox = true
             
           setup_jruby_plugins_version( project )
           
@@ -71,7 +70,7 @@ module Maven
           # TODO rename "no_rubygems_repo" to "no_jar_support"
           if(  options[ :no_rubygems_repo ] != true && 
                jar &&
-               ( source || File.exists?( File.join( project.basedir, 
+               ( source || File.exist?( File.join( project.basedir, 
                                                     'src/main/java' ) ) ) )
             
             unless spec.nil? || spec.platform.to_s.match( /java|jruby/ )

data/lib/maven/tools/dsl/jarfile_lock.rb

@@ -27,7 +27,7 @@ module Maven
         
         def initialize( jarfile )
           @file = File.expand_path( jarfile + ".lock" ) if jarfile
-          if @file && File.exists?( @file )
+          if @file && File.exist?( @file )
             lock = YAML.load( File.read( @file ) )
             case lock
             when Hash

data/lib/maven/tools/dsl/jars_lock.rb

@@ -25,7 +25,7 @@ module Maven
  
         def initialize( parent, file = 'Jars.lock' )
           file = File.join( parent.basedir, file )
-          if File.exists?(file)
+          if File.exist?(file)
             parent.profile File.basename(file) do
               parent.activation do
                 parent.file( :exists => File.basename(file) )

data/lib/maven/tools/dsl.rb

@@ -18,16 +18,6 @@ module Maven
         @model.version = '0.0.0'
         @context = :project
         nested_block( :project, @model, block ) if block
-        if @needs_torquebox
-          if ! @model.repositories.detect { |r| r.id == 'rubygems-prereleases' }  && @model.dependencies.detect { |d| d.group_id == 'rubygems' && d.version.match( /-SNAPSHOT/ ) }
-            
-            @current = @model
-            snapshot_repository(  'rubygems-prereleases',
-                                  'http://rubygems-proxy.torquebox.org/prereleases' )
-            @current = nil
-          end
-          @needs_torquebox = nil
-        end
         result = @model
         @context = nil
         @model = nil
@@ -55,7 +45,6 @@ module Maven
 
       # TODO remove me
       def needs_torquebox= t
-        @needs_torquebox = t
       end
       # TODO remove me
       def current
@@ -139,7 +128,7 @@ module Maven
           options = name
           name = 'Gemfile'
         end
-        name = ::File.join( basedir, name ) unless ::File.exists?( name )
+        name = ::File.join( basedir, name ) unless ::File.exist?( name )
         if @context == :project
           build do
             extension! 'org.jruby.maven:mavengem-wagon', '${mavengem.wagon.version}'
@@ -149,7 +138,7 @@ module Maven
         @inside_gemfile = true
         # the eval might need those options for gemspec declaration
         lockfile = ::File.expand_path( name + '.lock' )
-        if File.exists? lockfile
+        if File.exist? lockfile
           pr = profile :gemfile do
             activation do
               file( :missing => name.sub(/#{basedir}./, '') + '.lock' )
@@ -280,7 +269,6 @@ module Maven
             
             repository( 'mavengems', 'mavengem:https://rubygems.org' )
           end
-          @needs_torquebox = true
 
           setup_jruby_plugins_version
         end
@@ -304,7 +292,7 @@ module Maven
         end
         # TODO rename "no_rubygems_repo" to "no_jar_support"
         if  options[ :no_rubygems_repo ] != true && jar && ( source ||
-                    ::File.exists?( ::File.join( basedir, 'src', 'main', 'java' ) ) )
+                    ::File.exist?( ::File.join( basedir, 'src', 'main', 'java' ) ) )
           unless spec.nil? || spec.platform.to_s.match( /java|jruby/ )
             warn "gem is not a java platform gem but has a jar and source"
           end
@@ -361,7 +349,7 @@ module Maven
           warn "DEPRECATED use filename instead"
           file = jfile.file
         end
-        file = ::File.join( basedir, file ) unless ::File.exists?( file )
+        file = ::File.join( basedir, file ) unless ::File.exist?( file )
         dsl = Maven::Tools::DSL::Jarfile.new( @current, file, options[ :skip_lock ] )
 
         # TODO this setup should be part of DSL::Jarfile

data/lib/maven/tools/gemfile_lock.rb

@@ -40,7 +40,7 @@ module Maven
         current = nil
         bundler = false
         f = file.is_a?(File) ? file.path: file
-        if File.exists? f
+        if File.exist? f
           File.readlines(f).each do |line|
             if line =~ /^BUNDLED WITH/
               bundler = true

data/lib/maven/tools/jarfile.rb

@@ -40,7 +40,7 @@ module Maven
       end
 
       def exists?
-        ::File.exists?(@file)
+        ::File.exist?(@file)
       end
 
       def mtime_lock
@@ -48,7 +48,7 @@ module Maven
       end
 
       def exists_lock?
-        ::File.exists?(@lockfile)
+        ::File.exist?(@lockfile)
       end
 
       def load_lockfile
@@ -83,7 +83,7 @@ module Maven
 
         def eval_file( file )
           warn "#{self.class} is deprecated"
-          if ::File.exists?( file )
+          if ::File.exist?( file )
             eval( ::File.read( file ), nil, file )
             self
           end
@@ -178,7 +178,7 @@ module Maven
 
       def populate_unlocked( container = nil, &block )
         warn 'DEPRECATED use Maven::Tools::DSL::Jarfile instead'
-        if ::File.exists?(@file)
+        if ::File.exist?(@file)
           dsl = Maven::Tools::DSL::Jarfile.new( nil, @file )
 
           if block

data/lib/maven/tools/pom.rb

@@ -95,7 +95,7 @@ module Maven
       end
 
       def to_model( file )
-        if ::File.exists?( file )
+        if ::File.exist?( file )
           case file
           when /pom.rb/
             eval_pom( "tesla do\n#{ ::File.read( file ) }\nend", file )

data/lib/maven/tools/version.rb

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

data/spec/artifact_spec.rb

@@ -4,67 +4,67 @@ require 'maven/tools/artifact'
 describe Maven::Tools::Artifact do
 
   it 'should convert from coordinate' do
-    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:123' ).to_s.must_equal 'sdas:das:jar:tes:123'
-    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:123' ).to_s.must_equal 'sdas:das:jar:123'
-    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:[123,234]' ).to_s.must_equal 'sdas:das:jar:tes:[123,234]'
-    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:[123,234]' ).to_s.must_equal 'sdas:das:jar:[123,234]'
-    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:123:[de:fr,gb:us]' ).to_s.must_equal 'sdas:das:jar:tes:123:[de:fr,gb:us]'
-    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:123:[de:fr,gb:us]' ).to_s.must_equal 'sdas:das:jar:123:[de:fr,gb:us]'
-    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:[123,234]:[de:fr,gb:us]' ).to_s.must_equal 'sdas:das:jar:tes:[123,234]:[de:fr,gb:us]'
-    Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:[123,234]:[de:fr,gb:us]' ).to_s.must_equal 'sdas:das:jar:[123,234]:[de:fr,gb:us]'
+    _(Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:123' ).to_s).must_equal 'sdas:das:jar:tes:123'
+    _(Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:123' ).to_s).must_equal 'sdas:das:jar:123'
+    _(Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:[123,234]' ).to_s).must_equal 'sdas:das:jar:tes:[123,234]'
+    _(Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:[123,234]' ).to_s).must_equal 'sdas:das:jar:[123,234]'
+    _(Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:123:[de:fr,gb:us]' ).to_s).must_equal 'sdas:das:jar:tes:123:[de:fr,gb:us]'
+    _(Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:123:[de:fr,gb:us]' ).to_s).must_equal 'sdas:das:jar:123:[de:fr,gb:us]'
+    _(Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:tes:[123,234]:[de:fr,gb:us]' ).to_s).must_equal 'sdas:das:jar:tes:[123,234]:[de:fr,gb:us]'
+    _(Maven::Tools::Artifact.from_coordinate( 'sdas:das:jar:[123,234]:[de:fr,gb:us]' ).to_s).must_equal 'sdas:das:jar:[123,234]:[de:fr,gb:us]'
   end
 
   it 'should setup artifact' do
-    Maven::Tools::Artifact.new( "sdas", "das", "jar", "123", "tes" ).to_s.must_equal 'sdas:das:jar:tes:123'
-    Maven::Tools::Artifact.new( "sdas", "das", "jar", "123" ).to_s.must_equal 'sdas:das:jar:123'
-    Maven::Tools::Artifact.new( "sdas.asd", "das", "jar", "123", ["fds:fre"] ).to_s.must_equal 'sdas.asd:das:jar:123:[fds:fre]'
-    Maven::Tools::Artifact.new( "sdas.asd", "das", "jar","123",  "bla", ["fds:fre", "ferf:de"] ).to_s.must_equal 'sdas.asd:das:jar:bla:123:[fds:fre,ferf:de]'
-    Maven::Tools::Artifact.new( "sdas.asd", "das", "jar", "123", "blub", ["fds:fre", "ferf:de"] ).to_s.must_equal 'sdas.asd:das:jar:blub:123:[fds:fre,ferf:de]'
+    _(Maven::Tools::Artifact.new( "sdas", "das", "jar", "123", "tes" ).to_s).must_equal 'sdas:das:jar:tes:123'
+    _(Maven::Tools::Artifact.new( "sdas", "das", "jar", "123" ).to_s).must_equal 'sdas:das:jar:123'
+    _(Maven::Tools::Artifact.new( "sdas.asd", "das", "jar", "123", ["fds:fre"] ).to_s).must_equal 'sdas.asd:das:jar:123:[fds:fre]'
+    _(Maven::Tools::Artifact.new( "sdas.asd", "das", "jar","123",  "bla", ["fds:fre", "ferf:de"] ).to_s).must_equal 'sdas.asd:das:jar:bla:123:[fds:fre,ferf:de]'
+    _(Maven::Tools::Artifact.new( "sdas.asd", "das", "jar", "123", "blub", ["fds:fre", "ferf:de"] ).to_s).must_equal 'sdas.asd:das:jar:blub:123:[fds:fre,ferf:de]'
   end
 
   it 'should convert ruby version contraints - gems' do
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '=1' ).to_s.must_equal 'rubygems:asd:gem:[1,1.0.0.0.0.1)'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '>=1' ).to_s.must_equal 'rubygems:asd:gem:[1,)'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<=1' ).to_s.must_equal 'rubygems:asd:gem:[0,1]'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '>1' ).to_s.must_equal 'rubygems:asd:gem:(1,)'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<1' ).to_s.must_equal 'rubygems:asd:gem:[0,1)'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '!=1' ).to_s.must_equal 'rubygems:asd:gem:(1,)'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<2', '>1' ).to_s.must_equal 'rubygems:asd:gem:(1,2)'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<=2', '>1' ).to_s.must_equal 'rubygems:asd:gem:(1,2]'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<2', '>=1' ).to_s.must_equal 'rubygems:asd:gem:[1,2)'
-    Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<=2', '>=1' ).to_s.must_equal 'rubygems:asd:gem:[1,2]'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '=1' ).to_s).must_equal 'rubygems:asd:gem:[1,1.0.0.0.0.1)'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '>=1' ).to_s).must_equal 'rubygems:asd:gem:[1,)'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<=1' ).to_s).must_equal 'rubygems:asd:gem:[0,1]'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '>1' ).to_s).must_equal 'rubygems:asd:gem:(1,)'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<1' ).to_s).must_equal 'rubygems:asd:gem:[0,1)'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '!=1' ).to_s).must_equal 'rubygems:asd:gem:(1,)'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<2', '>1' ).to_s).must_equal 'rubygems:asd:gem:(1,2)'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<=2', '>1' ).to_s).must_equal 'rubygems:asd:gem:(1,2]'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<2', '>=1' ).to_s).must_equal 'rubygems:asd:gem:[1,2)'
+    _(Maven::Tools::Artifact.from( :gem, 'rubygems:asd', '<=2', '>=1' ).to_s).must_equal 'rubygems:asd:gem:[1,2]'
   end
 
   it 'should convert ruby version contraints - jars' do
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '=1' ).to_s.must_equal 'org.something:asd:jar:[1,1.0.0.0.0.1)'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '>=1' ).to_s.must_equal 'org.something:asd:jar:[1,)'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=1' ).to_s.must_equal 'org.something:asd:jar:[0,1]'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '>1' ).to_s.must_equal 'org.something:asd:jar:(1,)'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<1' ).to_s.must_equal 'org.something:asd:jar:[0,1)'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '!=1' ).to_s.must_equal 'org.something:asd:jar:(1,)'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<2', '>1' ).to_s.must_equal 'org.something:asd:jar:(1,2)'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=2', '>1' ).to_s.must_equal 'org.something:asd:jar:(1,2]'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<2', '>=1' ).to_s.must_equal 'org.something:asd:jar:[1,2)'
-    Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=2', '>=1' ).to_s.must_equal 'org.something:asd:jar:[1,2]'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '=1' ).to_s).must_equal 'org.something:asd:jar:[1,1.0.0.0.0.1)'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '>=1' ).to_s).must_equal 'org.something:asd:jar:[1,)'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=1' ).to_s).must_equal 'org.something:asd:jar:[0,1]'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '>1' ).to_s).must_equal 'org.something:asd:jar:(1,)'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<1' ).to_s).must_equal 'org.something:asd:jar:[0,1)'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '!=1' ).to_s).must_equal 'org.something:asd:jar:(1,)'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<2', '>1' ).to_s).must_equal 'org.something:asd:jar:(1,2)'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=2', '>1' ).to_s).must_equal 'org.something:asd:jar:(1,2]'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<2', '>=1' ).to_s).must_equal 'org.something:asd:jar:[1,2)'
+    _(Maven::Tools::Artifact.from( :jar, 'org.something:asd', '<=2', '>=1' ).to_s).must_equal 'org.something:asd:jar:[1,2]'
   end  
 
   it 'passes in scope to artifact' do
     a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1' )
-    a.to_s.must_equal 'org.something:asd:jar:1'
-    a[ :scope ].must_be_nil
+    _(a.to_s).must_equal 'org.something:asd:jar:1'
+    _(a[ :scope ]).must_be_nil
     a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1', :scope => :provided )
-    a.to_s.must_equal 'org.something:asd:jar:1'
-    a[ :scope ].must_equal :provided
+    _(a.to_s).must_equal 'org.something:asd:jar:1'
+    _(a[ :scope ]).must_equal :provided
   end
   it 'passes in exclusions to artifact' do
     a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1' )
-    a.to_s.must_equal 'org.something:asd:jar:1'
-    a[ :exclusions ].must_be_nil
+    _(a.to_s).must_equal 'org.something:asd:jar:1'
+    _(a[ :exclusions ]).must_be_nil
     a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1', :exclusions => ["org.something:dsa"] )
-    a.to_s.must_equal 'org.something:asd:jar:1:[org.something:dsa]'
-    a[ :exclusions ].must_equal [ 'org.something:dsa' ]
+    _(a.to_s).must_equal 'org.something:asd:jar:1:[org.something:dsa]'
+    _(a[ :exclusions ]).must_equal [ 'org.something:dsa' ]
     a = Maven::Tools::Artifact.from( :jar, 'org.something:asd', '1', :exclusions => ["org.something:dsa", "org.anything:qwe"] )
-    a.to_s.must_equal 'org.something:asd:jar:1:[org.something:dsa,org.anything:qwe]'
-    a[ :exclusions ].must_equal [ 'org.something:dsa', 'org.anything:qwe' ]
+    _(a.to_s).must_equal 'org.something:asd:jar:1:[org.something:dsa,org.anything:qwe]'
+    _(a[ :exclusions ]).must_equal [ 'org.something:dsa', 'org.anything:qwe' ]
   end
 end

data/spec/coordinate_spec.rb

@@ -9,75 +9,75 @@ describe Maven::Tools::Coordinate do
   subject { A.new }
 
   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"
-    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-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('~>0').must_equal "[0,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)"
-    subject.to_version('>1.2', '<=2.0').must_equal "(1.2,2.0]"
+    _(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"
+    _(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-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('~>0')).must_equal "[0,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)"
+    _(subject.to_version('>1.2', '<=2.0')).must_equal "(1.2,2.0]"
   end
   
   it 'should keep maven version and ranges as they are' do
-    subject.to_version('1.2.3').must_equal "1.2.3"
-    subject.to_version('(1,2)').must_equal "(1,2)"
-    subject.to_version('[1,2)').must_equal "[1,2)"
-    subject.to_version('(1,2]').must_equal "(1,2]"
-    subject.to_version('[1,2]').must_equal "[1,2]"
+    _(subject.to_version('1.2.3')).must_equal "1.2.3"
+    _(subject.to_version('(1,2)')).must_equal "(1,2)"
+    _(subject.to_version('[1,2)')).must_equal "[1,2)"
+    _(subject.to_version('(1,2]')).must_equal "(1,2]"
+    _(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]"
+    _(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
-    subject.to_coordinate('jar "a:b" # bla').must_equal "a:b:jar:[0,)"
-    subject.to_coordinate("pom 'b:c', '!=2.3.4'").must_equal "b:c:pom:(2.3.4,)"
-    subject.to_coordinate('jar "c:d", "2.3.4"').must_equal "c:d:jar:2.3.4"
-    subject.to_coordinate("jar 'd:e', '~>1.8.2'").must_equal "d:e:jar:[1.8.2,1.8.99999]"
-    subject.to_coordinate('pom "f:g", ">1.2", "<=2.0"').must_equal "f:g:pom:(1.2,2.0]"
-    subject.to_coordinate('pom "e:f", "[1.8,1.9.9)"').must_equal "e:f:pom:[1.8,1.9.9)"
-    subject.to_coordinate('pom "e:f", "(1.8,1.9.9)"').must_equal "e:f:pom:(1.8,1.9.9)"
-    subject.to_coordinate('pom "e:f", "[1.8, 1.9.9]"').must_equal "e:f:pom:[1.8,1.9.9]"
+    _(subject.to_coordinate('something "a:b"')).must_be_nil
+    _(subject.to_coordinate('#jar "a:b"')).must_be_nil
+    _(subject.to_coordinate('jar "a:b" # bla')).must_equal "a:b:jar:[0,)"
+    _(subject.to_coordinate("pom 'b:c', '!=2.3.4'")).must_equal "b:c:pom:(2.3.4,)"
+    _(subject.to_coordinate('jar "c:d", "2.3.4"')).must_equal "c:d:jar:2.3.4"
+    _(subject.to_coordinate("jar 'd:e', '~>1.8.2'")).must_equal "d:e:jar:[1.8.2,1.8.99999]"
+    _(subject.to_coordinate('pom "f:g", ">1.2", "<=2.0"')).must_equal "f:g:pom:(1.2,2.0]"
+    _(subject.to_coordinate('pom "e:f", "[1.8,1.9.9)"')).must_equal "e:f:pom:[1.8,1.9.9)"
+    _(subject.to_coordinate('pom "e:f", "(1.8,1.9.9)"')).must_equal "e:f:pom:(1.8,1.9.9)"
+    _(subject.to_coordinate('pom "e:f", "[1.8, 1.9.9]"')).must_equal "e:f:pom:[1.8,1.9.9]"
   end
 
   it 'should support classifiers' do
-    subject.to_coordinate('something "a:b:jdk15"').must_be_nil
-    subject.to_coordinate('#jar "a:b:jdk15"').must_be_nil
-    subject.to_coordinate('jar "a:b:jdk15" # bla').must_equal "a:b:jar:jdk15:[0,)"
-    subject.to_coordinate("pom 'b:c:jdk15', '!=2.3.4'").must_equal "b:c:pom:jdk15:(2.3.4,)"
-    subject.to_coordinate('jar "c:d:jdk15", "2.3.4"').must_equal "c:d:jar:jdk15:2.3.4"
-    subject.to_coordinate("jar 'd:e:jdk15', '~>1.8.2'").must_equal "d:e:jar:jdk15:[1.8.2,1.8.99999]"
-    subject.to_coordinate('pom "f:g:jdk15", ">1.2", "<=2.0"').must_equal "f:g:pom:jdk15:(1.2,2.0]"
-    subject.to_coordinate('pom "e:f:jdk15", "[1.8,1.9.9)"').must_equal "e:f:pom:jdk15:[1.8,1.9.9)"
-    subject.to_coordinate('pom "e:f:jdk15", "(1.8,1.9.9)"').must_equal "e:f:pom:jdk15:(1.8,1.9.9)"
-    subject.to_coordinate('pom "e:f:jdk15", "[1.8, 1.9.9]"').must_equal "e:f:pom:jdk15:[1.8,1.9.9]"
+    _(subject.to_coordinate('something "a:b:jdk15"')).must_be_nil
+    _(subject.to_coordinate('#jar "a:b:jdk15"')).must_be_nil
+    _(subject.to_coordinate('jar "a:b:jdk15" # bla')).must_equal "a:b:jar:jdk15:[0,)"
+    _(subject.to_coordinate("pom 'b:c:jdk15', '!=2.3.4'")).must_equal "b:c:pom:jdk15:(2.3.4,)"
+    _(subject.to_coordinate('jar "c:d:jdk15", "2.3.4"')).must_equal "c:d:jar:jdk15:2.3.4"
+    _(subject.to_coordinate("jar 'd:e:jdk15', '~>1.8.2'")).must_equal "d:e:jar:jdk15:[1.8.2,1.8.99999]"
+    _(subject.to_coordinate('pom "f:g:jdk15", ">1.2", "<=2.0"')).must_equal "f:g:pom:jdk15:(1.2,2.0]"
+    _(subject.to_coordinate('pom "e:f:jdk15", "[1.8,1.9.9)"')).must_equal "e:f:pom:jdk15:[1.8,1.9.9)"
+    _(subject.to_coordinate('pom "e:f:jdk15", "(1.8,1.9.9)"')).must_equal "e:f:pom:jdk15:(1.8,1.9.9)"
+    _(subject.to_coordinate('pom "e:f:jdk15", "[1.8, 1.9.9]"')).must_equal "e:f:pom:jdk15:[1.8,1.9.9]"
   end
 
   it 'supports declarations with scope' do
-    subject.to_split_coordinate_with_scope('jar rubygems:ruby-maven, ~> 3.1.1.0, :scope => :provided').must_equal [:provided, "rubygems", "ruby-maven", "jar", "[3.1.1.0,3.1.1.99999]"]
-    subject.to_split_coordinate_with_scope("jar 'rubygems:ruby-maven', '~> 3.1.1.0', :scope => :test").must_equal [:test, "rubygems", "ruby-maven", "jar", "[3.1.1.0,3.1.1.99999]"]
+    _(subject.to_split_coordinate_with_scope('jar rubygems:ruby-maven, ~> 3.1.1.0, :scope => :provided')).must_equal [:provided, "rubygems", "ruby-maven", "jar", "[3.1.1.0,3.1.1.99999]"]
+    _(subject.to_split_coordinate_with_scope("jar 'rubygems:ruby-maven', '~> 3.1.1.0', :scope => :test")).must_equal [:test, "rubygems", "ruby-maven", "jar", "[3.1.1.0,3.1.1.99999]"]
   end
 end

data/spec/dsl/gemspec_spec.rb

@@ -30,21 +30,21 @@ describe Maven::Tools::DSL::Gemspec do
     subject.new parent
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( GemspecFile.read( 'maven-tools.xml', 'maven-tools'  ) )
+    _(xml).must_equal( GemspecFile.read( 'maven-tools.xml', 'maven-tools'  ) )
   end
 
   it 'evals maven_tools.gemspec from yaml' do
     subject.new parent, 'maven-tools.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( GemspecFile.read( 'maven-tools.xml', 'gemspec_spec' ) )
+    _(xml).must_equal( GemspecFile.read( 'maven-tools.xml', 'gemspec_spec' ) )
   end
 
   it 'evals gemspec with jar and pom dependencies' do
     subject.new parent, 'jars_and_poms.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( GemspecFile.read( 'jars_and_poms.xml',
+    _(xml).must_equal( GemspecFile.read( 'jars_and_poms.xml',
                                   'gemspec_spec' ) )
   end
 
@@ -52,7 +52,7 @@ describe Maven::Tools::DSL::Gemspec do
     subject.new parent, :name => 'jars_and_poms.gemspec', :include_jars => true
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( GemspecFile.read( 'jars_and_poms_include_jars.xml',
+    _(xml).must_equal( GemspecFile.read( 'jars_and_poms_include_jars.xml',
                                   'gemspec_spec' ) )
   end
 end

data/spec/dsl/jarfile_lock_spec.rb

@@ -9,29 +9,29 @@ describe Maven::Tools::DSL::JarfileLock do
 
   it 'loads legacy Jarfile.lock' do
     lock = subject.new( base + '.legacy' )
-    lock.coordinates( :test ).size.must_equal 0
-    lock.coordinates.size.must_equal 52
+    _(lock.coordinates( :test ).size).must_equal 0
+    _(lock.coordinates.size).must_equal 52
   end
 
   it 'loads Jarfile.lock' do
     lock = subject.new( base )
-    lock.coordinates( :test ).size.must_equal 7
-    lock.coordinates.size.must_equal 45
+    _(lock.coordinates( :test ).size).must_equal 7
+    _(lock.coordinates.size).must_equal 45
   end
 
   it 'tests existence' do
     lock = subject.new( base )
     ( lock.coordinates( :test ) + lock.coordinates ).each do |c|
-      lock.exists?( c ).must_equal true
-      lock.exists?( c + ".bla" ).must_equal false
+      _(lock.exists?( c )).must_equal true
+      _(lock.exists?( c + ".bla" )).must_equal false
     end
   end
 
   it 'tests locked' do
     lock = subject.new( base )
     ( lock.coordinates( :test ) + lock.coordinates ).each do |c|
-      lock.locked?( c ).must_equal true
-      lock.locked?( c + ".bla" ).must_equal true
+      _(lock.locked?( c )).must_equal true
+      _(lock.locked?( c + ".bla" )).must_equal true
     end
   end
 
@@ -45,8 +45,8 @@ describe Maven::Tools::DSL::JarfileLock do
                               :runtime => [ 'huffle:puffle:321' ] } )
       lock.dump
       lock = subject.new( file )
-      lock.coordinates.must_equal ['huffle:puffle:321']
-      lock.coordinates( :test ).must_equal ['bla:blas:123']    
+      _(lock.coordinates).must_equal ['huffle:puffle:321']
+      _(lock.coordinates( :test )).must_equal ['bla:blas:123']    
     ensure
       FileUtils.rm_f file_lock
     end
@@ -57,43 +57,43 @@ describe Maven::Tools::DSL::JarfileLock do
 
     lock.replace( { :test => [ 'bla:blas:123' ],
                     :runtime => [ 'huffle:puffle:321' ] } )
-    lock.coordinates.must_equal ['huffle:puffle:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.coordinates).must_equal ['huffle:puffle:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
 
     lock.replace( { :runtime => [ 'huffle:puffle:321' ] } )
-    lock.coordinates.must_equal ['huffle:puffle:321']
-    lock.coordinates( :test ).must_equal [] 
+    _(lock.coordinates).must_equal ['huffle:puffle:321']
+    _(lock.coordinates( :test )).must_equal [] 
 
     lock.replace( { :test => [ 'bla:blas:123' ]} )
-    lock.coordinates.must_equal []
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.coordinates).must_equal []
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
   end
 
   it 'can add missing data idempotent' do
     lock = subject.new( 'something' )
 
-    lock.update_unlocked( { :test => [ 'bla:blas:123' ],
-                            :runtime => [ 'huffle:puffle:321' ] } ).must_equal true
-    lock.update_unlocked( { :test => [ 'bla:blas:123' ],
-                            :runtime => [ 'huffle:puffle:321' ] } ).must_equal true
-    lock.coordinates.must_equal ['huffle:puffle:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.update_unlocked( { :test => [ 'bla:blas:123' ],
+                            :runtime => [ 'huffle:puffle:321' ] } )).must_equal true
+    _(lock.update_unlocked( { :test => [ 'bla:blas:123' ],
+                            :runtime => [ 'huffle:puffle:321' ] } )).must_equal true
+    _(lock.coordinates).must_equal ['huffle:puffle:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
 
-    lock.update_unlocked( { :runtime => [ 'huffle:puffle:321' ] } ).must_equal true
-    lock.coordinates.must_equal ['huffle:puffle:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.update_unlocked( { :runtime => [ 'huffle:puffle:321' ] } )).must_equal true
+    _(lock.coordinates).must_equal ['huffle:puffle:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
 
-    lock.update_unlocked( { :runtime => [ 'huffle:puffle2:321' ] } ).must_equal true
-    lock.coordinates.must_equal ['huffle:puffle:321', 'huffle:puffle2:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.update_unlocked( { :runtime => [ 'huffle:puffle2:321' ] } )).must_equal true
+    _(lock.coordinates).must_equal ['huffle:puffle:321', 'huffle:puffle2:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
 
-    lock.update_unlocked( { :test => [ 'bla:blas:123' ]} ).must_equal true
-    lock.coordinates.must_equal ['huffle:puffle:321', 'huffle:puffle2:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.update_unlocked( { :test => [ 'bla:blas:123' ]} )).must_equal true
+    _(lock.coordinates).must_equal ['huffle:puffle:321', 'huffle:puffle2:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
 
-    lock.update_unlocked( { :test => [ 'bla:bla2:123' ]} ).must_equal true
-    lock.coordinates.must_equal ['huffle:puffle:321', 'huffle:puffle2:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123', 'bla:bla2:123'] 
+    _(lock.update_unlocked( { :test => [ 'bla:bla2:123' ]} )).must_equal true
+    _(lock.coordinates).must_equal ['huffle:puffle:321', 'huffle:puffle2:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123', 'bla:bla2:123'] 
   end
 
   it 'fails add data on version conflict' do
@@ -102,17 +102,17 @@ describe Maven::Tools::DSL::JarfileLock do
     lock.replace( { :test => [ 'bla:blas:123' ],
                     :runtime => [ 'huffle:puffle:321' ] } )
 
-    lock.update_unlocked( { :test => [ 'bla:blas:1233' ],
-                            :runtime => [ 'huffle:puffle:3214' ] } ).must_equal false
-    lock.coordinates.must_equal ['huffle:puffle:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.update_unlocked( { :test => [ 'bla:blas:1233' ],
+                            :runtime => [ 'huffle:puffle:3214' ] } )).must_equal false
+    _(lock.coordinates).must_equal ['huffle:puffle:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
 
-    lock.update_unlocked( { :runtime => [ 'huffle:puffle:3214' ] } ).must_equal false
-    lock.coordinates.must_equal ['huffle:puffle:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.update_unlocked( { :runtime => [ 'huffle:puffle:3214' ] } )).must_equal false
+    _(lock.coordinates).must_equal ['huffle:puffle:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
 
-    lock.update_unlocked( { :test => [ 'bla:blas:1233' ]} ).must_equal false
-    lock.coordinates.must_equal ['huffle:puffle:321']
-    lock.coordinates( :test ).must_equal ['bla:blas:123'] 
+    _(lock.update_unlocked( { :test => [ 'bla:blas:1233' ]} )).must_equal false
+    _(lock.coordinates).must_equal ['huffle:puffle:321']
+    _(lock.coordinates( :test )).must_equal ['bla:blas:123'] 
   end
 end

data/spec/dsl/profile_gemspec_spec.rb

@@ -34,7 +34,7 @@ describe Maven::Tools::DSL::ProfileGemspec do
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
     v = Maven::Tools::VERSION
     v += '-SNAPSHOT' if v =~ /.dev$/
-    xml.must_equal( ProfileGemspecFile.read( 'maven-tools.xml', 'maven-tools',
+    _(xml).must_equal( ProfileGemspecFile.read( 'maven-tools.xml', 'maven-tools',
                                   v ) )
   end
 
@@ -42,28 +42,28 @@ describe Maven::Tools::DSL::ProfileGemspec do
     subject.new parent, 'maven-tools.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( ProfileGemspecFile.read( 'maven-tools.xml', 'profile_gemspec_spec' ) )
+    _(xml).must_equal( ProfileGemspecFile.read( 'maven-tools.xml', 'profile_gemspec_spec' ) )
   end
 
   it 'evals maven_tools.gemspec from yaml no gem dependencies' do
     subject.new parent, 'maven-tools.gemspec', :no_gems => true
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( ProfileGemspecFile.read( 'no_gems.xml', 'gemspec_spec' ) )
+    _(xml).must_equal( ProfileGemspecFile.read( 'no_gems.xml', 'gemspec_spec' ) )
   end
 
   it 'evals snapshot.gemspec' do
     subject.new parent, 'snapshot.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( ProfileGemspecFile.read( 'snapshot.xml', 'snapshot', '1.a-SNAPSHOT' ) )
+    _(xml).must_equal( ProfileGemspecFile.read( 'snapshot.xml', 'snapshot', '1.a-SNAPSHOT' ) )
   end
 
   it 'evals gemspec with jar and pom dependencies' do
     subject.new parent, 'jars_and_poms.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( ProfileGemspecFile.read( 'jars_and_poms.xml',
+    _(xml).must_equal( ProfileGemspecFile.read( 'jars_and_poms.xml',
                                   'gemspec_spec' ) )
   end
 
@@ -71,7 +71,7 @@ describe Maven::Tools::DSL::ProfileGemspec do
     subject.new parent, :name => 'jars_and_poms.gemspec', :include_jars => true
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( ProfileGemspecFile.read( 'jars_and_poms_include_jars.xml',
+    _(xml).must_equal( ProfileGemspecFile.read( 'jars_and_poms_include_jars.xml',
                                              'gemspec_spec' ) )
   end
 
@@ -79,6 +79,6 @@ describe Maven::Tools::DSL::ProfileGemspec do
     subject.new parent, 'unknown_license.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( ProfileGemspecFile.read( 'unknown_license.xml', 'gemspec_spec' ) )
+    _(xml).must_equal( ProfileGemspecFile.read( 'unknown_license.xml', 'gemspec_spec' ) )
   end
 end

data/spec/dsl/project_gemspec_spec.rb

@@ -34,7 +34,7 @@ describe Maven::Tools::DSL::ProjectGemspec do
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
     v = Maven::Tools::VERSION
     v += '-SNAPSHOT' if v =~ /.[[:alpha:]][[:alnum:]]*$/
-    xml.must_equal( XmlFile.read( 'maven-tools.xml', 'maven-tools',
+    _(xml).must_equal( XmlFile.read( 'maven-tools.xml', 'maven-tools',
                                   v ) )
   end
 
@@ -42,35 +42,35 @@ describe Maven::Tools::DSL::ProjectGemspec do
     subject.new parent, 'maven-tools.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( XmlFile.read( 'maven-tools.xml', 'gemspec_spec' ) )
+    _(xml).must_equal( XmlFile.read( 'maven-tools.xml', 'gemspec_spec' ) )
   end
 
   it 'evals maven_tools.gemspec from yaml with profile' do
     subject.new parent, 'maven-tools.gemspec', :profile => :hidden
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( XmlFile.read( 'profile.xml', 'gemspec_spec' ) )
+    _(xml).must_equal( XmlFile.read( 'profile.xml', 'gemspec_spec' ) )
   end
 
   it 'evals maven_tools.gemspec from yaml no gem dependencies' do
     subject.new parent, 'maven-tools.gemspec', :no_gems => true
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( XmlFile.read( 'no_gems.xml', 'gemspec_spec' ) )
+    _(xml).must_equal( XmlFile.read( 'no_gems.xml', 'gemspec_spec' ) )
   end
 
   it 'evals snapshot.gemspec' do
     subject.new parent, 'snapshot.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( XmlFile.read( 'snapshot.xml', 'snapshot', '1.a-SNAPSHOT' ) )
+    _(xml).must_equal( XmlFile.read( 'snapshot.xml', 'snapshot', '1.a-SNAPSHOT' ) )
   end
 
   it 'evals gemspec with jar and pom dependencies' do
     subject.new parent, 'jars_and_poms.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( XmlFile.read( 'jars_and_poms.xml',
+    _(xml).must_equal( XmlFile.read( 'jars_and_poms.xml',
                                   'gemspec_spec' ) )
   end
 
@@ -78,7 +78,7 @@ describe Maven::Tools::DSL::ProjectGemspec do
     subject.new parent, :name => 'jars_and_poms.gemspec', :include_jars => true
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( XmlFile.read( 'jars_and_poms_include_jars.xml',
+    _(xml).must_equal( XmlFile.read( 'jars_and_poms_include_jars.xml',
                                   'gemspec_spec' ) )
   end
 
@@ -91,7 +91,7 @@ describe Maven::Tools::DSL::ProjectGemspec do
     subject.new parent, :name => 'extended.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( XmlFile.read( 'extended.xml',
+    _(xml).must_equal( XmlFile.read( 'extended.xml',
                                   'gemspec_spec' ) )
   end
 
@@ -99,6 +99,6 @@ describe Maven::Tools::DSL::ProjectGemspec do
     subject.new parent, :name => 'unknown_license.gemspec'
     xml = ""
     Maven::Tools::Visitor.new( xml ).accept_project( parent.model )
-    xml.must_equal( XmlFile.read( 'unknown_license.xml', 'gemspec_spec') )
+    _(xml).must_equal( XmlFile.read( 'unknown_license.xml', 'gemspec_spec') )
   end
 end

data/spec/gemspec_dependencies_spec.rb

@@ -25,9 +25,9 @@ describe Maven::Tools::GemspecDependencies do
   subject { Maven::Tools::GemspecDependencies.new( spec ) } 
 
   it 'should setup artifact' do
-    subject.runtime.must_equal ["rubygems:thor:[0.14.6,2.0)", "rubygems:maven-tools:[0.32.3,0.32.99999]"]
-    subject.development.must_equal ["rubygems:minitest:[5.3,5.99999]", "rubygems:rake:[10.0,10.99999]"]
-    subject.java_runtime.must_equal [ ["sdas", "das", "jar", "tes", "123"],
+    _(subject.runtime).must_equal ["rubygems:thor:[0.14.6,2.0)", "rubygems:maven-tools:[0.32.3,0.32.99999]"]
+    _(subject.development).must_equal ["rubygems:minitest:[5.3,5.99999]", "rubygems:rake:[10.0,10.99999]"]
+    _(subject.java_runtime).must_equal [ ["sdas", "das", "jar", "tes", "123"],
                            ["sdas", "das", "jar", "123"],
                            ["sdas.asd", "das", "jar", "123", ["fds:fre"]],
                            ["sdas.asd", "das", "jar", "bla", "123", ["fds:fre", "ferf:de"]],
@@ -37,7 +37,7 @@ describe Maven::Tools::GemspecDependencies do
                            ["de.sdas.asd", "das", "jar", "123", ["fds:fre"]],
                            ["de.sdas.asd", "das", "jar", "bla", "123", ["fds:fre", "ferf:de"]],
                            ["de.sdas.asd", "das", "jar", "blub", "123", ["fds:fre","ferf:de"]] ]
-    subject.java_dependencies.must_equal [ [:compile, "sdas", "das", "jar", "tes", "123"],
+    _(subject.java_dependencies).must_equal [ [:compile, "sdas", "das", "jar", "tes", "123"],
                            [:compile, "sdas", "das", "jar", "123"],
                            [:compile, "sdas.asd", "das", "jar", "123", ["fds:fre"]],
                            [:compile, "sdas.asd", "das", "jar", "bla", "123", ["fds:fre", "ferf:de"]],

data/spec/jarfile_spec.rb

@@ -38,7 +38,7 @@ describe Maven::Tools::Jarfile do
 
   it 'generates lockfile' do
     subject.generate_lockfile(%w( a b c d e f ruby.bundler:bla))
-    File.read(jfile_lock).must_equal <<-EOF
+    _(File.read(jfile_lock)).must_equal <<-EOF
 a
 b
 c
@@ -55,10 +55,10 @@ a:b:pom:3
 a:c:jar:1
 EOF
     end
-    subject.locked.must_equal ["a:b:pom:3", "a:c:jar:1"]
-    subject.locked?("a:b:pom:321").must_equal true
-    subject.locked?("a:b:jar:321").must_equal true
-    subject.locked?("a:d:jar:432").must_equal false
+    _(subject.locked).must_equal ["a:b:pom:3", "a:c:jar:1"]
+    _(subject.locked?("a:b:pom:321")).must_equal true
+    _(subject.locked?("a:b:jar:321")).must_equal true
+    _(subject.locked?("a:d:jar:432")).must_equal false
   end
 
   it 'populate repositories' do
@@ -70,11 +70,11 @@ source "http://example.org/repo/3"
 EOF
     end
     subject.populate_unlocked container
-    container.repositories.size.must_equal 3
-    container.artifacts.size.must_equal 0
-    container.repositories[0].must_equal "first"
-    container.repositories[1].must_equal "second"
-    container.repositories[2].must_equal "http://example.org/repo/3"
+    _(container.repositories.size).must_equal 3
+    _(container.artifacts.size).must_equal 0
+    _(container.repositories[0]).must_equal "first"
+    _(container.repositories[1]).must_equal "second"
+    _(container.repositories[2]).must_equal "http://example.org/repo/3"
   end
 
   it 'populate artifacts without locked' do
@@ -85,10 +85,10 @@ pom 'x:y', '987'
 EOF
     end
     subject.populate_unlocked container
-    container.repositories.size.must_equal 0
-    container.artifacts.size.must_equal 2
-    container.artifacts[0].to_s.must_equal "a:b:jar:123"
-    container.artifacts[1].to_s.must_equal "x:y:pom:987"
+    _(container.repositories.size).must_equal 0
+    _(container.artifacts.size).must_equal 2
+    _(container.artifacts[0].to_s).must_equal "a:b:jar:123"
+    _(container.artifacts[1].to_s).must_equal "x:y:pom:987"
   end
 
   it 'populate artifacts with locked' do
@@ -105,9 +105,9 @@ EOF
     end
     
     subject.populate_unlocked container
-    container.repositories.size.must_equal 0
-    container.artifacts.size.must_equal 1
-    container.artifacts[0].to_s.must_equal "x:y:pom:987"
+    _(container.repositories.size).must_equal 0
+    _(container.artifacts.size).must_equal 1
+    _(container.artifacts[0].to_s).must_equal "x:y:pom:987"
   end
 
   it 'populate locked artifacts' do
@@ -118,8 +118,8 @@ EOF
     end
     
     subject.populate_locked container
-    container.repositories.size.must_equal 0
-    container.artifacts.size.must_equal 1
-    container.artifacts[0].to_s.must_equal "a:b:jar:432"
+    _(container.repositories.size).must_equal 0
+    _(container.artifacts.size).must_equal 1
+    _(container.artifacts[0].to_s).must_equal "a:b:jar:432"
   end
 end

data/spec/pom_spec.rb

@@ -9,7 +9,7 @@ describe Maven::Tools::POM do
       it "should convert #{dir}" do
         pom = Maven::Tools::POM.new( dir )
         file = File.join( dir, 'pom.xml' )
-        file = File.join( File.dirname( dir ), 'pom.xml' ) unless File.exists? file
+        file = File.join( File.dirname( dir ), 'pom.xml' ) unless File.exist? file
         pom_xml = File.read( file )
         pom_xml.sub!( /<!--(.|\n)*-->\n/, '' )
         pom_xml.sub!( /<?.*?>\n/, '' )
@@ -18,7 +18,7 @@ describe Maven::Tools::POM do
         pom_xml.gsub!( /tesla-polyglot/, 'polyglot' )
         pom_xml.gsub!( /${tesla.version}/, Maven::Tools::VERSIONS[ :polyglot_version ] )
 
-        pom.to_s.must_equal pom_xml
+        _(pom.to_s).must_equal pom_xml
       end
     end
   end

metadata

@@ -1,52 +1,51 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Christian Meier
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2025-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: virtus
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
-  name: minitest
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -317,7 +316,6 @@ homepage: http://github.com/torquebox/maven-tools
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -332,8 +330,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 3.6.3
 specification_version: 4
 summary: helpers for maven related tasks
 test_files: