Configurer improved version matching (allow RHEL >= 7.4, < 8.0)

lib/pharos/configuration/os_release.rb

@@ -6,7 +6,14 @@ class OsRelease < Pharos::Configuration::Struct
       attribute :id, Pharos::Types::Strict::String
       attribute :id_like, Pharos::Types::Strict::String.optional.default(nil)
       attribute :name, Pharos::Types::Strict::String.optional.default(nil)
-      attribute :version, Pharos::Types::Strict::String
+      attribute :version, Pharos::Types::Strict::String.optional.default(nil)
+      attribute :version_matcher, Pharos::Types.Instance(Object).optional.default(nil)
+
+      def ==(other)
+        return false unless id == other.id
+
+        (version || version_matcher) === other.version # rubocop:disable Style/CaseEquality
+      end
     end
   end
 end

lib/pharos/host/configurer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'set'
+
 module Pharos
   module Host
     class Configurer
@@ -13,7 +15,7 @@ def self.load_configurers
 
       # @return [Array]
       def self.configurers
-        @configurers ||= []
+        @configurers ||= Set.new
       end
 
       # @param [Pharos::Configuration::OsRelease]
@@ -249,11 +251,14 @@ def supported_os_releases
         # @param [Pharos::Configuration::OsRelease]
         # @return [Boolean]
         def supported_os?(os_release)
-          supported_os_releases.any? { |release| release.id == os_release.id && release.version == os_release.version }
+          supported_os_releases.any? { |release| release == os_release }
         end
 
         def register_config(name, version)
-          supported_os_releases << Pharos::Configuration::OsRelease.new(id: name, version: version)
+          os_release_opts = { id: name }
+          os_release_opts[version.is_a?(String) ? :version : :version_matcher] = version
+
+          supported_os_releases << Pharos::Configuration::OsRelease.new(os_release_opts)
           Pharos::Host::Configurer.configurers << self
           self
         end

lib/pharos/host/el7/rhel7.rb

@@ -5,10 +5,7 @@
 module Pharos
   module Host
     class Rhel7 < El7
-      register_config 'rhel', '7.4'
-      register_config 'rhel', '7.5'
-      register_config 'rhel', '7.6'
-      register_config 'rhel', '7.7'
+      register_config 'rhel', /^7\.[4-9]|\d{2,}/ # >= 7.4, < 8.0
 
       DOCKER_VERSION = '1.13.1'
       CFSSL_VERSION = '1.2'

spec/pharos/host/configurer_spec.rb

@@ -56,6 +56,96 @@
     end
   end
 
+  context 'with regex version matcher' do
+    let(:test_config_class) do
+      Class.new(described_class) do
+        register_config 'test', /^7\.[4-9]|\d{2,}/
+      end
+    end
+
+    it 'uses the matcher' do
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '7.3')
+        )
+      ).to be_nil
+
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '7.4')
+        ).new(host)
+      ).to be_a test_config_class
+
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '7.12')
+        ).new(host)
+      ).to be_a test_config_class
+
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '8.0')
+        )
+      ).to be_nil
+    end
+  end
+
+  context 'with lambda version matcher' do
+    let(:test_config_class) do
+      Class.new(described_class) do
+        register_config 'test', -> v { Gem::Requirement.new('~> 7.4').satisfied_by?(Gem::Version.new(v)) }
+      end
+    end
+
+    it 'uses the matcher' do
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '7.0')
+        )
+      ).to be_nil
+
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '7.4')
+        ).new(host)
+      ).to be_a test_config_class
+
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '7.9.5')
+        ).new(host)
+      ).to be_a test_config_class
+    end
+  end
+
+  context 'with range version matcher' do
+    let(:test_config_class) do
+      Class.new(described_class) do
+        register_config 'test', ("10".."100")
+      end
+    end
+
+    it 'uses the matcher' do
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '9')
+        )
+      ).to be_nil
+
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '11')
+        ).new(host)
+      ).to be_a test_config_class
+
+      expect(
+        described_class.for_os_release(
+          Pharos::Configuration::OsRelease.new(id: 'test', version: '101')
+        )
+      ).to be_nil
+    end
+  end
+
   describe '#update_env_file' do
     let(:host) { instance_double(Pharos::Configuration::Host) }
     let(:ssh) { instance_double(Pharos::Transport::SSH) }