nextgen 0.31.1 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aa670fdbe16b853d3529fc07b7cbb5029db46b46ef30066bb9e2c1e4caf2b59
-  data.tar.gz: ca3a30684dab8edd9bfa5532d4f268491a2d16e785ebff456e44efe113944b60
+  metadata.gz: f01946bcb96b14d11711e59620947efa5b52ed7381f661e572ee64000e7e44d0
+  data.tar.gz: 910eb7a23125d0326a19a83be23784342711f58fe15f6686632d9b97517b7416
 SHA512:
-  metadata.gz: f4ad3a531106fa86c03700f3d926a125a7a74bb486a2c35b897ce2fdb23547e1c9ec3994de9f7d2b2e3124bc7f2e874590992ec008409b2ad454b4ef397a516d
-  data.tar.gz: 420c1476571ce7ba13a35d7e858e43f8925a236b34be620a9963f791b114460d6298a608da1e9a85fff955536376694c0e9224bcffc9cc413f5b6353924a1142
+  metadata.gz: 1080aeaf2918c284a0d3043b342a179456c69b004c126ee4a67b11c2b49ccdda90e0106a93229542cc3c382c354a5efd4ff1bdeddf5f1752d97086bd2a5373b7
+  data.tar.gz: edfdb9de426fd825ee534e9efeea5142329ec6b6adad9bc97a85eed69dbe63aff7cfc29054cf408a546873c936bd7fa66d80b6ea738493559a53f9e1e71cb8f2

data/lib/nextgen/generators/base.rb

@@ -81,8 +81,3 @@ if (time_zone = read_system_time_zone_name)
   uncomment_lines "config/application.rb", /config\.time_zone/
   gsub_file "config/application.rb", /(config\.time_zone = ).*$/, "\\1#{time_zone.inspect}"
 end
-
-if File.exist?(".github/workflows/ci.yml")
-  say_git "Opt into ubuntu-24.04 GitHub Actions runner"
-  gsub_file ".github/workflows/ci.yml", /\bubuntu-latest\b/, "ubuntu-24.04"
-end

data/lib/nextgen/generators/bundler_audit.rb

@@ -7,7 +7,7 @@ if File.exist?(".github/workflows/ci.yml")
   say_git "Add bundle-audit job to CI workflow"
   inject_into_file ".github/workflows/ci.yml", <<-YAML, after: /^jobs:\n/
   scan_gems:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code

data/lib/nextgen/generators/erb_lint.rb

@@ -13,7 +13,7 @@ if File.exist?(".github/workflows/ci.yml")
   say_git "Add erb_lint job to CI workflow"
   inject_into_file ".github/workflows/ci.yml", <<-YAML, after: /^jobs:\n/
   erb_lint:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

data/lib/nextgen/generators/eslint.rb

@@ -29,7 +29,7 @@ if File.exist?(".github/workflows/ci.yml")
   node_spec = File.exist?(".node-version") ? 'node-version-file: ".node-version"' : 'node-version: "lts/*"'
   inject_into_file ".github/workflows/ci.yml", <<-YAML, after: /^jobs:\n/
   eslint:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code

data/lib/nextgen/generators/rspec_github_actions.rb

@@ -4,7 +4,7 @@ return unless File.exist?(".github/workflows/ci.yml")
 
 erb = <<~YAML
   test:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
 
     <%- if gems.include?("pg") -%>
     services:

data/lib/nextgen/generators/rubocop.rb

@@ -4,13 +4,17 @@ say_git "Install rubocop gems"
 remove_gem "rubocop-rails-omakase"
 gemfile = File.read("Gemfile")
 plugins = []
-plugins << "capybara" if gemfile.match?(/^\s*gem ['"]capybara['"]/)
-plugins << "factory_bot" if gemfile.match?(/^\s*gem ['"]factory_bot/)
+requires = []
+requires << "capybara" if gemfile.match?(/^\s*gem ['"]capybara['"]/)
+requires << "factory_bot" if gemfile.match?(/^\s*gem ['"]factory_bot/)
 plugins << "minitest" if minitest?
 plugins << "performance"
 plugins << "rails"
-install_gem("rubocop-rails", version: ">= 2.22.0", group: :development, require: false)
-install_gems(*plugins.map { "rubocop-#{_1}" }, "rubocop", group: :development, require: false)
+rubocop_gems = [
+  "rubocop",
+  *[*plugins, *requires].sort.map { "rubocop-#{_1}" }
+]
+install_gems(*rubocop_gems.reverse, group: :development, require: false)
 binstub "rubocop" unless File.exist?("bin/rubocop")
 
 say_git "Replace .rubocop.yml"

data/lib/nextgen/generators/stylelint.rb

@@ -26,7 +26,7 @@ if File.exist?(".github/workflows/ci.yml")
   node_spec = File.exist?(".node-version") ? 'node-version-file: ".node-version"' : 'node-version: "lts/*"'
   inject_into_file ".github/workflows/ci.yml", <<-YAML, after: /^jobs:\n/
   stylelint:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
 
     steps:
       - name: Checkout code

data/lib/nextgen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Nextgen
-  VERSION = "0.31.1"
+  VERSION = "0.32.0"
 end

data/template/.rubocop.yml.tt

@@ -1,5 +1,11 @@
-require:
+<% if plugins.any? -%>
+plugins:
+<% end -%>
 <%= plugins.map { "  - rubocop-#{_1}" }.join("\n") %>
+<% if requires.any? -%>
+require:
+<%= requires.map { "  - rubocop-#{_1}" }.join("\n") %>
+<% end -%>
 
 inherit_mode:
   merge:

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: nextgen
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.0
 platform: ruby
 authors:
 - Matt Brictson
 bindir: exe
 cert_chain: []
-date: 2025-01-04 00:00:00.000000000 Z
+date: 2025-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties