Switch back to patching Gem::Version

Gem::Dependency uses Gem::Version internally, so we need to patch it.

Author: drrb

lib/puppet_library/forge/search_result.rb

@@ -16,7 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'puppet_library/util/patches'
-require 'puppet_library/util/version'
 
 module PuppetLibrary::Forge
     module SearchResult
@@ -47,7 +46,7 @@ def self.combine_search_results(search_results)
         end
 
         def self.max_version(left, right)
-            [PuppetLibrary::Util::Version.new(left), PuppetLibrary::Util::Version.new(right)].max.version
+            [Gem::Version.new(left), Gem::Version.new(right)].max.version
         end
     end
 end

lib/puppet_library/util.rb

@@ -23,4 +23,3 @@ module PuppetLibrary::Util
 require 'puppet_library/util/logging'
 require 'puppet_library/util/patches'
 require 'puppet_library/util/temp_dir'
-require 'puppet_library/util/version'

lib/puppet_library/util/patches.rb

@@ -16,7 +16,25 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'rubygems/package'
-require 'puppet_library/util/version'
+
+# Early versions of Rubygems have problems with version numbers with dashes
+# (e.g. "1.0.0-rc1"). This adds the behaviour or new RG versions to all
+# versions, hopefully without breaking newer versions. In most cases we want to
+# fail silently with bad version numbers so that we don't crash the server
+# because of weird stuff from a remote forge or elsewhere.
+module Gem
+    def Version.new(version)
+        super(version.to_s.gsub("-",".pre."))
+    rescue ArgumentError
+        # If it starts with numbers, use those
+        if version =~ /^\d+(\.\d+)*/
+            super(version[/^\d+(\.\d+)*/])
+        # Somebody's really made a mess of this version number
+        else
+            super("0")
+        end
+    end
+end
 
 class Array
     # Like 'uniq' with a block, but also works on Ruby < 1.9
@@ -39,7 +57,7 @@ def version_sort
     def version_sort_by
         sort_by do |element|
             version = yield(element)
-            PuppetLibrary::Util::Version.new(version)
+            Gem::Version.new(version)
         end
     end
 

lib/puppet_library/util/version.rb

@@ -18,6 +18,25 @@
 require 'spec_helper'
 
 describe 'patches' do
+    describe Gem::Version do
+        describe "#new" do
+            context "when the version number contains a dash" do
+                it "replaces the dash with '.pre.'" do
+                    expect(Gem::Version.new("1.0.0-rc1")).to eq Gem::Version.new("1.0.0.pre.rc1")
+                end
+            end
+            context "when the version number has trailing garbage" do
+                it "uses the numbers at the beginning" do
+                    expect(Gem::Version.new("123 xyz")).to eq Gem::Version.new("123")
+                end
+            end
+            context "when the version is completely garbage" do
+                it "pretends the version number is zero" do
+                    expect(Gem::Version.new("xyz")).to eq Gem::Version.new("0")
+                end
+            end
+        end
+    end
 
     describe Array do
         describe "#unique_by" do