Merge pull request puppetlabs#2674 from mhashizume/drop-ruby-25

Drop Ruby 2.5 support

Author: joshcooper

.github/workflows/unit_tests.yaml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - '2.5'
+          - '2.6'
           - '2.7'
           - '3.0'
           - '3.2'

.rubocop.yml

@@ -2,7 +2,7 @@
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   Exclude:
     - acceptance/**/*
     - vendor/**/*
@@ -88,9 +88,6 @@ RSpec/MessageSpies:
 RSpec/MultipleExpectations:
   Max: 3
 
-RSpec/MultipleMemoizedHelpers:
-  Enabled: false
-
 RSpec/NestedGroups:
   Enabled: 6
 

README.md

@@ -9,7 +9,6 @@
 [![Test Coverage](https://api.codeclimate.com/v1/badges/3bd4be86f4b0b49bc0ca/test_coverage)](https://codeclimate.com/github/puppetlabs/facter/test_coverage)
 [![Maintainability](https://api.codeclimate.com/v1/badges/3bd4be86f4b0b49bc0ca/maintainability)](https://codeclimate.com/github/puppetlabs/facter/maintainability)
 
-
 Facter is a command-line tool that gathers basic facts about nodes (systems)
 such as hardware details, network settings, OS type and version, and more.
 These facts are made available as variables in your Puppet manifests and can be
@@ -21,17 +20,20 @@ Documentation for the Facter project can be found on the [Puppet Docs
 site](https://puppet.com/docs/puppet/latest/facter.html).
 
 ## Supported platforms
+
 * Linux
 * macOS
 * Windows
 * Solaris
 * AIX
 
 ## Requirements
-* Ruby 2.5+
+
+* Ruby 2.6+
 * FFI (for facts like `mountpoints` which are resolved using C API calls)
 
 ## Basic concepts
+
 The project has three main parts, the framework, facts and resolvers.
 In the framework we implement functionality that is agnostic of specific facts like parsing user input, formatting output, etc.
 
@@ -52,9 +54,10 @@ sequenceDiagram
     resolver->>fact: system information
     fact->>framework: fact value
     framework->>user: formatted user output
-````
+```
 
 ## Getting started
+
 After cloning the project, run `bundle install` to install all dependencies.
 
 You can run facter by executing `./bin/facter`.
@@ -63,11 +66,13 @@ The command will output all the facts that facter detected for the current OS.
 The implementation can be validated locally by running `bundle exec rake check`.
 
 ## Goals - fast, easy, compatible
+
 * Gain performance similar to the C++ version of Facter. We plan to achieve this goal by gathering multiple facts with only one call and by using the faster Win32 API rather than WMI for the Windows implementation.
 * Facilitate community contribution. At the moment, C++ presents a possible impediment for community contributions.
 * Enable native integration with other Ruby-based projects such as Bolt and puppet.
 * Enable native integration for custom facts.
 * Provide 100% compatibility with C++ Facter (drop-in replacement).
 
 ## Licensing
+
 See [LICENSE](https://github.com/puppetlabs/facter/blob/main/LICENSE) file. Puppet is licensed by Puppet, Inc. under the Apache license. Puppet, Inc. can be contacted at: [email protected]

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.5', '< 4.0']
+gem_required_ruby_version: ['>= 2.6', '< 4.0']
 gem_runtime_dependencies:
   hocon: ~> 1.3
   thor: ['>= 1.0.1', '< 2.0']

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.5', '< 4.0'
+  spec.required_ruby_version = '>= 2.6', '< 4.0'
   spec.bindir = 'bin'
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
@@ -37,9 +37,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ffi', '1.15.5'
   spec.add_development_dependency 'rake', '~> 13.0', '>= 13.0.6'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 1.28' # last version to support 2.5
-  spec.add_development_dependency 'rubocop-performance', '~> 1.5.2'
-  spec.add_development_dependency 'rubocop-rspec', '~> 2.10' # last version to support 2.5
+  spec.add_development_dependency 'rubocop', '~> 1.50' # last version to support 2.6
+  spec.add_development_dependency 'rubocop-performance', '~> 1.17'
+  spec.add_development_dependency 'rubocop-rspec', '~> 2.20'
   spec.add_development_dependency 'simplecov', '~> 0.17.1'
   spec.add_development_dependency 'sys-filesystem', '~> 1.4'
   spec.add_development_dependency 'webmock', '~> 3.12'

install.rb

@@ -208,11 +208,15 @@ def prepare_installation
   # Join two paths. On Windows, dir must be converted to a relative path,
   # by stripping the drive letter, but only if the basedir is not empty.
   #
+  # We can't use endless ranges here because we still use older Rubies when building puppet-agent on older platforms
+  # (such as Solaris 10).
+  # rubocop:disable Style/SlicingWithRange
   def join(basedir, dir)
     return "#{basedir}#{dir[2..-1]}" if windows? && !basedir.empty? && (dir.length > 2)
 
     "#{basedir}#{dir}"
   end
+  # rubocop:enable Style/SlicingWithRange
 
   ##
   # Install file(s) from ./bin to RbConfig::CONFIG['bindir']. Patch it on the way

lib/docs/generate.rb

@@ -17,12 +17,7 @@ def format_facts(fact_hash)
   scope = OpenStruct.new({
                            facts: fact_hash
                          })
-
-  erb = if ERB.instance_method(:initialize).parameters.assoc(:key) # Ruby 2.6+
-          ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
-        else
-          ERB.new(File.read(PATH_TO_TEMPLATE), nil, '-')
-        end
+  erb = ERB.new(File.read(PATH_TO_TEMPLATE), trim_mode: '-')
   erb.result(scope.instance_eval { binding })
 end
 

lib/facter/facts/solaris/ldom.rb

@@ -54,7 +54,7 @@ def resolve(key)
       def create_resolved_facts_list(fact_value)
         resolved_facts = [Facter::ResolvedFact.new(FACT_NAME, fact_value)]
         ALIASES.each do |fact_alias|
-          key = fact_alias.split('_')[1..-1].map!(&:to_sym)
+          key = fact_alias.split('_')[1..].map!(&:to_sym)
           resolved_facts << Facter::ResolvedFact.new(fact_alias, fact_value.dig(*key), :legacy)
         end
 

lib/facter/framework/cli/cli.rb

@@ -113,7 +113,7 @@ def man(*args)
       negate_options = %w[block cache custom_facts external_facts]
 
       template = File.join(File.dirname(__FILE__), '..', '..', 'templates', 'man.erb')
-      erb = ERB.new(File.read(template), nil, '-')
+      erb = ERB.new(File.read(template), trim_mode: '-')
       erb.filename = template
       puts erb.result(binding)
     end
@@ -148,7 +148,7 @@ def list_block_groups
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
       Facter::Options.init_from_cli(options)
 
-      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..].join
       block_groups.gsub!(/:\s*\n/, "\n")
 
       puts block_groups
@@ -160,7 +160,7 @@ def list_cache_groups
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
       Facter::Options.init_from_cli(options)
 
-      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
+      cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..].join
       cache_groups.gsub!(/:\s*\n/, "\n")
 
       puts cache_groups

lib/facter/resolvers/aix/serialnumber.rb

@@ -22,7 +22,7 @@ def read_serialnumber(fact_name)
 
             result.each_line do |line|
               if line.include?('value')
-                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..-1]
+                @fact_list[:serialnumber] = line.split('=')[1].strip.delete('\"')[6..]
                 break
               end
             end