Merge pull request #2060 from ekohl/ruby-2.7

Use Ruby 2.7 compatible string matching

Author: sanfrancrisko

lib/puppet/functions/apache/bool2httpd.rb

@@ -17,8 +17,14 @@
   #   apache::bool2httpd(undef) # returns 'Off'
   #
   def bool2httpd(arg)
-    return 'Off' if arg.nil? || arg == false || arg =~ %r{false}i || arg == :undef
-    return 'On' if arg == true || arg =~ %r{true}i
+    return 'Off' if arg.nil? || arg == false || matches_string?(arg, %r{false}i) || arg == :undef
+    return 'On' if arg == true || matches_string?(arg, %r{true}i)
     arg.to_s
   end
+
+  private
+
+  def matches_string?(value, matcher)
+    value.is_a?(String) && value.match?(matcher)
+  end
 end

spec/functions/bool2httpd_spec.rb

@@ -5,10 +5,12 @@
   it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params('1', '2').and_raise_error(ArgumentError) }
   it { is_expected.to run.with_params(true).and_return('On') }
+  it { is_expected.to run.with_params('true').and_return('On') }
   it 'expected to return a string "On"' do
     expect(subject.execute(true)).to be_an_instance_of(String)
   end
   it { is_expected.to run.with_params(false).and_return('Off') }
+  it { is_expected.to run.with_params('false').and_return('Off') }
   it 'expected to return a string "Off"' do
     expect(subject.execute(false)).to be_an_instance_of(String)
   end