nextgen 0.2.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9891f4e3028745d3dfa0d7e225a87e67b499995effab4c41f416bedfbceee804
-  data.tar.gz: 6a5c2f9f7bf0065263163f67e38720b98bd3dcdb54fe998c43af8e001e4b5e96
+  metadata.gz: 07b5db72fd0b2565334a0de9be709d803aac4099527a0f4b559335d8df3061a0
+  data.tar.gz: 94cf539ccfe794dc70ba2b46102eef081cb1602b923dc58ed4a2dc3ad8cb121a
 SHA512:
-  metadata.gz: c31b1c4ec93cd8c6a99c7ad1e320eace9ac437c023a46b175ed7f5f5b3b234d0af0295f59a2f6d7f3f60a60105be84b25329004b0c5cfb1b8aa912c6ab63661f
-  data.tar.gz: f11c4657543959b4e7b0da0b567f7852945fa453a53e70f72c42f6cecc7cc8fe9ac451b36897bed4bcaa200567b0fd15989fff700fa9e5af1e5742b4c6cf034e
+  metadata.gz: dd455a469651f794c75d88263892587016b930941e1baf7e758cddbb85b51ed3f1efdc78c02065a2dcdbcd55686701decb74cda75efba3702abb178f338c4422
+  data.tar.gz: b347b1918083bc71615fe301e504da5c3c9b4e60283f55b5ff812720ec40fe1cd04f3123fdebbdf2469a0799638d39ea3c37028ca514f0b3d93f2d07748dbb07

data/README.md

@@ -97,6 +97,7 @@ Nextgen can install and configure your choice of these recommended gems:
 - [sidekiq](https://github.com/sidekiq/sidekiq)
 - [thor](https://github.com/rails/thor)
 - [tomo](https://github.com/mattbrictson/tomo)
+- [vcr](https://github.com/vcr/vcr)
 
 ### Node packages
 

data/config/generators.yml

@@ -70,6 +70,10 @@ factory_bot_rails:
   description: "Install and configure factory_bot_rails gem"
   requires: active_record
 
+github_pr_template:
+  prompt: "GitHub PR template"
+  description: "Add GitHub pull request template"
+
 git_safe:
 
 good_migrations:
@@ -131,7 +135,7 @@ tomo:
 
 vcr:
   prompt: "VCR"
-  description: "Install and configure the vcr gem"
+  description: "Install and configure vcr and webmock gems"
   requires: test_framework
 
 rubocop:

data/lib/nextgen/actions.rb

@@ -54,16 +54,18 @@ module Nextgen
     end
 
     def copy_test_support_file(file)
+      copy_action = file.end_with?(".tt") ? method(:template) : method(:copy_file)
+
       if minitest?
         create_test_support_directory
-        copy_file "test/support/#{file}"
+        copy_action.call "test/support/#{file}"
       elsif rspec?
         empty_directory "spec/support"
         spec_file_path = "spec/support/#{file}"
         if Nextgen.template_path.join(spec_file_path).exist?
-          copy_file spec_file_path
+          copy_action.call spec_file_path
         else
-          copy_file "test/support/#{file}", spec_file_path
+          copy_action.call "test/support/#{file}", spec_file_path.sub(/\.tt$/, "")
         end
       end
     end

data/lib/nextgen/commands/create.rb

@@ -135,7 +135,7 @@ module Nextgen
         "MySQL" => "mysql"
       }
       all_databases = common_databases.merge(
-        %w[MySQL Oracle SQLServer JDBCMySQL JDBCSQLite3 JDBCPostgreSQL JDBC].to_h do |name|
+        %w[MySQL Trilogy Oracle SQLServer JDBCMySQL JDBCSQLite3 JDBCPostgreSQL JDBC].to_h do |name|
           [name, name.downcase]
         end,
         "None (disable Active Record)" => nil
@@ -185,6 +185,7 @@ module Nextgen
       rails_opts.javascript = prompt.select(
         "Which JavaScript bundler will you use with the asset pipeline?",
         "Importmap (default)" => "importmap",
+        "Bun" => "bun",
         "ESBuild" => "esbuild",
         "Rollup" => "rollup",
         "Webpack" => "webpack",

data/lib/nextgen/generators/base.rb

@@ -27,6 +27,7 @@ RUBY
 
 if File.exist?("test/application_system_test_case.rb")
   say_git "Configure system tests"
+  copy_test_support_file "capybara.rb.tt"
   copy_file "test/application_system_test_case.rb", force: true
 end
 

data/lib/nextgen/generators/github_pr_template.rb

@@ -0,0 +1 @@
+template ".github/PULL_REQUEST_TEMPLATE.md.tt"

data/lib/nextgen/generators/rspec_system_testing.rb

@@ -1,4 +1,5 @@
 install_gems "capybara", "selenium-webdriver", group: :test
+copy_test_support_file "capybara.rb.tt"
 copy_test_support_file "system.rb"
 
 copy_file "lib/templates/rspec/system/system_spec.rb"

data/lib/nextgen/generators/rubocop.rb

@@ -6,7 +6,8 @@ plugins << "factory_bot" if gemfile.match?(/^\s*gem ['"]factory_bot/)
 plugins << "minitest" if minitest?
 plugins << "performance"
 plugins << "rails"
-install_gems "rubocop", *plugins.map { "rubocop-#{_1}" }, group: :development, require: false
+install_gem("rubocop-rails", version: ">= 2.22.0", group: :development, require: false)
+install_gems(*plugins.map { "rubocop-#{_1}" }, "rubocop", group: :development, require: false)
 binstub "rubocop"
 
 say_git "Generate .rubocop.yml"

data/lib/nextgen/generators/vcr.rb

@@ -1,2 +1,3 @@
 install_gems "vcr", "webmock", group: :test
-template "test/support/vcr.rb.tt", rspec? ? "spec/support/vcr.rb" : "test/support/vcr.rb"
+copy_test_support_file "vcr.rb.tt"
+copy_test_support_file "webmock.rb"

data/lib/nextgen/rails_options.rb

@@ -3,6 +3,7 @@ module Nextgen
     DATABASES = %w[
       postgresql
       mysql
+      trilogy
       sqlite3
       oracle
       sqlserver

data/lib/nextgen/version.rb

@@ -1,3 +1,3 @@
 module Nextgen
-  VERSION = "0.2.0".freeze
+  VERSION = "0.4.0".freeze
 end

data/template/.github/PULL_REQUEST_TEMPLATE.md.tt

@@ -0,0 +1,21 @@
+Problem
+=======
+
+<!-- describe what motivated this PR -->
+
+<!-- link to issue or ticket -->
+
+Solution
+========
+
+Steps to verify
+---------------
+
+1. step
+1. step
+1. step
+<% if File.exist?("app/views/layouts/application.html.erb") -%>
+
+Screenshots
+-----------
+<% end -%>

data/template/.rubocop.yml.tt

@@ -190,15 +190,6 @@ Rails/RootPathnameMethods:
 Rails/SkipsModelValidations:
   Enabled: false
 
-<% if Gem::Version.new(Rails.version) >= Gem::Version.new("7.1.0.beta1") -%>
-Rails/UnknownEnv:
-  Environments:
-    - development
-    - test
-    - production
-    - local
-<% end -%>
-
 Rails/Validation:
   Enabled: false
 

data/template/spec/support/system.rb

@@ -1,9 +1,3 @@
-require "capybara/rails"
-require "capybara/rspec"
-
-Capybara.default_max_wait_time = 2
-Capybara.disable_animation = true
-
 RSpec.configure do |config|
   config.before(:each, type: :system) do
     driven_by :selenium,

data/template/spec/support/webmock.rb

@@ -0,0 +1 @@
+require "webmock/rspec"

data/template/test/application_system_test_case.rb

@@ -1,5 +1,4 @@
 require "test_helper"
-require "capybara/rails"
 
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium,
@@ -9,10 +8,4 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
       options.add_argument("--disable-dev-shm-usage")
       options.add_argument("--no-sandbox")
     end
-
-  setup do
-    Capybara.default_max_wait_time = 2
-    Capybara.disable_animation = true
-    Capybara.server = :puma, {Silent: true}
-  end
 end

data/template/test/support/capybara.rb.tt

@@ -0,0 +1,12 @@
+require "capybara/rails"
+<% if rspec? -%>
+require "capybara/rspec"
+<% end -%>
+
+Capybara.configure do |config|
+  config.default_max_wait_time = 2
+  config.disable_animation = true
+  config.enable_aria_label = true
+  config.server = :puma, {Silent: true}
+  config.test_id = "data-testid"
+end

data/template/test/support/webmock.rb

@@ -0,0 +1 @@
+require "webmock/minitest"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nextgen
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Matt Brictson
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -117,6 +117,7 @@ files:
 - lib/nextgen/generators/factory_bot_rails.rb
 - lib/nextgen/generators/git_safe.rb
 - lib/nextgen/generators/github_actions.rb
+- lib/nextgen/generators/github_pr_template.rb
 - lib/nextgen/generators/good_migrations.rb
 - lib/nextgen/generators/home_controller.rb
 - lib/nextgen/generators/initial_git_commit.rb
@@ -146,6 +147,7 @@ files:
 - template/.env.sample
 - template/.erb-lint.yml.tt
 - template/.eslintrc.cjs
+- template/.github/PULL_REQUEST_TEMPLATE.md.tt
 - template/.github/workflows/ci.yml.tt
 - template/.overcommit.yml.tt
 - template/.prettierrc.cjs
@@ -183,13 +185,16 @@ files:
 - template/spec/support/mailer.rb
 - template/spec/support/shoulda.rb
 - template/spec/support/system.rb
+- template/spec/support/webmock.rb
 - template/test/application_system_test_case.rb
 - template/test/helpers/inline_svg_helper_test.rb
+- template/test/support/capybara.rb.tt
 - template/test/support/factory_bot.rb
 - template/test/support/mailer.rb
 - template/test/support/shoulda.rb
 - template/test/support/vcr.rb.tt
 - template/test/support/vite.rb
+- template/test/support/webmock.rb
 homepage: https://github.com/mattbrictson/nextgen
 licenses:
 - MIT
@@ -214,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Generate your next Rails app interactively!