Merge pull request #209 from bastelfreak/ruby31

Require Ruby 3.1

Author: bastelfreak

.rubocop_todo.yml

@@ -1,25 +1,19 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2024-06-09 17:48:43 UTC using RuboCop version 1.63.5.
+# `rubocop --auto-gen-config --no-auto-gen-timestamp`
+# using RuboCop version 1.75.8.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Performance/MapCompact:
-  Exclude:
-    - 'lib/rspec-puppet-facts.rb'
-
 # Offense count: 29
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
     - 'spec/rspec_puppet_facts_spec.rb'
 
-# Offense count: 7
+# Offense count: 6
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 13
@@ -29,14 +23,6 @@ RSpec/ExpectInHook:
   Exclude:
     - 'spec/rspec_puppet_facts_spec.rb'
 
-# Offense count: 8
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_line_only, single_statement_only, disallow, require_implicit
-RSpec/ImplicitSubject:
-  Exclude:
-    - 'spec/rspec_puppet_facts_spec.rb'
-
 # Offense count: 4
 RSpec/LeakyConstantDeclaration:
   Exclude:
@@ -69,25 +55,6 @@ RSpec/StubbedMock:
   Exclude:
     - 'spec/rspec_puppet_facts_spec.rb'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Rake/Desc:
-  Exclude:
-    - 'Rakefile'
-
-# Offense count: 6
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'lib/rspec-puppet-facts.rb'
-    - 'lib/rspec-puppet-facts/version.rb'
-    - 'spec/rspec_puppet_facts_spec.rb'
-    - 'spec/spec_helper.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
@@ -112,12 +79,6 @@ Style/RedundantArgument:
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-Style/RedundantSort:
-  Exclude:
-    - 'lib/rspec-puppet-facts.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: ConvertCodeThatCanStartToReturnNil, AllowedMethods, MaxChainLength.
 # AllowedMethods: present?, blank?, presence, try, try!
 Style/SafeNavigation:

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 PUPPET_VERSIONS_PATH = File.join(__dir__, 'ext', 'puppet_agent_facter_versions.json')
 
 begin
@@ -17,6 +19,7 @@ task :dump_commit do
 end
 
 namespace :puppet_versions do
+  desc 'updates the vendored list of puppet versions & components'
   task :update do
     require 'net/http'
     require 'net/https'
@@ -41,6 +44,7 @@ namespace :puppet_versions do
     File.write(PUPPET_VERSIONS_PATH, "#{JSON.pretty_generate(data.to_h)}\n")
   end
 
+  desc 'runs all tests and verifies vendored component list'
   task :test do
     Rake::Task['puppet_versions:update'].invoke
 

lib/rspec-puppet-facts.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppet'
 require 'facter'
 require 'facterdb'

lib/rspec-puppet-facts/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RspecPuppetFacts
   # This module contains the current version constant
   module Version

rspec-puppet-facts.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = 'Contains facts from many Facter version on many Operating Systems'
   s.licenses    = 'Apache-2.0'
 
-  s.required_ruby_version = '>= 2.7.0'
+  s.required_ruby_version = '>= 3.1.0'
 
   s.files       = `git ls-files`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.12'
   s.add_development_dependency 'yard', '~> 0.9.34'
 
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 4.1.0'
 
   s.add_dependency 'deep_merge', '~> 1.2'
   s.add_dependency 'facter', '< 5'

spec/rspec_puppet_facts_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 require 'stringio'
@@ -204,7 +206,7 @@
           end
 
           it 'returns a hash' do
-            is_expected.to be_a Hash
+            expect(subject).to be_a Hash
           end
 
           it 'returns supported OS' do
@@ -276,7 +278,7 @@
       end
 
       it 'returns a hash' do
-        is_expected.to be_a Hash
+        expect(subject).to be_a Hash
       end
 
       it 'returns supported OS' do
@@ -639,7 +641,7 @@
       end
 
       it 'returns facts from the specified default Facter version' do
-        is_expected.to match(
+        expect(subject).to match(
           'centos-9-x86_64' => include(
             facterversion: /\A4\.6\./,
           ),
@@ -662,7 +664,7 @@
       end
 
       it 'returns facts from a facter version matching version and below' do
-        is_expected.to match(
+        expect(subject).to match(
           'centos-9-x86_64' => include(
             facterversion: /\A4\.[0-7]\./,
           ),
@@ -691,7 +693,7 @@
       end
 
       it 'returns facts from a facter version matching 4.6' do
-        is_expected.to match('centos-9-x86_64' => include(facterversion: '4.6.1'))
+        expect(subject).to match('centos-9-x86_64' => include(facterversion: '4.6.1'))
       end
     end
 
@@ -706,7 +708,7 @@
       end
 
       it 'returns facts from a facter version matching 4.6.1' do
-        is_expected.to match('centos-9-x86_64' => include(facterversion: '4.6.1'))
+        expect(subject).to match('centos-9-x86_64' => include(facterversion: '4.6.1'))
       end
     end
 
@@ -747,11 +749,11 @@
       end
 
       it 'returns CentOS facts from a facter version matching 4.5' do
-        is_expected.to include('centos-9-x86_64' => include(facterversion: '4.5.2'))
+        expect(subject).to include('centos-9-x86_64' => include(facterversion: '4.5.2'))
       end
 
       it 'returns Debian facts from a facter version matching 4.6.1' do
-        is_expected.to include('debian-12-x86_64' => include(facterversion: '4.6.1'))
+        expect(subject).to include('debian-12-x86_64' => include(facterversion: '4.6.1'))
       end
     end
   end

spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'rspec-puppet-facts'
 include RspecPuppetFacts