From 19db1a7d2a2d3648d2a7affa6353513105b5b44e Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Mon, 29 Jun 2020 08:52:33 +0100
Subject: [PATCH] FIX: Correct version comparison logic when comparing stable
 to beta (#10135)

* FIX: Correct version comparison logic when comparing stable to beta

For example, version 1.3.0 should be considered higher than 1.3.0.beta3. So `Discourse.has_needed_version?('1.3.0', '1.3.0.beta3')` should return true

* Switch to use Gem::Version to compare versions
---
 lib/version.rb                  | 18 +-----------------
 spec/components/version_spec.rb | 10 +++++++++-
 2 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/lib/version.rb b/lib/version.rb
index 23f654a3b31..c577055ff52 100644
--- a/lib/version.rb
+++ b/lib/version.rb
@@ -16,22 +16,6 @@ module Discourse
   end
 
   def self.has_needed_version?(current, needed)
-    current_split = current.split('.')
-    needed_split = needed.split('.')
-
-    (0..[current_split.size, needed_split.size].max).each do |idx|
-      current_str = current_split[idx] || ''
-
-      c0 = (needed_split[idx] || '').sub('beta', '').to_i
-      c1 = (current_str || '').sub('beta', '').to_i
-
-      # beta is less than stable
-      return false if current_str.include?('beta') && (c0 == 0) && (c1 > 0)
-
-      return true if c1 > c0
-      return false if c0 > c1
-    end
-
-    true
+    Gem::Version.new(current) >= Gem::Version.new(needed)
   end
 end
diff --git a/spec/components/version_spec.rb b/spec/components/version_spec.rb
index 5017983c163..255ef64c1b0 100644
--- a/spec/components/version_spec.rb
+++ b/spec/components/version_spec.rb
@@ -30,12 +30,20 @@ describe Discourse::VERSION do
       expect(Discourse.has_needed_version?('1.12.0', '2.12.5')).to eq(false)
     end
 
-    it "works for beta comparisons" do
+    it "works for beta comparisons when current_version is beta" do
       expect(Discourse.has_needed_version?('1.3.0.beta3', '1.2.9')).to eq(true)
       expect(Discourse.has_needed_version?('1.3.0.beta3', '1.3.0.beta1')).to eq(true)
       expect(Discourse.has_needed_version?('1.3.0.beta3', '1.3.0.beta4')).to eq(false)
       expect(Discourse.has_needed_version?('1.3.0.beta3', '1.3.0')).to eq(false)
     end
 
+    it "works for beta comparisons when needed_version is beta" do
+      expect(Discourse.has_needed_version?('1.2.0', '1.3.0.beta3')).to eq(false)
+      expect(Discourse.has_needed_version?('1.2.9', '1.3.0.beta3')).to eq(false)
+      expect(Discourse.has_needed_version?('1.3.0.beta1', '1.3.0.beta3')).to eq(false)
+      expect(Discourse.has_needed_version?('1.3.0.beta4', '1.3.0.beta3')).to eq(true)
+      expect(Discourse.has_needed_version?('1.3.0', '1.3.0.beta3')).to eq(true)
+    end
+
   end
 end