(FACT-3147) Updates minimum Ruby version to 2.5

mhashizume · mhashizume · commit 650f50d32a8f · 2022-12-08T13:29:33.000-08:00
This commit replaces all instances in which Ruby 2.3 or 2.4 are
referenced with Ruby 2.5 and sets Ruby 2.5 as the minimum Ruby
version in the Gemspec and other relevant locations.
diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.3'
+          - '2.5'
           - '2.7'
           - '3.0'
           - '3.2.0-preview2'
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ site](https://puppet.com/docs/puppet/latest/facter.html).
 * AIX
 
 ## Requirements
-* Ruby 2.3+
+* Ruby 2.5+
 * FFI (for facts like `mountpoints` which are resolved using C API calls)
 
 ## Basic concepts
diff --git a/agent/facter-ng.gemspec b/agent/facter-ng.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.files = dirs.map { |path| path.sub(base, '') }
 
-  spec.required_ruby_version = '>= 2.3', '< 4.0'
+  spec.required_ruby_version = '>= 2.5', '< 4.0'
 
   spec.bindir = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
diff --git a/ext/project_data.yaml b/ext/project_data.yaml
@@ -12,7 +12,7 @@ gem_require_path: 'lib'
 gem_executables: 'facter'
 gem_license: 'Apache-2.0'
 gem_default_executables: 'facter'
-gem_required_ruby_version: ['>= 2.3', '< 4.0']
+gem_required_ruby_version: ['>= 2.5', '< 4.0']
 gem_runtime_dependencies:
   hocon: ~> 1.3
   thor: ['>= 1.0.1', '< 2.0']
diff --git a/facter.gemspec b/facter.gemspec
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   base = "#{__dir__}#{File::SEPARATOR}"
   spec.files = dirs.map { |path| path.sub(base, '') }
 
-  spec.required_ruby_version = '>= 2.3', '< 4.0'
+  spec.required_ruby_version = '>= 2.5', '< 4.0'
   spec.bindir = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
diff --git a/spec/facter/facts/aix/ruby/version_spec.rb b/spec/facter/facts/aix/ruby/version_spec.rb
@@ -4,7 +4,7 @@
   describe '#call_the_resolver' do
     subject(:fact) { Facts::Aix::Ruby::Version.new }
 
-    let(:value) { '2.4.5' }
+    let(:value) { '2.5.9' }
 
     before do
       allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:version).and_return(value)
diff --git a/spec/facter/facts/freebsd/ruby/version_spec.rb b/spec/facter/facts/freebsd/ruby/version_spec.rb
@@ -4,7 +4,7 @@
   describe '#call_the_resolver' do
     subject(:fact) { Facts::Freebsd::Ruby::Version.new }
 
-    let(:value) { '2.4.5' }
+    let(:value) { '2.5.9' }
 
     before do
       allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:version).and_return(value)
diff --git a/spec/facter/facts/linux/ruby/version_spec.rb b/spec/facter/facts/linux/ruby/version_spec.rb
@@ -4,7 +4,7 @@
   describe '#call_the_resolver' do
     subject(:fact) { Facts::Linux::Ruby::Version.new }
 
-    let(:value) { '2.4.5' }
+    let(:value) { '2.5.9' }
 
     before do
       allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:version).and_return(value)
diff --git a/spec/facter/facts/macosx/ruby/version_spec.rb b/spec/facter/facts/macosx/ruby/version_spec.rb
@@ -4,7 +4,7 @@
   describe '#call_the_resolver' do
     subject(:fact) { Facts::Macosx::Ruby::Version.new }
 
-    let(:value) { '2.4.5' }
+    let(:value) { '2.5.9' }
 
     before do
       allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:version).and_return(value)
diff --git a/spec/facter/facts/solaris/ruby/version_spec.rb b/spec/facter/facts/solaris/ruby/version_spec.rb
@@ -4,7 +4,7 @@
   describe '#call_the_resolver' do
     subject(:fact) { Facts::Solaris::Ruby::Version.new }
 
-    let(:value) { '2.4.5' }
+    let(:value) { '2.5.9' }
 
     before do
       allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:version).and_return(value)
diff --git a/spec/facter/facts/windows/ruby/version_spec.rb b/spec/facter/facts/windows/ruby/version_spec.rb
@@ -4,7 +4,7 @@
   describe '#call_the_resolver' do
     subject(:fact) { Facts::Windows::Ruby::Version.new }
 
-    let(:value) { '2.5.7' }
+    let(:value) { '2.5.9' }
 
     before do
       allow(Facter::Resolvers::Ruby).to receive(:resolve).with(:version).and_return(value)
diff --git a/spec/facter/util/file_helper_spec.rb b/spec/facter/util/file_helper_spec.rb
@@ -98,36 +98,18 @@
   end
 
   describe '#dir_children' do
-    context 'with ruby < 2.5' do
-      before do
-        allow(Dir).to receive(:entries).with(File.dirname(path)).and_return(entries + ['.', '..'])
-        stub_const('RUBY_VERSION', '2.4.5')
-      end
-
-      it 'delegates to Dir.entries' do
-        file_helper.dir_children(File.dirname(path))
-        expect(Dir).to have_received(:entries)
-      end
-
-      it 'correctly resolves entries' do
-        expect(file_helper.dir_children(File.dirname(path))).to eq(entries)
-      end
+    before do
+      allow(Dir).to receive(:children).with(File.dirname(path)).and_return(entries)
+      stub_const('RUBY_VERSION', '2.5.9')
     end
 
-    context 'with ruby >= 2.5', if: RUBY_VERSION.to_f >= 2.5 do
-      before do
-        allow(Dir).to receive(:children).with(File.dirname(path)).and_return(entries)
-        stub_const('RUBY_VERSION', '2.5.1')
-      end
-
-      it 'delegates to Dir.children' do
-        file_helper.dir_children(File.dirname(path))
-        expect(Dir).to have_received(:children)
-      end
+    it 'delegates to Dir.children' do
+      file_helper.dir_children(File.dirname(path))
+      expect(Dir).to have_received(:children)
+    end
 
-      it 'correctly resolves entries' do
-        expect(file_helper.dir_children(File.dirname(path))).to eq(entries)
-      end
+    it 'correctly resolves entries' do
+      expect(file_helper.dir_children(File.dirname(path))).to eq(entries)
     end
   end
 
