pompompom 1.1.2 → 1.1.3

data/lib/pompompom.rb

@@ -7,5 +7,5 @@ require 'pompompom/resolver'
 require 'pompompom/config'
 
 module PomPomPom
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
 end

data/lib/pompompom/resolver.rb

@@ -27,7 +27,7 @@ module PomPomPom
     def filter_newest(pom_groups)
       pom_groups.map do |id, poms|
         if poms.size > 1
-          newest = poms.sort { |a, b| a.version <=> b.version }.reverse.first
+          newest = find_newest_version(poms)
           @logger.warn(%(Warning: multiple versions of #{id} were required, using the newest required version (#{newest.version})))
           newest
         else
@@ -35,6 +35,32 @@ module PomPomPom
         end
       end.flatten
     end
+    
+    def find_newest_version(poms)
+      sorted = poms.sort do |a, b| 
+        a_version = a.version.sub(/-\w+$/, '').split('.').map(&:to_i)
+        b_version = b.version.sub(/-\w+$/, '').split('.').map(&:to_i)
+        
+        while a_version.size < b_version.size
+          a_version << 0
+        end
+        
+        while a_version.size > b_version.size
+          b_version << 0
+        end
+        
+        cmp = 0
+
+        a_version.zip(b_version).each do |(an, bn)|
+          cmp = an <=> bn
+          break unless cmp == 0
+        end
+
+        cmp
+      end
+      
+      sorted.reverse.first
+    end
   
     def group_by_artifact(poms)
       poms.inject({}) do |acc, pom|

data/pompompom.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pompompom}
-  s.version = "1.1.2"
+  s.version = "1.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Theo Hultberg"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-26}
   s.default_executable = %q{pompompom}
   s.description = %q{Ruby dependency manager for Maven repository artifacts}
   s.email = %q{theo@iconara.net}
@@ -63,6 +63,8 @@ Gem::Specification.new do |s|
      "spec/resources/repository/com/example/test-optional/1.0/test-optional-1.0.jar",
      "spec/resources/repository/com/example/test-optional/1.0/test-optional-1.0.pom",
      "spec/resources/repository/com/example/test-parent/1.0/test-parent-1.0.pom",
+     "spec/resources/repository/com/example/test/77.7/test-77.7.jar",
+     "spec/resources/repository/com/example/test/77.7/test-77.7.pom",
      "spec/resources/repository/com/example/test/8.8/test-8.8.jar",
      "spec/resources/repository/com/example/test/8.8/test-8.8.pom",
      "spec/resources/repository/com/example/test/9.9/test-9.9.jar",

data/spec/pompompom/resolver_spec.rb

@@ -145,7 +145,8 @@ module PomPomPom
         
         it 'selects the newest dependency if more than one of the same are found' do
           @all_dependencies = @resolver.find_transitive_dependencies(*@dependencies)
-          @all_dependencies.map(&:to_s).should include('com.example:test:9.9')
+          @all_dependencies.map(&:to_s).should include('com.example:test:77.7')
+          @all_dependencies.map(&:to_s).should_not include('com.example:test:9.9')
           @all_dependencies.map(&:to_s).should_not include('com.example:test:8.8')
         end
         
@@ -155,7 +156,7 @@ module PomPomPom
         end
         
         it 'warns if dependencies on multiple versions of an artifact are found' do
-          @logger.should_receive(:warn).with('Warning: multiple versions of com.example:test were required, using the newest required version (9.9)')
+          @logger.should_receive(:warn).with('Warning: multiple versions of com.example:test were required, using the newest required version (77.7)')
           @resolver.find_transitive_dependencies(*@dependencies)
         end
       end

data/spec/resources/repository/com/example/test-abc/1.0/test-abc-1.0.pom

@@ -13,7 +13,7 @@
     <dependency>
       <groupId>com.example</groupId>
       <artifactId>test</artifactId>
-      <version>9.9</version>
+      <version>77.7</version>
     </dependency>
   </dependencies>
 </project>

data/spec/resources/repository/com/example/test/77.7/test-77.7.pom

@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.example</groupId>
+  <artifactId>test</artifactId>
+  <version>77.7</version>
+  <packaging>jar</packaging>
+  <name>Test POM</name>
+  <description>Test POM</description>
+  <url>http://www.example.com</url>
+</project>

data/spec/resources/repository/com/example/test/maven-metadata.xml

@@ -6,6 +6,7 @@
     <versions> 
       <version>8.8</version> 
       <version>9.9</version> 
+      <version>77.7</version> 
     </versions> 
   </versioning> 
 </metadata>

data/tasks/spec.rake

@@ -4,6 +4,7 @@ require 'spec/rake/spectask'
 
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
+  spec.spec_opts << '--backtrace' << '--color'
   spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pompompom
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 1
-  - 2
-  version: 1.1.2
+  - 3
+  version: 1.1.3
 platform: ruby
 authors: 
 - Theo Hultberg
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 +02:00
+date: 2010-08-26 00:00:00 +02:00
 default_executable: pompompom
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,6 +100,8 @@ files:
 - spec/resources/repository/com/example/test-optional/1.0/test-optional-1.0.jar
 - spec/resources/repository/com/example/test-optional/1.0/test-optional-1.0.pom
 - spec/resources/repository/com/example/test-parent/1.0/test-parent-1.0.pom
+- spec/resources/repository/com/example/test/77.7/test-77.7.jar
+- spec/resources/repository/com/example/test/77.7/test-77.7.pom
 - spec/resources/repository/com/example/test/8.8/test-8.8.jar
 - spec/resources/repository/com/example/test/8.8/test-8.8.pom
 - spec/resources/repository/com/example/test/9.9/test-9.9.jar