RuboCop 0.81

.rubocop.yml

@@ -5,40 +5,37 @@ AllCops:
     - '.github/**/*'
     - 'gemfiles/**/*'
 
-# Match existing layout
+#
+# RuboCop built-in settings.
+#   For documentation on all settings see: https://docs.rubocop.org/en/stable
+#
+
+# Trailing periods.
 Layout/DotPosition:
   EnforcedStyle: trailing
 
-# Rubocop cannot yet see beyond one line above or below, when aligning =
-Layout/ExtraSpacing:
-  Enabled: false
-  AllowForAlignment: true
-  ForceEqualSignAlignment: true
-  AutoCorrect: false
+# Turn on auto-correction of equals alignment.
+Layout/EndAlignment:
+  AutoCorrect: true
 
-# Pick one
-Layout/IndentHeredoc:
-  EnforcedStyle: squiggly
+# Prevent accidental windows line endings
+Layout/EndOfLine:
+  EnforcedStyle: lf
 
-# Match existing layout
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented
-  IndentationWidth: 2
+# Use a table layout for hashes
+Layout/HashAlignment:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
 
-# Rubocop cannot yet see beyond one line above or below, when aligning =
-Layout/SpaceAroundOperators:
-  Enabled: false
-  AllowForAlignment: true
-  AutoCorrect: false
+# Soften limits
+Layout/LineLength:
+  Max: 128
+  Exclude:
+    - '**/test/**/*'
 
 # Match existing layout
 Layout/SpaceInsideHashLiteralBraces:
   EnforcedStyle: no_space
-  EnforcedStyleForEmptyBraces: no_space
-
-# Files must end with a blank line
-Layout/TrailingBlankLines:
-  EnforcedStyle: final_newline
 
 # TODO: Soften Limits for phase 1 only
 Metrics/AbcSize:
@@ -48,6 +45,10 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Exclude:
     - 'test/**/*'
+    - '**/*/cli.rb'
+  ExcludedMethods:
+    - 'aasm'
+    - 'included'
 
 # Soften limits
 Metrics/ClassLength:
@@ -59,12 +60,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 15
 
-Metrics/LineLength:
-  Max: 128
-  Exclude:
-    - 'cli.rb'
-    - 'test/**/*'
-
 # Soften limits
 Metrics/MethodLength:
   Max: 50
@@ -81,7 +76,7 @@ Metrics/PerceivedComplexity:
   Max: 21
 
 # Initialization Vector abbreviation
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   AllowedNames: ['iv', '_', 'io', 'ap']
 
 # Does not allow Symbols to load
@@ -98,7 +93,7 @@ Style/Documentation:
 
 # One line methods
 Style/EmptyMethod:
-  Enabled: false
+  EnforcedStyle: expanded
 
 # Ruby 3 compatibility feature
 Style/FrozenStringLiteralComment:
@@ -107,3 +102,14 @@ Style/FrozenStringLiteralComment:
 Style/NumericPredicate:
   AutoCorrect: true
 
+# Incorrectly changes job.fail to job.raise
+Style/SignalException:
+  Enabled: false
+
+# Since English may not be loaded, cannot force its use.
+Style/SpecialGlobalVars:
+  Enabled: false
+
+# Make it easier for developers to move between Elixir and Ruby.
+Style/StringLiterals:
+  EnforcedStyle: double_quotes

.travis.yml

@@ -2,19 +2,6 @@ language: ruby
 
 matrix:
   include:
-    - name: "Rails 4.2 on Ruby 2.3.8"
-      rvm: 2.3.8
-      gemfile: gemfiles/rails_4.2.gemfile
-
-    - name: "Rails 5.0.2 on Ruby 2.4.6"
-      rvm: 2.4.6
-      gemfile: gemfiles/rails_5.0.2.gemfile
-    - name: "Rails 5.0.6 on Ruby 2.4.6"
-      rvm: 2.4.6
-      gemfile: gemfiles/rails_5.0.6.gemfile
-    - name: "Rails 5.0.7 on Ruby 2.4.6"
-      rvm: 2.4.6
-      gemfile: gemfiles/rails_5.0.7.gemfile
     - name: "Rails 5.1.4 on Ruby 2.4.6"
       rvm: 2.4.6
       gemfile: gemfiles/rails_5.1.4.gemfile

Appraisals

@@ -1,40 +1,23 @@
-appraise 'rails_4.2' do
-  gem 'rails', '~> 4.2.0'
-  gem 'activerecord-jdbcsqlite3-adapter', '~> 1.0', platform: :jruby
-  gem 'sqlite3', '~> 1.3.0', platform: :ruby
+appraise "rails_5.1.4" do
+  gem "rails", "5.1.4"
+  gem "sqlite3", "~> 1.3.0", platform: :ruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
 end
 
-appraise 'rails_5.0.2' do
-  gem 'minitest', '5.10.1'
-  gem 'rails', '5.0.2'
-  gem 'sqlite3', '~> 1.3.0', platform: :ruby
+appraise "rails_5.1.5" do
+  gem "rails", "~> 5.1.5"
+  gem "sqlite3", "~> 1.3.0", platform: :ruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
 end
 
-appraise 'rails_5.0.6' do
-  gem 'rails', '5.0.6'
-  gem 'sqlite3', '~> 1.3.0', platform: :ruby
+appraise "rails_5.2" do
+  gem "rails", "~> 5.2.0"
+  gem "sqlite3", "~> 1.3.0", platform: :ruby
+  gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
 end
 
-appraise 'rails_5.0.7' do
-  gem 'rails', '~> 5.0.7'
-  gem 'sqlite3', '~> 1.3.0', platform: :ruby
-end
-
-appraise 'rails_5.1.4' do
-  gem 'rails', '5.1.4'
-  gem 'sqlite3', '~> 1.3.0', platform: :ruby
-end
-
-appraise 'rails_5.1.5' do
-  gem 'rails', '~> 5.1.5'
-  gem 'sqlite3', '~> 1.3.0', platform: :ruby
-end
-
-appraise 'rails_5.2' do
-  gem 'rails', '~> 5.2.0'
-  gem 'sqlite3', '~> 1.3.0', platform: :ruby
-end
-
-appraise 'rails_6.0' do
-  gem 'rails', '6.0.0.rc1'
+appraise "rails_6.0" do
+  gem "rails", "~> 6.0.0"
+  gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
+  gem "sqlite3", "~> 1.4.0", platform: :ruby
 end

Gemfile

@@ -1,16 +1,21 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
 
-gem 'active_model_serializers'
-gem 'awesome_print'
-gem 'minitest'
-gem 'rake'
+gem "appraisal"
+gem "puma"
 
-gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-gem 'appraisal'
-gem 'jdbc-sqlite3', platform: :jruby
-gem 'puma'
-gem 'sqlite3', platform: :ruby
+gem "active_model_serializers"
+gem "awesome_print"
+gem "minitest"
+gem "rake"
+gem "sprockets", "< 4.0"
 
-gem 'rails', '6.0.0.rc1'
+gem "rails", "~> 5.0.0"
+gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
+gem "sqlite3", "~> 1.3.0", platform: :ruby
+gem "jdbc-sqlite3", platform: :jruby
+
+group :development do
+  gem "rubocop"
+end

Rakefile

@@ -1,30 +1,30 @@
 # Setup bundler to avoid having to run bundle exec all the time.
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-require 'rake/testtask'
-require_relative 'lib/rails_semantic_logger/version'
+require "rake/testtask"
+require_relative "lib/rails_semantic_logger/version"
 
 task :gem do
-  system 'gem build rails_semantic_logger.gemspec'
+  system "gem build rails_semantic_logger.gemspec"
 end
 
 task publish: :gem do
   system "git tag -a v#{RailsSemanticLogger::VERSION} -m 'Tagging #{RailsSemanticLogger::VERSION}'"
-  system 'git push --tags'
+  system "git push --tags"
   system "gem push rails_semantic_logger-#{RailsSemanticLogger::VERSION}.gem"
   system "rm rails_semantic_logger-#{RailsSemanticLogger::VERSION}.gem"
 end
 
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = "test/**/*_test.rb"
   t.verbose = true
   t.warning = false
 end
 
 # By default run tests against all appraisals
-if !ENV['APPRAISAL_INITIALIZED'] && !ENV['TRAVIS']
-  require 'appraisal'
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  require "appraisal"
   task default: :appraisal
 else
   task default: :test

gemfiles/rails_5.1.4.gemfile

@@ -2,15 +2,20 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "puma"
 gem "active_model_serializers"
 gem "awesome_print"
 gem "minitest"
 gem "rake"
-gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-gem "appraisal"
-gem "jdbc-sqlite3", platform: :jruby
-gem "puma"
-gem "sqlite3", "~> 1.3.0", platform: :ruby
+gem "sprockets", "< 4.0"
 gem "rails", "5.1.4"
+gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
+gem "sqlite3", "~> 1.3.0", platform: :ruby
+gem "jdbc-sqlite3", platform: :jruby
+
+group :development do
+  gem "rubocop"
+end
 
 gemspec path: "../"

gemfiles/rails_5.1.5.gemfile

@@ -2,15 +2,20 @@
 
 source "https://rubygems.org"
 
+gem "appraisal"
+gem "puma"
 gem "active_model_serializers"
 gem "awesome_print"
 gem "minitest"
 gem "rake"
-gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
-gem "appraisal"
-gem "jdbc-sqlite3", platform: :jruby
-gem "puma"
-gem "sqlite3", "~> 1.3.0", platform: :ruby
+gem "sprockets", "< 4.0"
 gem "rails", "~> 5.1.5"
+gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
+gem "sqlite3", "~> 1.3.0", platform: :ruby
+gem "jdbc-sqlite3", platform: :jruby
+
+group :development do
+  gem "rubocop"
+end
 
 gemspec path: "../"