⬆️ Upgrade dependencies

Author: pboling

.gitignore

@@ -14,7 +14,9 @@
 *.gem
 /.idea/
 
-*.gemfile.lock
+# gemfile locks for CI
+/gemfiles/*.lock
+Appraisal.*.gemfile.lock
 
 # rspec failure tracking
 .rspec_status

.rubocop_gradual.lock

@@ -1,6 +1,9 @@
 {
-  "README.md:527065615": [
-    [167, 3, 100, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3592044714]
+  "README.md:767349837": [
+    [203, 3, 100, "Style/ClassMethodsDefinitions: Use `class << self` to define a class method.", 3592044714]
+  ],
+  "Rakefile:746406378": [
+    [93, 3, 11, "Rake/DuplicateTask: Task `spec` is defined at both Rakefile:85 and Rakefile:93.", 2701974006]
   ],
   "bin/bundle:247448467": [
     [64, 5, 20, "ThreadSafety/ClassInstanceVariable: Avoid class instance variables.", 2485198147]

Appraisal.root.gemfile

@@ -8,3 +8,5 @@ source "https://rubygems.org"
 # We do not load the standard Gemfile, as it is tailored for local development.
 
 gemspec
+
+gem "appraisal", github: "pboling/appraisal", branch: "galtzo"

Appraisals

@@ -234,3 +234,27 @@ appraise "sequel-5.86" do
   gem "mutex_m", "~> 0.1"
   gem "stringio", ">= 0.0.2"
 end
+
+# Only run security audit on latest Ruby version
+appraise "audit" do
+  gem "mutex_m", "~> 0.2"
+  gem "stringio", "~> 3.0"
+  eval_gemfile "modular/audit.gemfile"
+  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
+end
+
+# Only run coverage on latest Ruby version
+appraise "coverage" do
+  gem "mutex_m", "~> 0.2"
+  gem "stringio", "~> 3.0"
+  eval_gemfile "modular/coverage.gemfile"
+  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
+end
+
+# Only run linter on latest Ruby version (but, in support of oldest supported Ruby version)
+appraise "style" do
+  gem "mutex_m", "~> 0.2"
+  gem "stringio", "~> 3.0"
+  eval_gemfile "modular/style.gemfile"
+  remove_gem "appraisal" # only present because it must be in the gemfile because we target a git branch
+end

CONTRIBUTING.md

@@ -37,14 +37,22 @@ To refresh the `reek` list:
 bundle exec reek > REEK
 ```
 
-## Appraisal
+## Appraisals
 
-### Generate a new set of Appraisal gemfiles:
+From time to time the appraisal gemfiles in `gemfiles/` will need to be updated.
+They are created and updated with the commands:
 
-```bash
-BUNDLE_GEMFILE=Appraisal.root.gemfile appraisal update
+NOTE: We run on a [fork][🚎appraisal-fork] of Appraisal.
+
+Please upvote the PR for `eval_gemfile` [support][🚎appraisal-eval-gemfile-pr]
+
+```shell
+BUNDLE_GEMFILE=Appraisal.root.gemfile bundle
+BUNDLE_GEMFILE=Appraisal.root.gemfile bundle exec appraisal update
 ```
 
+When adding an appraisal to CI check the [runner tool cache][🏃‍♂️runner-tool-cache] to see which runner to use.
+
 ## Run Tests
 
 NOTE: In order to run *all* the tests you will need to have the following databases installed, configured, and running.
@@ -119,7 +127,7 @@ bundle exec rake
 
 Or just run the linter.
 ```bash
-bundle exec rubocop_gradual:autocorrect
+bundle exec rake rubocop_gradual:autocorrect
 ```
 
 ## Release

Gemfile

@@ -14,21 +14,14 @@ gemspec
 gem "mutex_m", "~> 0.2"
 gem "stringio", "~> 3.1", ">= 3.1.2"
 
+### Security Audit
+eval_gemfile "gemfiles/modular/audit.gemfile"
+
 ### Documentation
-gem "yard", "~> 0.9.34", require: false
-gem "yard-junk", "~> 0.0.10"
-gem "github-markup"
-gem "redcarpet"
-gem "rdoc", "~> 6.10"
+eval_gemfile "gemfiles/modular/documentation.gemfile"
 
 ### Linting
-gem "rubocop-lts", "~> 12.1", ">= 12.1.1"
-gem "rubocop-minitest"
-gem "rubocop-packaging", "~> 0.5", ">= 0.5.2"
-gem "rubocop-rspec", "~> 3.2"
-gem "rubocop-sequel"
-gem "standard", ">= 1.35.1", "!= 1.41.1", "!= 1.42.0"
-gem "reek"
+eval_gemfile "gemfiles/modular/style.gemfile"
 
 ### ORMs
 gem "couch_potato", "~> 1.17", require: false
@@ -44,10 +37,11 @@ gem "guard-bundler"
 gem "guard-rspec"
 gem "rb-fsevent"
 
-### Coverage
-gem "kettle-soup-cover", "~> 1.0", ">= 1.0.4"
+# Code Coverage
+eval_gemfile "gemfiles/modular/coverage.gemfile"
 
 ### Testing
+gem "appraisal", github: "pboling/appraisal", branch: "galtzo"
 gem "test-unit", ">= 3.0"
 
 platform :mri do

Gemfile.lock

@@ -1,11 +1,33 @@
+GIT
+  remote: https://github.com/pboling/appraisal
+  revision: a3a3e4b7db67d9b085f96b2ffddd2b51bd8a1196
+  branch: galtzo
+  specs:
+    appraisal (3.0.0.rc1)
+      bundler (>= 1.17.3)
+      rake (>= 10)
+      thor (>= 0.14)
+
+GIT
+  remote: https://github.com/pboling/yard-junk
+  revision: 54ccebabbfa9a9cd44d0b991687ebbfd22c32b55
+  branch: next
+  specs:
+    yard-junk (0.0.10)
+      backports (>= 3.18)
+      benchmark
+      ostruct
+      rainbow
+      yard
+
 PATH
   remote: .
   specs:
     omniauth-identity (3.1.1)
       bcrypt (~> 3.1)
       mutex_m (~> 0.3, >= 0.3.0)
       omniauth (>= 1)
-      version_gem (~> 1.1, >= 1.1.4)
+      version_gem (~> 1.1, >= 1.1.8)
 
 GEM
   remote: https://rubygems.org/
@@ -33,17 +55,16 @@ GEM
       activesupport (>= 5)
       version_gem (~> 1.1, >= 1.1.4)
     ansi (1.5.0)
-    appraisal (2.5.0)
-      bundler
-      rake
-      thor (>= 0.14.0)
     ast (2.4.3)
     backports (3.25.1)
     base64 (0.2.0)
     bcrypt (3.1.20)
     benchmark (0.4.0)
     bigdecimal (3.1.9)
     bson (5.0.2)
+    bundler-audit (0.9.2)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 1.0)
     byebug (12.0.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
@@ -355,11 +376,6 @@ GEM
     unicode-emoji (4.0.4)
     version_gem (1.1.8)
     yard (0.9.37)
-    yard-junk (0.0.10)
-      backports (>= 3.18)
-      ostruct
-      rainbow
-      yard
     zeitwerk (2.7.2)
 
 PLATFORMS
@@ -381,15 +397,17 @@ PLATFORMS
 DEPENDENCIES
   activerecord (>= 5)
   anonymous_active_record (~> 1.0, >= 1.0.9)
-  appraisal (~> 2.5)
+  appraisal!
+  benchmark (~> 0.4)
+  bundler-audit (~> 0.9.2)
   byebug (>= 11)
   couch_potato (~> 1.17)
-  github-markup
+  github-markup (~> 5.0, >= 5.0.1)
   growl
   guard
   guard-bundler
   guard-rspec
-  kettle-soup-cover (~> 1.0, >= 1.0.4)
+  kettle-soup-cover (~> 1.0, >= 1.0.6)
   mongoid (>= 7)
   mongoid-rspec (~> 4.2)
   mutex_m (~> 0.2)
@@ -398,8 +416,8 @@ DEPENDENCIES
   rack-test (~> 1)
   rake (~> 13)
   rb-fsevent
-  rdoc (~> 6.10)
-  redcarpet
+  rdoc (~> 6.11)
+  redcarpet (~> 3.6)
   reek
   rspec (~> 3)
   rspec-block_is_expected (~> 1.0, >= 1.0.6)
@@ -413,8 +431,8 @@ DEPENDENCIES
   standard (>= 1.35.1, != 1.42.0, != 1.41.1)
   stringio (~> 3.1, >= 3.1.2)
   test-unit (>= 3.0)
-  yard (~> 0.9.34)
-  yard-junk (~> 0.0.10)
+  yard (~> 0.9, >= 0.9.37)
+  yard-junk (~> 0.0, >= 0.0.10)!
 
 BUNDLED WITH
    2.6.2

Rakefile

@@ -2,8 +2,47 @@
 
 require "bundler/gem_tasks"
 
+defaults = []
+
+# See: https://docs.gitlab.com/ci/variables/predefined_variables/
+is_gitlab = ENV.fetch("GITLAB_CI", "false").casecmp("true") == 0
+
+### DEVELOPMENT TASKS
+# Setup Kettle Soup Cover
+begin
+  require "kettle-soup-cover"
+
+  Kettle::Soup::Cover.install_tasks
+  # NOTE: Coverage on CI is configured independent of this task.
+  #       This task is for local development, as it opens results in browser
+  defaults << "coverage" unless Kettle::Soup::Cover::IS_CI
+rescue LoadError
+  desc("(stub) coverage is unavailable")
+  task("coverage") do
+    warn("NOTE: kettle-soup-cover isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
+  end
+end
+
+# Setup Bundle Audit
+begin
+  require "bundler/audit/task"
+
+  Bundler::Audit::Task.new
+  defaults.push("bundle:audit:update", "bundle:audit")
+rescue LoadError
+  desc("(stub) bundle:audit is unavailable")
+  task("bundle:audit") do
+    warn("NOTE: bundler-audit isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
+  end
+  desc("(stub) bundle:audit:update is unavailable")
+  task("bundle:audit:update") do
+    warn("NOTE: bundler-audit isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
+  end
+end
+
 begin
   require "rspec/core/rake_task"
+
   # Define a default test task which will run only specs which work on sqlite3 because,
   #   when running sqlite3-based tests you don't need any additional services running.
   %w(active_record sequel).each do |orm|
@@ -51,52 +90,70 @@ begin
     spec_orm_sequel
   ])
 rescue LoadError
-  task(:test) do
-    warn("RSpec is disabled")
+  task(:spec) do
+    warn("NOTE: rspec isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
   end
 end
 
+# Setup RuboCop-LTS
 begin
-  require "reek/rake/task"
-  Reek::Rake::Task.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = "{spec,spec_ignored,spec_orms,lib}/**/*.rb"
-  end
+  require "rubocop/lts"
+
+  Rubocop::Lts.install_tasks
+  defaults << "rubocop_gradual"
 rescue LoadError
-  task(:reek) do
-    warn("reek is disabled")
+  desc("(stub) rubocop_gradual is unavailable")
+  task(:rubocop_gradual) do
+    warn("NOTE: rubocop-lts isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
   end
 end
 
+# Setup Yard
 begin
-  require "yard-junk/rake"
+  require "yard"
 
-  YardJunk::Rake.define_task
+  YARD::Rake::YardocTask.new(:yard) do |t|
+    t.files = [
+      # Splats (alphabetical)
+      "lib/**/*.rb",
+    ]
+  end
+  defaults << "yard"
 rescue LoadError
-  task("yard:junk") do
-    warn("yard:junk is disabled")
+  desc("(stub) yard is unavailable")
+  task(:yard) do
+    warn("NOTE: yard isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
   end
 end
 
+# Setup Reek
 begin
-  require "yard"
+  require "reek/rake/task"
 
-  YARD::Rake::YardocTask.new(:yard)
+  Reek::Rake::Task.new do |t|
+    t.fail_on_error = true
+    t.verbose = false
+    t.source_files = "{spec,spec_ignored,spec_orms,lib}/**/*.rb"
+  end
+  defaults << "reek" unless is_gitlab
 rescue LoadError
-  task(:yard) do
-    warn("yard is disabled")
+  desc("(stub) reek is unavailable")
+  task(:reek) do
+    warn("NOTE: reek isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
   end
 end
 
+### RELEASE TASKS
+# Setup stone_checksums
 begin
-  require "rubocop/lts"
-  Rubocop::Lts.install_tasks
+  require "stone_checksums"
+
+  GemChecksums.install_tasks
 rescue LoadError
-  task(:rubocop_gradual) do
-    warn("RuboCop (Gradual) is disabled")
+  desc("(stub) build:generate_checksums is unavailable")
+  task("build:generate_checksums") do
+    warn("NOTE: stone_checksums isn't installed, or is disabled for #{RUBY_VERSION} in the current environment")
   end
 end
 
-# These tests do not require any services to be running, so this is what we run as default
-task default: %i[spec:orm:all rubocop_gradual:autocorrect yard yard:junk]
+task default: defaults

gemfiles/ar_5_0.gemfile

@@ -2,9 +2,10 @@
 
 source "https://rubygems.org"
 
+gem "appraisal", :branch => "galtzo", :git => "https://github.com/pboling/appraisal"
 gem "activerecord", "~> 5.0.7.2"
 gem "mutex_m", "~> 0.1"
 gem "stringio", ">= 0.0.2"
 gem "sqlite3", "~> 1.3"
 
-gemspec path: "../"
+gemspec :path => "../"