(CONT-881) Ruby 3 / Puppet 8 Support

.github/workflows/ci.yml

@@ -7,42 +7,48 @@ on:
   workflow_dispatch:
 
 jobs:
-
   spec:
     strategy:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.5'
-          - '2.7'
-        puppet_gem_version:
-          - '~> 6.0'
-          - '~> 7.0'
-    name: "spec (ruby ${{ matrix.ruby_version }} | ${{ matrix.puppet_gem_version }})"
+          - "2.7"
+          - "3.2"
+        include:
+          - ruby-version: '2.7'
+            puppet_gem_version: '~> 7.0'
+          - ruby_version: '3.2'
+            puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
+        runs_on:
+          - "ubuntu-latest"
+          - "windows-latest"
+    name: "spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
     secrets: "inherit"
     with:
       ruby_version: ${{ matrix.ruby_version }}
+      puppet_gem_version: ${{ matrix.puppet_gem_version }}
+      runs_on: ${{ matrix.runs_on }}
 
   acceptance:
     needs: "spec"
     strategy:
-      fail-fast: false
       matrix:
-        os:
-          - "ubuntu-latest"
-          - "windows-latest"
         ruby_version:
-          - "2.5"
           - "2.7"
-        puppet_gem_version:
-          - '~> 6.0'
-          - '~> 7.0'
-    name: "acceptance (${{ matrix.os }} ruby ${{ matrix.ruby_version }} |${{ matrix.puppet_gem_version }})"
+          - "3.2"
+        include:
+          - ruby-version: '2.7'
+            puppet_gem_version: '~> 7.0'
+          - ruby_version: '3.2'
+            puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
+        runs_on:
+          - "ubuntu-latest"
+          - "windows-latest"
+    name: "acceptance (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
     secrets: "inherit"
     with:
       ruby_version: ${{ matrix.ruby_version }}
-      rake_task: 'acceptance'
       puppet_version: ${{ matrix.puppet_gem_version }}
-      runs_on: ${{ matrix.os }}
+      runs_on: ${{ matrix.runs_on }}

.github/workflows/nightly.yml

@@ -6,42 +6,47 @@ on:
   workflow_dispatch:
 
 jobs:
-
   spec:
     strategy:
       fail-fast: false
       matrix:
         ruby_version:
-          - '2.5'
-          - '2.7'
-        puppet_gem_version:
-          - '~> 6.0'
-          - '~> 7.0'
-    name: "spec (ruby ${{ matrix.ruby_version }} | ${{ matrix.puppet_gem_version }})"
+          - "2.7"
+          - "3.2"
+        include:
+          - ruby-version: '2.7'
+            puppet_gem_version: '~> 7.0'
+          - ruby_version: '3.2'
+            puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
+        runs_on:
+          - "ubuntu-latest"
+          - "windows-latest"
+    name: "spec (${{ matrix.runs_on }} ruby ${{ matrix.ruby_version }} | puppet ${{matrix.puppet_gem_version}})"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_ci.yml@main"
     secrets: "inherit"
     with:
       ruby_version: ${{ matrix.ruby_version }}
+      puppet_gem_version: ${{ matrix.puppet_gem_version }}
+      runs_on: ${{ matrix.runs_on }}
 
   acceptance:
     needs: "spec"
     strategy:
-      fail-fast: false
       matrix:
-        os:
-          - "ubuntu-latest"
-          - "windows-latest"
         ruby_version:
-          - "2.5"
           - "2.7"
-        puppet_gem_version:
-          - '~> 6.0'
-          - '~> 7.0'
-    name: "acceptance (${{ matrix.os }} ruby ${{ matrix.ruby_version }} |${{ matrix.puppet_gem_version }})"
+          - "3.2"
+        include:
+          - ruby-version: '2.7'
+            puppet_gem_version: '~> 7.0'
+          - ruby_version: '3.2'
+            puppet_gem_version: 'https://github.com/puppetlabs/puppet' # puppet8'
+        runs_on:
+          - "ubuntu-latest"
+          - "windows-latest"
     uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
     secrets: "inherit"
     with:
       ruby_version: ${{ matrix.ruby_version }}
-      rake_task: 'acceptance'
       puppet_version: ${{ matrix.puppet_gem_version }}
-      runs_on: ${{ matrix.os }}
+      runs_on: ${{ matrix.runs_on }}

.rubocop.yml

@@ -1,183 +1,19 @@
-require: rubocop-rspec
+inherit_from: .rubocop_todo.yml
+
+require:
+  - rubocop-performance
+  - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.5
   Exclude:
-    # binstubs, and other utilities
-    - bin/**/*
-    - vendor/**/*
-    - vendor/**/.*
-    # package testing gems
-    - package-testing/vendor/**/*
-    - package-testing/vendor/**/.*
-    # Any thing in test fixtures
+    - Gemfile
+    - Rakefile
     - spec/fixtures/**/*
+    - vendor/bundle/**/*
+  NewCops: enable
+  SuggestExtensions: false
+  TargetRubyVersion: '2.7'
 
-# Metrics, excludes complexity and sizing metrics for now, as ruby's defaults are very strict
-Metrics/AbcSize:
-  Enabled: False
-
-Metrics/BlockLength:
-  Description: rspec uses long describe blocks, so allow long blocks under spec/
-  Enabled: False
-  Exclude:
-    - 'spec/**/*.rb'
-
-Metrics/ClassLength:
-  Enabled: False
-
-Metrics/CyclomaticComplexity:
-  Enabled: False
-
-Layout/LineLength:
-  Description: People have wide screens, use them.
-  Max: 200
-
-Metrics/MethodLength:
-  Enabled: False
-
-Metrics/ModuleLength:
-  Enabled: False
-
-Metrics/ParameterLists:
-  Enabled: False
-
-Metrics/PerceivedComplexity:
-  Enabled: False
-
-# RSpec cops
-RSpec/BeforeAfterAll:
-  Description: Beware of using after(:all) as it may cause state to leak between tests. A necessary evil in acceptance testing.
-  Exclude:
-    - 'spec/acceptance/**/*.rb'
-    - 'package-testing/spec/package/**/*.rb'
-
-RSpec/DescribeClass:
-  Description: This cop does not account for rspec-puppet, and beaker-rspec usage.
-  Enabled: False
-
-RSpec/HookArgument:
-  Description: Prefer explicit :each argument, matching existing module's style
-  EnforcedStyle: each
-
-RSpec/NestedGroups:
-  Description: Nested groups can lead to cleaner tests with less duplication
-  Max: 10
-
-RSpec/ExampleLength:
-  Description: Forcing short examples leads to the creation of one-time use let() helpers
-  Enabled: False
-
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-
-RSpec/ScatteredSetup:
-  Enabled: False
-
-# This is fine
-RSpec/ImplicitSubject:
-  Enabled: false
-
-# Set a reasonble max level
-RSpec/MultipleExpectations:
-  Max: 10
-
-# Nested contexts don't comply
-RSpec/ContextWording:
-  Enabled: false
-
-# This is allowed
-RSpec/SubjectStub:
-  Enabled: false
-
-# Doesn't help readability
-RSpec/PredicateMatcher:
-  Enabled: false
-
-# Style Cops
-Style/AsciiComments:
-  Description: Names, non-english speaking communities.
-  Enabled: False
-
-Style/BlockDelimiters:
-  Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to be consistent then.
-  EnforcedStyle: braces_for_chaining
-
+# Disabled
 Style/ClassAndModuleChildren:
-  Description: Compact style reduces the required amount of indentation.
-  EnforcedStyle: compact
-
-Style/EmptyElse:
-  Description: Enforce against empty else clauses, but allow `nil` for clarity.
-  EnforcedStyle: empty
-
-Style/FormatString:
-  Description: Following the main puppet project's style, prefer the % format format.
-  EnforcedStyle: percent
-
-Style/FormatStringToken:
-  Description: Following the main puppet project's style, prefer the simpler template tokens over annotated ones.
-  EnforcedStyle: template
-
-Style/IfUnlessModifier:
-  Description: Post-fix `if` modifiers are hard to parse for newcomers. We don't want to encourage them. Post-fix `unless` modifiers could be nice in some cases, but the Cop doesn't differentiate.
-  Enabled: false
-
-Style/Lambda:
-  Description: Prefer the keyword for easier discoverability.
-  EnforcedStyle: literal
-
-Style/MethodCalledOnDoEndBlock:
-  Enabled: true
-
-Style/RegexpLiteral:
-  Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
-  EnforcedStyle: percent_r
-
-Style/SymbolProc:
-  Description: SymbolProc notation is not discoverable
   Enabled: false
-
-Style/TernaryParentheses:
-  Description: Checks for use of parentheses around ternary conditions. Enforce parentheses on complex expressions for better readability, but seriously consider breaking it up.
-  EnforcedStyle: require_parentheses_when_complex
-
-Style/TrailingCommaInArguments:
-  Description: Prefer always trailing comma on multiline argument lists. This makes diffs, and re-ordering nicer.
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInArrayLiteral:
-  Description: Prefer always trailing comma on multiline literals. This makes diffs, and re-ordering nicer.
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInHashLiteral:
-  Description: Prefer always trailing comma on multiline literals. This makes diffs, and re-ordering nicer.
-  EnforcedStyleForMultiline: comma
-
-Style/SymbolArray:
-  Description: Using percent style obscures symbolic intent of array's contents.
-  Enabled: true
-  EnforcedStyle: brackets
-
-Style/HashEachMethods:
-  Enabled: true
-
-Style/HashTransformKeys:
-  Enabled: true
-
-Style/HashTransformValues:
-  Enabled: true
-
-# Enforce LF line endings, even when on Windows
-Layout/EndOfLine:
-  EnforcedStyle: lf
-
-# new as of rubocop 0.81
-Lint/RaiseException:
-  Enabled: true
-
-Lint/StructNewOverride:
-  Enabled: true
-
-RSpec/MultipleMemoizedHelpers:
-  Max: 14