maven-tools 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b742974a17c7cd3cf45392fb776a41f74df4304d
-  data.tar.gz: 8b014df2f65e5a2286401d83b0f31929d645efbe
+  metadata.gz: c32acffef9376f1171e88e5911f3532ecd7734e1
+  data.tar.gz: 0f9b0bfbed8988dd8ed890f1c831114d266e8571
 SHA512:
-  metadata.gz: 2e1768b75ab38044d80f763868564eacb509dac8422f3c106824ac1f8322b10c31ee426111e979893a8441bc50ab069584474a17f80074172e31151b15088971
-  data.tar.gz: c7c08292545673cd50bfb639c9e96fa037ea77c7b8a5d7aafc5da768277a508ce2198da57832f6f659628b824fd472241db515df10881bb487951c2f764cd2bf
+  metadata.gz: 719386a880d77b8d9c502144e180636334838b241ad48a79480a2021ede72235c02bdca8781f2803ef76c6dd515c73a490bbd15020be88a192e65af041770291
+  data.tar.gz: d291a79cdc88771a91ab6bed322d10225b89c91156912e017590393d7d7637db3bc50cc51093a7ab8a3fbc3116fee81ad1c9581fc0d33f5800a21e3e5df53ac0

data/lib/maven/tools/coordinate.rb

@@ -150,7 +150,11 @@ module Maven
         elsif arg =~ /<=/
           val = arg.sub(/<=\s*/, '')
           [(nil || low), "#{snapshot_version(val)}]"]
-          # treat '!' the same way as '>' since maven can not describe such range
+        elsif arg =~ /!=/  
+          val = arg.sub(/!=\s*/, '')
+          ["(#{snapshot_version(val)}", (nil || high)]
+        # treat '!' the same way as '>' since maven can not describe such range
+        # TODO ensure !1 is a legal rubygems constraint  
         elsif arg =~ /[!>]/  
           val = arg.sub(/[!>]\s*/, '')
           ["(#{snapshot_version(val)}", (nil || high)]

data/lib/maven/tools/gemspec_dependencies.rb

@@ -57,8 +57,7 @@ module Maven
           _deps( dep.type ) << "rubygems:#{dep.name}:#{to_version( *versions )}"
         end
         @spec.requirements.each do |req|
-          req.sub!( /#.*^/, '' )
-          coord = to_split_coordinate_with_scope( req )
+          coord = to_split_coordinate_with_scope(req.sub(/#.*^/, ''))
           if coord && coord.size > 1
             _deps( :java ) << coord
           end

data/lib/maven/tools/version.rb

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

data/spec/artifact_spec.rb

@@ -28,7 +28,9 @@ describe Maven::Tools::Artifact do
     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)'
+    # not sure if this legal bundler/rubygems
     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:(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)'
@@ -41,7 +43,9 @@ describe Maven::Tools::Artifact do
     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)'
+    # not sure if this legal bundler/rubygems
     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:(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)'

data/spec/coordinate_spec.rb

@@ -12,6 +12,8 @@ describe Maven::Tools::Coordinate 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,)"
+    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]"
@@ -55,6 +57,7 @@ describe Maven::Tools::Coordinate do
     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("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]"
@@ -68,6 +71,7 @@ describe Maven::Tools::Coordinate do
     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("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]"

metadata

@@ -1,58 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Christian Meier
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-03-29 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:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.3'
-description: adds versions conversion from rubygems to maven and vice versa, ruby DSL for POM (Project Object Model from maven), pom generators, etc
+description: adds versions conversion from rubygems to maven and vice versa, ruby
+  DSL for POM (Project Object Model from maven), pom generators, etc
 email:
 - m.kristian@web.de
 executables: []
@@ -317,7 +318,7 @@ homepage: http://github.com/torquebox/maven-tools
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -332,18 +333,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5.1
+signing_key: 
 specification_version: 4
 summary: helpers for maven related tasks
 test_files:
 - spec/artifact_spec.rb
 - spec/coordinate_spec.rb
-- spec/gemspec_dependencies_spec.rb
-- spec/jarfile_spec.rb
-- spec/pom_spec.rb
-- spec/spec_helper.rb
 - spec/dsl/gemspec_spec.rb
 - spec/dsl/jarfile_lock_spec.rb
 - spec/dsl/profile_gemspec_spec.rb
@@ -354,11 +351,13 @@ test_files:
 - spec/gemfile_with_lock/bouncy-castle-version.rb
 - spec/gemfile_with_source/bouncy-castle-version.rb
 - spec/gemspec/bouncy-castle-version.rb
+- spec/gemspec_dependencies_spec.rb
 - spec/gemspec_in_profile/bouncy-castle-version.rb
 - spec/gemspec_include_jars/bouncy-castle-version.rb
 - spec/gemspec_with_extras/bouncy-castle-version.rb
 - spec/gemspec_with_jars_lock/bouncy-castle-version.rb
 - spec/gemspec_with_source/bouncy-castle-version.rb
+- spec/jarfile_spec.rb
 - spec/pom_from_jarfile/pom.rb
 - spec/pom_from_jarfile_and_empty_lock/pom.rb
 - spec/pom_from_jarfile_and_lock/pom.rb
@@ -370,8 +369,9 @@ test_files:
 - spec/pom_maven_alternative_style/pom.rb
 - spec/pom_maven_hash_style/pom.rb
 - spec/pom_maven_style/pom.rb
+- spec/pom_spec.rb
 - spec/pom_with_execute/pom.rb
-- spec/pom.xml
+- spec/spec_helper.rb
 - spec/dsl/gemspec_spec/jars_and_poms.xml
 - spec/dsl/gemspec_spec/jars_and_poms_include_jars.xml
 - spec/dsl/gemspec_spec/maven-tools.xml
@@ -426,6 +426,7 @@ test_files:
 - spec/gemspec_with_source_and_no_jar/pom.xml
 - spec/mavenfile_jrubyJar/pom.xml
 - spec/mavenfile_jrubyWar/pom.xml
+- spec/pom.xml
 - spec/pom_from_jarfile/pom.xml
 - spec/pom_from_jarfile_and_empty_lock/pom.xml
 - spec/pom_from_jarfile_and_lock/pom.xml