nextgen 0.27.1 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d682d6b4f3af463de90ebe0c21ae46975726059bb20433343b70ea9540934f
-  data.tar.gz: ec47512a6d01f6ba0202f111c1179b67af35c616c99acf8949c89c57935f4951
+  metadata.gz: 1ea2e1d45c79b83e023bf749c3428d0cb8f896e81e480fe4099b8e26620edd2e
+  data.tar.gz: e605a95e89f3ad516e58515016bec87531713e928e5cca565d9ff051d867d7ba
 SHA512:
-  metadata.gz: db6c76884b7906383f56b3d62846f7566d0380b4b199f24931e51f9fc4b4565dc46d6a8937d5eccd36d310a691fead9f3804874c97a1db4ec80baee0398e1250
-  data.tar.gz: eadc9f20c730665772bc35f02c34351a3f3d8dd854a9d6cd6f23c3fd9b3371f7e3ac56d25b3a2bf80366e114eb49f7ae84bc975d0b8c4fdb03f03a1d2bb00d59
+  metadata.gz: 675a585287eae56813bd5b895f629ff7dec15d019318089076ffd4d31cf6dd4571daefe2cf37b6089948d66ade6107b8f076d43c9d9c6421110ec8885585f08a
+  data.tar.gz: 2507548b71033e3c2ebaa0482a68a373f1a12e1cdef511f6ef295bf69b0318565dadb2531b74b062e7f7ea9d799bea4e69af5252a4d3f12224959398dc63db78

data/README.md

@@ -30,7 +30,7 @@ Nextgen generates apps using **Rails 7.2**.
 
 - **Ruby 3.1+** is required (Ruby 3.2 if you choose a Rails 8 pre-release)
 - **Rubygems 3.4.8+** is required (run `gem update --system` to get it)
-- **Node 18.12+ and Yarn** are required if you choose Vite or other Node-based options (see the [npm note](#yarn-or-npm) below)
+- **Node 20.9+ and Yarn** are required if you choose Vite or other Node-based options (see the [npm note](#yarn-or-npm) below)
 - Additional tools may be required depending on the options you select (e.g. PostgreSQL)
 
 Going forward, my goal is that Nextgen will always target the latest stable version of Rails and the next pre-release version. Support for Node LTS and Ruby versions will be dropped as soon as they reach EOL (see [Ruby](https://endoflife.date/ruby) and [Node](https://endoflife.date/nodejs) EOL schedules).
@@ -90,7 +90,7 @@ Nextgen can install and configure your choice of these recommended gems:
 - [bundler-audit](https://github.com/rubysec/bundler-audit)
 - [capybara-lockstep](https://github.com/makandra/capybara-lockstep)
 - [dotenv](https://github.com/bkeepers/dotenv)
-- [erb_lint](https://github.com/Shopify/erb-lint)
+- [erb_lint](https://github.com/Shopify/erb_lint)
 - [factory_bot_rails](https://github.com/thoughtbot/factory_bot_rails)
 - [good_migrations](https://github.com/testdouble/good-migrations)
 - [letter_opener](https://github.com/ryanb/letter_opener)

data/config/generators.yml

@@ -59,7 +59,7 @@ dotenv:
   description: "Install dotenv gem and add .env.sample"
 
 erb_lint:
-  prompt: "ERB Lint"
+  prompt: "erb_lint"
   description: "Install erb_lint gem and correct existing issues"
   requires: frontend
 

data/lib/nextgen/generators/base.rb

@@ -49,6 +49,7 @@ if missing_ruby_decl && File.exist?(".ruby-version") && File.read(".ruby-version
                 'ruby Pathname.new(__dir__).join(".ruby-version").read.strip'
               end
   gsub_file "Gemfile", /^source .*$/, '\0' + "\n#{ruby_decl}"
+  gsub_file "Dockerfile", "COPY Gemfile", "COPY .ruby-version Gemfile" if File.exist?("Dockerfile")
   bundle_command! "lock"
 end
 
@@ -80,3 +81,8 @@ 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-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code

data/lib/nextgen/generators/erb_lint.rb

@@ -3,11 +3,32 @@
 say_git "Install erb_lint"
 install_gem "erb_lint", group: :development, require: false
 binstub "erb_lint"
-template ".erb-lint.yml.tt"
+template ".erb_lint.yml.tt"
 
-say_git "Add erblint to default rake task"
-copy_file "lib/tasks/erblint.rake"
-add_lint_task "erblint"
+say_git "Add erb_lint to default rake task"
+copy_file "lib/tasks/erb_lint.rake"
+add_lint_task "erb_lint"
+
+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
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: .ruby-version
+          bundler-cache: true
+
+      - name: Lint ERB with erb_lint
+        run: bin/erb_lint --lint-all
+
+  YAML
+end
 
 say_git "Auto-correct any existing issues"
-run "bin/erblint --lint-all -a", capture: true
+run "bin/erb_lint --lint-all -a", capture: true

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-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code

data/lib/nextgen/generators/node.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 copy_file "package.json" unless File.exist?("package.json")
-inject_into_file "README.md", "\n- Node 18 (LTS) or newer\n- Yarn 1.x (classic)", after: /^- Ruby.*$/
+inject_into_file "README.md", "\n- Node 20 (LTS) or newer\n- Yarn 1.x (classic)", after: /^- Ruby.*$/
 inject_into_file "README.md", "\nbrew install node\nbrew install yarn", after: /^brew install rbenv.*$/
 gitignore "node_modules/"

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-latest
+    runs-on: ubuntu-24.04
 
     <%- if gems.include?("pg") -%>
     services:

data/lib/nextgen/generators/rubocop.rb

@@ -16,9 +16,9 @@ binstub "rubocop" unless File.exist?("bin/rubocop")
 say_git "Replace .rubocop.yml"
 template ".rubocop.yml", context: binding, force: true
 
-if File.exist?(".erb-lint.yml")
-  say_git "Regenerate .erb-lint.yml with rubocop support"
-  template ".erb-lint.yml", force: true
+if File.exist?(".erb_lint.yml")
+  say_git "Regenerate .erb_lint.yml with rubocop support"
+  template ".erb_lint.yml", force: true
 end
 
 say_git "Add rubocop to default rake task"

data/lib/nextgen/generators/stylelint.rb

@@ -27,7 +27,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-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout code

data/lib/nextgen/version.rb

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

data/template/.overcommit.yml.tt

@@ -5,11 +5,11 @@ PreCommit:
   BundleCheck:
     enabled: true
 
-<% if File.exist?(".erb-lint.yml") -%>
+<% if File.exist?(".erb_lint.yml") -%>
   ErbLint:
     enabled: true
     required_executable: bundle
-    command: ["bundle", "exec", "erblint"]
+    command: ["bundle", "exec", "erb_lint"]
     include: "**/*.html.erb"
 <% end -%>
 

data/template/lib/tasks/erb_lint.rake

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+desc "Run erb_lint"
+task :erb_lint do
+  sh "bin/erb_lint --lint-all"
+end
+
+namespace :erb_lint do
+  desc "Autocorrect erb_lint offenses"
+  task :autocorrect do
+    sh "bin/erb_lint --lint-all -a"
+  end
+end

data/template/package.json

@@ -2,6 +2,6 @@
   "private": true,
   "type": "module",
   "engines": {
-    "node": "^18.12.0 || >= 20.0.0"
+    "node": "^20.9.0 || >= 22.0.0"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nextgen
 version: !ruby/object:Gem::Version
-  version: 0.27.1
+  version: 0.28.1
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-10-15 00:00:00.000000000 Z
+date: 2024-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -149,7 +149,7 @@ files:
 - lib/nextgen/version.rb
 - template/.editorconfig
 - template/.env.sample
-- template/.erb-lint.yml.tt
+- template/.erb_lint.yml.tt
 - template/.github/PULL_REQUEST_TEMPLATE.md.tt
 - template/.overcommit.yml.tt
 - template/.prettierrc.cjs
@@ -179,7 +179,7 @@ files:
 - template/eslint.config.js
 - template/lib/puma/plugin/open.rb
 - template/lib/tasks/auto_annotate_models.rake
-- template/lib/tasks/erblint.rake
+- template/lib/tasks/erb_lint.rake
 - template/lib/tasks/eslint.rake.tt
 - template/lib/tasks/rubocop.rake
 - template/lib/tasks/stylelint.rake.tt

data/template/lib/tasks/erblint.rake

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-desc "Run erblint"
-task :erblint do
-  sh "bin/erblint --lint-all"
-end
-
-namespace :erblint do
-  desc "Autocorrect erblint offenses"
-  task :autocorrect do
-    sh "bin/erblint --lint-all -a"
-  end
-end