Get rid of omakase from test apps and other rubocop fixes

Author: lcreid

.rubocop.yml

@@ -46,39 +46,16 @@ Layout/LineLength:
   IgnoreCopDirectives: true
   # AllowedPatterns: []
 
-# Rails 5 only requires 2.2.2.
 AllCops:
   NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.2
   Exclude:
     - Capfile
     - Gemfile
-    - "test/rails_app/bin/**/*"
-    - "test/rails_app/config/**/*"
-    - test/rails_app/config.ru
-    - "test/rails_app/db/**/*"
-    - "test/rails_app/log/**/*"
-    - "test/rails_app/tmp/**/*"
-    - "test/rails_app/vendor/**/*"
-    - "test/rails_app/node_modules/**/*"
-    - "test/rails_app/bower_components/**/*"
-    - test/rails_app/Gemfile
-    - test/rails_app/Guardfile
-    - test/rails_app/Rakefile
-    - "test/es_rails_app/bin/**/*"
-    - "test/es_rails_app/config/**/*"
-    - test/es_rails_app/config.ru
-    - "test/es_rails_app/db/**/*"
-    - "test/es_rails_app/log/**/*"
-    - "test/es_rails_app/tmp/**/*"
-    - "test/es_rails_app/vendor/**/*"
-    - "test/es_rails_app/node_modules/**/*"
-    - "test/es_rails_app/bower_components/**/*"
-    - test/es_rails_app/Gemfile
-    - test/es_rails_app/Guardfile
-    - test/es_rails_app/Rakefile
+    - test/es_rails_app/**/*
+    - test/rails_app/**/*
     - vendor/bundle/**/*
 
 Metrics/BlockLength:
@@ -96,9 +73,3 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Exclude:
     - test/**/*.rb
-
-# TODO: Remove this when minimum Ruby is 2.3.
-Layout/HeredocIndentation:
-  Exclude:
-    - Dangerfile
-    - devise-bootstrap-form.gemspec

Dangerfile

@@ -21,8 +21,8 @@ has_changelog_changes = git.modified_files.include?("CHANGELOG.md")
 # You've made changes to lib, but didn't write any tests?
 # ------------------------------------------------------------------------------
 if has_lib_changes && !has_test_changes
-  warn("There are code changes, but no corresponding tests. "\
-       "Please include tests if this PR introduces any modifications in "\
+  warn("There are code changes, but no corresponding tests. " \
+       "Please include tests if this PR introduces any modifications in " \
        "#{project_name}'s behavior.",
        sticky: false)
 end
@@ -32,14 +32,14 @@ end
 # ------------------------------------------------------------------------------
 if !has_changelog_changes && has_lib_changes
   markdown <<~MARKDOWN
-  Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
+    Here's an example of a CHANGELOG.md entry (place it immediately under the `* Your contribution here!` line):
 
-  ```markdown
-  * [##{pr_number}](#{pr_url}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
-  ```
+    ```markdown
+    * [##{pr_number}](#{pr_url}): #{github.pr_title} - [@#{github.pr_author}](https://github.com/#{github.pr_author}).
+    ```
   MARKDOWN
-  warn("Please update CHANGELOG.md with a description of your changes. "\
-       "If this PR is not a user-facing change (e.g. just refactoring), "\
+  warn("Please update CHANGELOG.md with a description of your changes. " \
+       "If this PR is not a user-facing change (e.g. just refactoring), " \
        "you can disregard this.", sticky: false)
 end
 

Gemfile

@@ -6,8 +6,7 @@ source "https://rubygems.org"
 gemspec
 
 group :development do
-  gem "chandler", ">= 0.7.0"
-  # gem "htmlbeautifier"
+  gem "rubocop-rails-omakase"
   gem "rubocop", require: false
   gem "rubocop-rake", require: false
 end

RELEASING.md

@@ -6,8 +6,7 @@ Follow these steps to release a new version of `devise-bootstrap-form` to `rubyg
 
 * You must have commit rights to the `devise-bootstrap-form` repository.
 * You must have push rights for the `devise-bootstrap-form` gem on `rubygems.org`.
-* You must be using Ruby >= 2.2.
-* Your GitHub credentials must be available to Chandler via `~/.netrc` or an environment variable, [as explained here](https://github.com/mattbrictson/chandler#2-configure-credentials).
+* You must be using Ruby >= 3.2.
 
 ## How to release
 

Rakefile

@@ -14,8 +14,3 @@ desc "Run RuboCop lint checks"
 RuboCop::RakeTask.new(:lint)
 
 task default: %i[test lint]
-
-require "chandler/tasks"
-
-# Add chandler as a prerequisite for `rake release`
-task "release:rubygem_push" => "chandler:push"

devise-bootstrap-form.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
     raise "RubyGems 2.0 or newer is required to protect against public gem pushes."
   end
 
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 3.2"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
@@ -43,10 +43,6 @@ Gem::Specification.new do |spec|
   # we add a new partial.
   spec.add_dependency "devise", ">= 4.6.0"
   spec.add_dependency "rails", ">= 5.0.0"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "chandler"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "rake"
   spec.metadata = {
     "rubygems_mfa_required" => "true"
   }

lib/generators/devise/views/bootstrap_form_generator.rb

@@ -31,10 +31,10 @@ def copy_views
       def copy_assets
         directory "assets/stylesheets", "app/assets/stylesheets"
         target_file = if File.exist?("app/assets/stylesheets/application.bootstrap.scss")
-          "app/assets/stylesheets/application.bootstrap.scss"
-        else
-          "app/assets/stylesheets/application.scss"
-        end
+                        "app/assets/stylesheets/application.bootstrap.scss"
+                      else
+                        "app/assets/stylesheets/application.scss"
+                      end
         append_to_file target_file do
           '@import "devise_bootstrap_form";'
         end

test/es_rails_app/.rubocop.yml

@@ -1,5 +1,5 @@
 # Omakase Ruby styling for Rails
-inherit_gem: { rubocop-rails-omakase: rubocop.yml }
+# inherit_gem: { rubocop-rails-omakase: rubocop.yml }
 
 # Overwrite or add rules to create your own house style
 #

test/es_rails_app/Gemfile

@@ -44,9 +44,6 @@ group :development, :test do
 
   # Static analysis for security vulnerabilities [https://brakemanscanner.org/]
   gem "brakeman", require: false
-
-  # Omakase Ruby styling [https://github.com/rails/rubocop-rails-omakase/]
-  gem "rubocop-rails-omakase", require: false
 end
 
 group :development do

test/rails_app/.rubocop.yml

@@ -1,5 +1,5 @@
 # Omakase Ruby styling for Rails
-inherit_gem: { rubocop-rails-omakase: rubocop.yml }
+# inherit_gem: { rubocop-rails-omakase: rubocop.yml }
 
 # Overwrite or add rules to create your own house style
 #