Merge pull request #99 from rwaffen/updates

feat: switch to openvox, adapt new release ci, switch to ruby 3.2

Author: rwaffen

.github/workflows/release.yml

@@ -1,33 +1,106 @@
-name: Release
+---
+name: Gem Release
 
 on:
   push:
     tags:
       - '*'
 
+permissions: {}
+
 jobs:
-  release:
-    runs-on: ubuntu-latest
+  build-release:
+    # Prevent releases from forked repositories
     if: github.repository_owner == 'voxpupuli'
+    name: Build the gem
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v5
-      - name: Install Ruby 3.0
+      - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
-          bundler: 'none'
-        env:
-          BUNDLE_WITHOUT: release:development:rubocop
+          ruby-version: 'ruby'
       - name: Build gem
-        run: gem build --strict --verbose *.gemspec
+        shell: bash
+        run: gem build --verbose *.gemspec
+      - name: Upload gem to GitHub cache
+        uses: actions/upload-artifact@v4
+        with:
+          name: gem-artifact
+          path: '*.gem'
+          retention-days: 1
+          compression-level: 0
+
+  create-github-release:
+    needs: build-release
+    name: Create GitHub release
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: write # clone repo and create release
+    steps:
+      - name: Download gem from GitHub cache
+        uses: actions/download-artifact@v4
+        with:
+          name: gem-artifact
+      - name: Create Release
+        shell: bash
+        env:
+          GH_TOKEN: ${{ github.token }}
+        run: gh release create --repo ${{ github.repository }} ${{ github.ref_name }} --generate-notes *.gem
+
+  release-to-github:
+    needs: build-release
+    name: Release to GitHub
+    runs-on: ubuntu-24.04
+    permissions:
+      packages: write # publish to rubygems.pkg.github.com
+    steps:
+      - name: Download gem from GitHub cache
+        uses: actions/download-artifact@v4
+        with:
+          name: gem-artifact
+      - name: Publish gem to GitHub packages
+        run: gem push --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem
+        env:
+          GEM_HOST_API_KEY: ${{ secrets.GITHUB_TOKEN }}
+
+  release-to-rubygems:
+    needs: build-release
+    name: Release gem to rubygems.org
+    runs-on: ubuntu-24.04
+    environment: release # recommended by rubygems.org
+    permissions:
+      id-token: write # rubygems.org authentication
+    steps:
+      - name: Download gem from GitHub cache
+        uses: actions/download-artifact@v4
+        with:
+          name: gem-artifact
+      - uses: rubygems/[email protected]
       - name: Publish gem to rubygems.org
+        shell: bash
         run: gem push *.gem
-        env:
-          GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
-      - name: Setup GitHub packages access
+
+  release-verification:
+    name: Check that all releases are done
+    runs-on: ubuntu-24.04
+    permissions:
+      contents: read # minimal permissions that we have to grant
+    needs:
+      - create-github-release
+      - release-to-github
+      - release-to-rubygems
+    steps:
+      - name: Download gem from GitHub cache
+        uses: actions/download-artifact@v4
+        with:
+          name: gem-artifact
+      - name: Install Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 'ruby'
+      - name: Wait for release to propagate
+        shell: bash
         run: |
-          mkdir -p ~/.gem
-          echo ":github: Bearer ${{ secrets.GITHUB_TOKEN }}" >> ~/.gem/credentials
-          chmod 0600 ~/.gem/credentials
-      - name: Publish gem to GitHub packages
-        run: gem push --key github --host https://rubygems.pkg.github.com/${{ github.repository_owner }} *.gem
+          gem install rubygems-await
+          gem await *.gem

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.2'
           bundler-cache: true
       - name: Run rake rubocop
         run: bundle exec rake rubocop
@@ -28,11 +28,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: "2.7"
-          - ruby: "3.0"
-          - ruby: "3.1"
-            coverage: "yes"
           - ruby: "3.2"
+            coverage: "yes"
+          - ruby: "3.3"
+          - ruby: "3.4"
     env:
       COVERAGE: ${{ matrix.coverage }}
     name: Ruby ${{ matrix.ruby }}

lib/puppet-lint/plugins/check_ghostbuster_facts.rb

@@ -28,7 +28,7 @@ def check
     return if m.nil?
 
     File.foreach(path) do |line|
-      if line =~ /Facter.add\(["':](?<fact>[^"'\)]+)["']?\)/
+      if line =~ /Facter.add\(["':](?<fact>[^"')]+)["']?\)/
         fact_name = Regexp.last_match(:fact)
 
         found = false

lib/puppet-lint/plugins/check_ghostbuster_hiera_files.rb

@@ -41,7 +41,7 @@ def regexprs
       path_datadir = Regexp.escape((hierarchy['datadir'] || default_datadir).chomp('/'))
       ([*hierarchy['path']] + [*hierarchy['paths']]).each do |level|
         level = File.join(path_datadir, level)
-        regex = Regexp.new(level.gsub(/%\{(::)?(trusted|server_facts|facts)\.[^\}]+\}/, '(.+)').gsub(/%\{[^\}]+\}/, '.+'))
+        regex = Regexp.new(level.gsub(/%\{(::)?(trusted|server_facts|facts)\.[^}]+\}/, '(.+)').gsub(/%\{[^}]+\}/, '.+'))
         facts = level.match(regex).captures.map { |f| f[/%{(::)?(trusted|server_facts|facts)\.(.+)}/, 3] }
         regs[regex] = facts
       end

puppet-ghostbuster.gemspec

@@ -12,20 +12,23 @@ Gem::Specification.new do |s|
   s.description = 'Try and find dead code in Puppet receipts'
   s.licenses    = 'Apache-2.0'
 
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.2'
 
   s.files       = `git ls-files`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
 
+  s.add_dependency 'puppet-lint', '>= 5.0', '< 6.0'
+
   s.add_development_dependency 'coveralls', '>= 0.8', '< 0.9'
   s.add_development_dependency 'jgrep', '>= 1.0.0', '< 2.0.0'
   s.add_development_dependency 'rake', '>= 13.0.0', '< 14.0.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-collection_matchers', '~> 1.0'
   s.add_development_dependency 'rspec-its', '~> 1.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.8.0'
-  s.add_runtime_dependency 'json', '>= 2.0', '< 3.0'
-  s.add_runtime_dependency 'puppet', '>= 6.0', '< 9.0'
-  s.add_dependency         'puppet-lint', '>= 1.0', '< 5.0'
-  s.add_runtime_dependency 'puppetdb-ruby', '~> 1.1', '>= 1.1.1'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.0.0'
+
+  s.add_dependency 'json', '>= 2.0', '< 3.0'
+  s.add_dependency 'openvox', '>= 8.0', '< 9.0'
+  s.add_dependency 'puppetdb-ruby', '~> 1.1', '>= 1.1.1'
+  s.add_dependency 'syslog', '~> 0.3.0'
 end

spec/spec_helper.rb

@@ -5,7 +5,7 @@
 
 class PuppetDB::Client
   def puppetdb_to_jgrep(query)
-    if query[0] == :and || query[0] == :or
+    if %i[and or].include?(query[0])
       "(#{puppetdb_to_jgrep(query[1])} #{query[0]} #{puppetdb_to_jgrep(query[2])})"
     else
       "#{[query[1]].flatten.join('.')}#{query[0]}#{query[2]}"