chore: fixup ruby 2.2 support (pact-foundation#93)

aushm · Aug 15, 2021 · 2282622 · 2282622
1 parent 3a75963
commit 2282622
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/lib/pact_broker/client/matrix/abbreviate_version_number.rb b/lib/pact_broker/client/matrix/abbreviate_version_number.rb
@@ -10,9 +10,9 @@ class << self
           def call version_number
             return unless version_number
 
-            return replace_all_git_sha(version_number) if [SEMVER_REGEX, SHA1_REGEX].all?{|r| r.match?(version_number) }
+            return replace_all_git_sha(version_number) if [SEMVER_REGEX, SHA1_REGEX].all?{|r| regex_match?(r, version_number) }
 
-            return replace_all_git_sha(version_number) if Regexp.new("\\A#{SHA1_REGEX.source}\\z").match?(version_number)
+            return replace_all_git_sha(version_number) if regex_match?(Regexp.new("\\A#{SHA1_REGEX.source}\\z"), version_number)
 
             # Trim to some meaningful value in case we couldn't match anything, just not to mess with the output
             return version_number[0...60] + '...' if version_number.length > 60
@@ -22,6 +22,11 @@ def call version_number
 
           private
 
+          # To support ruby2.2
+          def regex_match?(regex, value)
+            !regex.match(value).nil?
+          end
+
           def replace_all_git_sha(version)
             version.gsub(SHA1_REGEX) { |val| val[0...7] + '...' }
           end