maven-tools 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c32acffef9376f1171e88e5911f3532ecd7734e1
-  data.tar.gz: 0f9b0bfbed8988dd8ed890f1c831114d266e8571
+  metadata.gz: b0e19d1a856b4e631741ad0ce39566eccc749c75
+  data.tar.gz: 583cc562022e0749ecf88e3c83ac49359becf447
 SHA512:
-  metadata.gz: 719386a880d77b8d9c502144e180636334838b241ad48a79480a2021ede72235c02bdca8781f2803ef76c6dd515c73a490bbd15020be88a192e65af041770291
-  data.tar.gz: d291a79cdc88771a91ab6bed322d10225b89c91156912e017590393d7d7637db3bc50cc51093a7ab8a3fbc3116fee81ad1c9581fc0d33f5800a21e3e5df53ac0
+  metadata.gz: f5f29ed74b6375ec904aa5ff99baaba6936f5005bc5b7df8ff067b87747168a2c4094aa0daedce75c41daa4afbd2cb36bba225364ef1fa9a0410b093e62e20c2
+  data.tar.gz: 608aeec206313fc9c7117703311ea47072e588ad7cca1f7895156e45b50d320a27cfd4e4919ca6fcdba72163ed641347f9d0bbfce3d1eed101ac4fe666fc5f49

data/lib/maven/tools/coordinate.rb

@@ -150,13 +150,13 @@ module Maven
         elsif arg =~ /<=/
           val = arg.sub(/<=\s*/, '')
           [(nil || low), "#{snapshot_version(val)}]"]
+          # treat '!=' the same way as '>' until proper mapping is implemented
+          # see https://maven.apache.org/enforcer/enforcer-rules/versionRanges.html
         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*/, '')
+        elsif arg =~ /[>]/  
+          val = arg.sub(/[>]\s*/, '')
           ["(#{snapshot_version(val)}", (nil || high)]
         elsif arg =~ /</
           val = arg.sub(/<\s*/, '')

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

@@ -139,7 +139,7 @@ module Maven
 
         def other_deps( spec )
           spec.requirements.each do |req|
-            req.sub!( /#.*^/, '' )
+            req = req.sub( /#.*^/, '' )
             method = req.sub(/\s.*$/, '' ).to_sym
             line = req.sub(/^[^\s]*\s/, '' )
             if respond_to? method

data/lib/maven/tools/version.rb

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

data/spec/artifact_spec.rb

@@ -28,8 +28,6 @@ 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]'
@@ -43,8 +41,6 @@ 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]'

data/spec/coordinate_spec.rb

@@ -10,8 +10,6 @@ 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,)"
     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)"
@@ -56,7 +54,6 @@ describe Maven::Tools::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("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]"
@@ -70,7 +67,6 @@ describe Maven::Tools::Coordinate 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("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]"

metadata

@@ -1,59 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: maven-tools
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Christian Meier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-14 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'
-  type: :runtime
+  name: virtus
   prerelease: false
+  type: :runtime
   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'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   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'
-  type: :development
+  name: minitest
   prerelease: false
+  type: :development
   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: []
@@ -318,7 +317,7 @@ homepage: http://github.com/torquebox/maven-tools
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -333,14 +332,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.4.8
+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
@@ -351,13 +354,11 @@ 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
@@ -369,9 +370,8 @@ 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/spec_helper.rb
+- spec/pom.xml
 - 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,7 +426,6 @@ 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