Merge pull request #393 from puppetlabs/CONT-807-ruby_3

(CONT-807) Ruby 3 / Puppet 8 Additions

Author: GSPatton

.github/workflows/ci.yml

@@ -1,46 +1,12 @@
 name: "ci"
 
 on:
-  push:
-    branches:
-      - "main"
   pull_request:
     branches:
       - "main"
   workflow_dispatch:
 
 jobs:
-
   spec:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby_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
-    name: "spec (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 }}
-
-  acceptance:
-    needs: "spec"
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby_version:
-          - '2.7'
-          - '3.2'
-    name: "acceptance (ruby ${{ matrix.ruby_version }})"
-    uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
-    secrets: "inherit"
-    with:
-      ruby_version: ${{ matrix.ruby_version }}
-      puppet_version: ${{ matrix.puppet_version }}

.github/workflows/nightly.yml

@@ -6,37 +6,6 @@ on:
   workflow_dispatch:
 
 jobs:
-
   spec:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby_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
-    name: "spec (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 }}
-
-  acceptance:
-    needs: "spec"
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby_version:
-          - '2.7'
-          - '3.2'
-    name: "acceptance (ruby ${{ matrix.ruby_version }})"
-    uses: "puppetlabs/cat-github-actions/.github/workflows/gem_acceptance.yml@main"
-    secrets: "inherit"
-    with:
-      ruby_version: ${{ matrix.ruby_version }}
-      puppet_gem_version: ${{ matrix.puppet_gem_version }}

.github/workflows/release_prep.yml

@@ -1,4 +1,4 @@
-name: "release prep"
+name: "Release Prep"
 
 on:
   workflow_dispatch:

.rubocop.yml

@@ -1,81 +1,19 @@
----
 inherit_from: .rubocop_todo.yml
 
 require:
-- rubocop-performance
-- rubocop-rspec
+  - rubocop-performance
+  - rubocop-rspec
 
 AllCops:
-  DisplayCopNames: true
-  SuggestExtensions: false
+  Exclude:
+    - Gemfile
+    - Rakefile
+    - spec/fixtures/**/*
+    - vendor/bundle/**/*
   NewCops: enable
+  SuggestExtensions: false
   TargetRubyVersion: '2.7'
-  Include:
-  - "**/*.rb"
-  Exclude:
-  - bin/*
-  - ".vendor/**/*"
-  - "**/Gemfile"
-  - "**/Rakefile"
-  - pkg/**/*
-  - spec/fixtures/**/*
-  - vendor/**/*
-  - "**/Puppetfile"
-  - "**/Vagrantfile"
-  - "**/Guardfile"
-  - '**/*.erb'
-  - 'lib/puppet-strings/yard/templates/**/*'
-Layout/LineLength:
-  Description: People have wide screens, use them.
-  Max: 200
-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
-RSpec/HookArgument:
-  Description: Prefer explicit :each argument, matching existing module's style
-  EnforcedStyle: each
-Style/BlockDelimiters:
-  Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
-    be consistent then.
-  EnforcedStyle: braces_for_chaining
-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/Lambda:
-  Description: Prefer the keyword for easier discoverability.
-  EnforcedStyle: literal
-Style/RegexpLiteral:
-  Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
-  EnforcedStyle: percent_r
-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/SymbolArray:
-  Description: Using percent style obscures symbolic intent of array's contents.
-  EnforcedStyle: brackets
-RSpec/MessageSpies:
-  EnforcedStyle: receive
-Style/Documentation:
-  Exclude:
-  - spec/**/*
-Style/WordArray:
-  EnforcedStyle: brackets
+
+# Disabled
+Style/ClassAndModuleChildren:
+  Enabled: false

.rubocop_todo.yml

@@ -1,11 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2023-04-13 15:49:55 UTC using RuboCop version 1.48.1.
+# on 2023-04-19 09:06:42 UTC using RuboCop version 1.48.1.
 # 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 safe autocorrection (--autocorrect).
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequireMFA:
+  Exclude:
+    - 'puppetlabs_spec_helper.gemspec'
+
 # Offense count: 5
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
@@ -59,6 +67,12 @@ RSpec/DescribeClass:
 RSpec/ExampleLength:
   Max: 13
 
+# Offense count: 5
+# Configuration parameters: .
+# SupportedStyles: have_received, receive
+RSpec/MessageSpies:
+  EnforcedStyle: receive
+
 # Offense count: 5
 RSpec/MultipleExpectations:
   Max: 3
@@ -84,6 +98,13 @@ Style/CombinableLoops:
   Exclude:
     - 'lib/puppetlabs_spec_helper/tasks/fixtures.rb'
 
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: MaxUnannotatedPlaceholdersAllowed, AllowedMethods, AllowedPatterns.
+# SupportedStyles: annotated, template, unannotated
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+
 # Offense count: 4
 # Configuration parameters: AllowedVariables.
 Style/GlobalVars:
@@ -94,3 +115,19 @@ Style/GlobalVars:
 Style/MixinUsage:
   Exclude:
     - 'lib/puppetlabs_spec_helper/tasks/fixtures.rb'
+
+# Offense count: 9
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyleForMultiline.
+# SupportedStylesForMultiline: comma, consistent_comma, no_comma
+Style/TrailingCommaInArguments:
+  Exclude:
+    - 'lib/puppetlabs_spec_helper/tasks/fixtures.rb'
+    - 'spec/unit/puppetlabs_spec_helper/tasks/fixture_helpers_spec.rb'
+
+# Offense count: 17
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Max: 195

Gemfile

@@ -38,13 +38,3 @@ group :development do
   gem 'fakefs'
   gem 'yard'
 end
-
-# Evaluate Gemfile.local if it exists
-if File.exist? "#{__FILE__}.local"
-  eval(File.read("#{__FILE__}.local"), binding)
-end
-
-# Evaluate ~/.gemfile if it exists
-if File.exist?(File.join(Dir.home, '.gemfile'))
-  eval(File.read(File.join(Dir.home, '.gemfile')), binding)
-end