nextgen 0.36.0 → 0.38.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac970ad7ca291be8da14df6ae0a95deff1c68b0ce3ea5920938f93ed0f38acf4
-  data.tar.gz: 14c846fafe3ab9106345dc624a8f408f5b35caeca3b81be5eaed511d8af028af
+  metadata.gz: 7c220f677e85be4d7743b5d4dbb09ae9d0d7f97d1373458f7ee1c1a2d371e9e7
+  data.tar.gz: 79073932f4c22dbf2fbd8819e73fc2186d8ba1fdaa48f833ce925b513ff34a0e
 SHA512:
-  metadata.gz: 4d4189d0e0130f9dd339d919215ab54fca564fd2f20f8890748c316fa4c915a2dab226878c6f852ca65160e8665fab83610ebf204ea3c7764f755d912e7e05d3
-  data.tar.gz: 9e70e9ce30916b3504cd88dcde78332d88b0fc164245ea1029ffbd57daff09c6c38b985339472e40503e3af0830c6351f2e15e7822da236104abcdb88aff89ed
+  metadata.gz: b9e400966014de7e998e9cf8da63858310a57bc2568dd8e6e54b7a9002971d2bd86eaeffb14441337ee827c6a326d681221fd1ebc4602cbeaa47bd247ff93c22
+  data.tar.gz: 3f95b74419456f3c631060d8b9fe30e1dcbac165596bfbbb02cc39ad7b39d82e2fbb4bdfd749090f977b88359ce4f7fd110cc5947c4c56972883e15869462b4f

data/README.md

@@ -25,7 +25,7 @@ Nextgen is an **interactive** and flexible alternative to `rails new` that inclu
 
 ## Requirements
 
-Nextgen generates apps using **Rails 8.0**.
+Nextgen generates apps using **Rails 8.1**.
 
 - **Ruby 3.2+** is required
 - **Rubygems 3.4.8+** is required (run `gem update --system` to get it)
@@ -53,7 +53,7 @@ Check out the [examples directory](./examples) to see some Rails apps that were
 
 ## What's included
 
-**Nextgen starts with the "omakase" default behavior of `rails new`,** so you get the great things included in Rails 8.0 like RuboCop, a GitHub Actions CI workflow, your choice of database platform, CSS framework, etc. You can also interactively disable parts of the default stack that you don't need, like JBuilder or Action Mailbox.
+**Nextgen starts with the "omakase" default behavior of `rails new`,** so you get the great things included in Rails 8.1 like RuboCop, a GitHub Actions CI workflow, your choice of database platform, CSS framework, etc. You can also interactively disable parts of the default stack that you don't need, like JBuilder or Action Mailbox.
 
 On top of that foundation, Nextgen offers dozens of useful enhancements to the vanilla Rails experience. You are free to pick and choose which (if any) of these to apply to your new project. Behind the scenes, **each enhancement is applied in a separate git commit,** so that you can later see what was applied and why, and revert the suggestions if necessary.
 
@@ -75,7 +75,7 @@ Prefer RSpec? Nextgen can set you up with RSpec, plus the gems and configuration
 Prefer npm? Nextgen allows you to choose Yarn or npm to manage your app's JavaScript dependencies. Your Dockerfile, CI jobs, `bin/setup` script, etc. will be adjusted appropriately.
 
 > [!NOTE]
-> As of Rails 8.0, `rails new` is still hard-coded to use Yarn in some places. Therefore you may still need Yarn installed on your system in order to generate a new app. Nextgen will remove these Yarn references from your generated project if you select the npm option.
+> As of Rails 8.1, `rails new` is still hard-coded to use Yarn in some places. Therefore you may still need Yarn installed on your system in order to generate a new app. Nextgen will remove these Yarn references from your generated project if you select the npm option.
 
 ### Opinionated RuboCop Config
 
@@ -86,7 +86,6 @@ By default, Rails apps include RuboCop with a config defined by the [rubocop-rai
 Nextgen can install and configure your choice of these recommended gems:
 
 - [annotaterb](https://github.com/drwl/annotaterb)
-- [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)

data/config/generators.yml

@@ -45,10 +45,6 @@ basic_auth:
   prompt: "BasicAuth controller concern"
   description: "Allow app to be secured with ENV-based basic auth credentials"
 
-bundler_audit:
-  prompt: "Bundler Audit"
-  description: "Install bundler-audit gem to detect CVEs in Ruby dependencies"
-
 capybara_lockstep:
   prompt: "capybara-lockstep"
   description: "Install capybara-lockstep gem for less-flaky browser testing"

data/config/rails_versions.yml

@@ -18,6 +18,7 @@ current: &current
     mariadb-trilogy: MariaDB-Trilogy
   default_features:
     brakeman: Brakeman
+    bundler-audit: bundler-audit
     ci: GitHub Actions CI
     kamal: Kamal
     rubocop: RuboCop
@@ -29,7 +30,7 @@ current: &current
 edge:
   <<: *current
   args: ["--edge"]
-  label: "edge (8-0-stable)"
+  label: "edge (8-1-stable)"
 
 main:
   <<: *current

data/lib/nextgen/actions.rb

@@ -143,9 +143,9 @@ module Nextgen
 
       paths.reverse_each do |path|
         gsub_file("config/application.rb", /autoload_lib\(ignore: %w.*$/) do |match|
-          next match if match.match?(/%w.*[\(\[ ]#{Regexp.quote(path)}[ \)\]]/)
+          next match if match.match?(/%w.*[(\[ ]#{Regexp.quote(path)}[ )\]]/)
 
-          match.sub(/%w[\(\[]/, '\0' + path + " ")
+          match.sub(/%w[(\[]/, '\0' + path + " ")
         end
       end
     end

data/lib/nextgen/commands/create.rb

@@ -14,6 +14,8 @@ module Nextgen
   class Commands::Create # rubocop:disable Metrics/ClassLength
     extend Forwardable
 
+    RESERVED_NAMES = %w[application destroy plugin runner test].freeze
+
     def self.run(app_path, options)
       new(app_path, options).run
     end
@@ -24,6 +26,8 @@ module Nextgen
     end
 
     def run # rubocop:disable Metrics/MethodLength, Metrics/PerceivedComplexity
+      reserved_word_message if app_name_is_reserved_word?
+
       say <<~BANNER
         Welcome to nextgen, the interactive Rails app generator!
 
@@ -106,6 +110,17 @@ module Nextgen
 
     def_delegators :shell, :say
 
+    def app_name_is_reserved_word?
+      RESERVED_NAMES.include?(app_name.downcase)
+    end
+
+    def reserved_word_message
+      say <<~APP_NAME
+        Your Rails app name: "#{cyan(app_name)}", is a reserved word. Please rerun the initial command with an unreserved word instead.
+      APP_NAME
+      exit(false)
+    end
+
     def continue_if(question)
       if prompt.yes?(question)
         say

data/lib/nextgen/generators/base.rb

@@ -32,7 +32,7 @@ append_to_file "Rakefile", <<~RUBY
   end
 RUBY
 
-if File.exist?("test/application_system_test_case.rb")
+if File.read("Gemfile").match?(/^\s*gem ['"]capybara['"]/)
   say_git "Configure system tests"
   copy_test_support_file "capybara.rb.tt"
   copy_file "test/application_system_test_case.rb", force: true
@@ -41,7 +41,9 @@ if File.exist?("test/application_system_test_case.rb")
 end
 
 missing_ruby_decl = !File.read("Gemfile").match?(/^ruby /)
-if missing_ruby_decl && File.exist?(".ruby-version") && File.read(".ruby-version").match?(/\A\d+\.\d+.\d+.\s*\z/m)
+if missing_ruby_decl &&
+    File.exist?(".ruby-version") &&
+    File.read(".ruby-version").match?(/\A(ruby-)?\d+\.\d+.\d+.\s*\z/m)
   say_git "Add ruby declaration to Gemfile"
   ruby_decl = if bundler_ruby_file_supported?
                 'ruby file: ".ruby-version"'
@@ -58,7 +60,6 @@ if File.exist?("app/views/layouts/application.html.erb")
   gsub_file "app/views/layouts/application.html.erb", "<html>", '<html lang="en">'
   gsub_file "app/views/layouts/application.html.erb", %r{^\s*<title>.*</title>}, <<~ERB.gsub(/^/, "    ").rstrip
     <title><%= content_for?(:title) ? strip_tags(yield(:title)) : #{app_const_base.titleize.inspect} %></title>
-    <meta name="apple-mobile-web-app-title" content="#{app_const_base.titleize}">
   ERB
 end
 

data/lib/nextgen/generators/erb_lint.rb

@@ -4,6 +4,7 @@ say_git "Install erb_lint"
 install_gem "erb_lint", group: :development, require: false
 binstub "erb_lint"
 template ".erb_lint.yml.tt"
+gitignore "/.erb_lint_cache"
 
 say_git "Add erb_lint to default rake task"
 copy_file "lib/tasks/erb_lint.rake"

data/lib/nextgen/version.rb

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

data/template/.overcommit.yml.tt

@@ -9,7 +9,7 @@ PreCommit:
   ErbLint:
     enabled: true
     required_executable: bundle
-    command: ["bundle", "exec", "erb_lint"]
+    command: ["bundle", "exec", "erb_lint", "--cache"]
     include: "**/*.html.erb"
 <% end -%>
 

data/template/README.md.tt

@@ -16,7 +16,7 @@ On macOS, these [Homebrew](http://brew.sh) packages are recommended:
 ```
 brew install rbenv
 <% if postgres -%>
-brew install postgresql@17
+brew install postgresql@18
 <% end -%>
 ```
 

data/template/lib/tasks/erb_lint.rake

@@ -2,7 +2,7 @@
 
 desc "Run erb_lint"
 task :erb_lint do
-  sh "bin/erb_lint --lint-all"
+  sh "bin/erb_lint --lint-all --cache"
 end
 
 namespace :erb_lint do

data/template/test/vite_helper.rb

@@ -3,6 +3,5 @@
 return if ViteRuby.config.auto_build
 
 # Compile assets once at the start of testing
-require "benchmark"
-seconds = Benchmark.realtime { ViteRuby.commands.build }
+seconds = ActiveSupport::Benchmark.realtime { ViteRuby.commands.build }
 puts format("Built Vite assets (%.1fms)", seconds * 1_000)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nextgen
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.38.0
 platform: ruby
 authors:
 - Matt Brictson
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 8.1.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -107,7 +107,6 @@ files:
 - lib/nextgen/generators/annotaterb.rb
 - lib/nextgen/generators/base.rb
 - lib/nextgen/generators/basic_auth.rb
-- lib/nextgen/generators/bundler_audit.rb
 - lib/nextgen/generators/capybara_lockstep.rb
 - lib/nextgen/generators/clean_gemfile.rb
 - lib/nextgen/generators/dotenv.rb

data/lib/nextgen/generators/bundler_audit.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-install_gem "bundler-audit", group: :development, require: false
-binstub "bundler-audit"
-
-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
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v5
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: .ruby-version
-          bundler-cache: true
-
-      - name: Scan for security vulnerabilities in Ruby dependencies
-        run: bundle exec bundle-audit check --update -v
-
-  YAML
-end