Skip to content

Commit 74c4e92

Browse files
committed
RuboCop 0.81
1 parent b24149e commit 74c4e92

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+366
-429
lines changed

.rubocop.yml

+38-32
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,37 @@ AllCops:
55
- '.github/**/*'
66
- 'gemfiles/**/*'
77

8-
# Match existing layout
8+
#
9+
# RuboCop built-in settings.
10+
# For documentation on all settings see: https://docs.rubocop.org/en/stable
11+
#
12+
13+
# Trailing periods.
914
Layout/DotPosition:
1015
EnforcedStyle: trailing
1116

12-
# Rubocop cannot yet see beyond one line above or below, when aligning =
13-
Layout/ExtraSpacing:
14-
Enabled: false
15-
AllowForAlignment: true
16-
ForceEqualSignAlignment: true
17-
AutoCorrect: false
17+
# Turn on auto-correction of equals alignment.
18+
Layout/EndAlignment:
19+
AutoCorrect: true
1820

19-
# Pick one
20-
Layout/IndentHeredoc:
21-
EnforcedStyle: squiggly
21+
# Prevent accidental windows line endings
22+
Layout/EndOfLine:
23+
EnforcedStyle: lf
2224

23-
# Match existing layout
24-
Layout/MultilineMethodCallIndentation:
25-
EnforcedStyle: indented
26-
IndentationWidth: 2
25+
# Use a table layout for hashes
26+
Layout/HashAlignment:
27+
EnforcedHashRocketStyle: table
28+
EnforcedColonStyle: table
2729

28-
# Rubocop cannot yet see beyond one line above or below, when aligning =
29-
Layout/SpaceAroundOperators:
30-
Enabled: false
31-
AllowForAlignment: true
32-
AutoCorrect: false
30+
# Soften limits
31+
Layout/LineLength:
32+
Max: 128
33+
Exclude:
34+
- '**/test/**/*'
3335

3436
# Match existing layout
3537
Layout/SpaceInsideHashLiteralBraces:
3638
EnforcedStyle: no_space
37-
EnforcedStyleForEmptyBraces: no_space
38-
39-
# Files must end with a blank line
40-
Layout/TrailingBlankLines:
41-
EnforcedStyle: final_newline
4239

4340
# TODO: Soften Limits for phase 1 only
4441
Metrics/AbcSize:
@@ -48,6 +45,10 @@ Metrics/AbcSize:
4845
Metrics/BlockLength:
4946
Exclude:
5047
- 'test/**/*'
48+
- '**/*/cli.rb'
49+
ExcludedMethods:
50+
- 'aasm'
51+
- 'included'
5152

5253
# Soften limits
5354
Metrics/ClassLength:
@@ -59,12 +60,6 @@ Metrics/ClassLength:
5960
Metrics/CyclomaticComplexity:
6061
Max: 15
6162

62-
Metrics/LineLength:
63-
Max: 128
64-
Exclude:
65-
- 'cli.rb'
66-
- 'test/**/*'
67-
6863
# Soften limits
6964
Metrics/MethodLength:
7065
Max: 50
@@ -81,7 +76,7 @@ Metrics/PerceivedComplexity:
8176
Max: 21
8277

8378
# Initialization Vector abbreviation
84-
Naming/UncommunicativeMethodParamName:
79+
Naming/MethodParameterName:
8580
AllowedNames: ['iv', '_', 'io', 'ap']
8681

8782
# Does not allow Symbols to load
@@ -98,7 +93,7 @@ Style/Documentation:
9893

9994
# One line methods
10095
Style/EmptyMethod:
101-
Enabled: false
96+
EnforcedStyle: expanded
10297

10398
# Ruby 3 compatibility feature
10499
Style/FrozenStringLiteralComment:
@@ -107,3 +102,14 @@ Style/FrozenStringLiteralComment:
107102
Style/NumericPredicate:
108103
AutoCorrect: true
109104

105+
# Incorrectly changes job.fail to job.raise
106+
Style/SignalException:
107+
Enabled: false
108+
109+
# Since English may not be loaded, cannot force its use.
110+
Style/SpecialGlobalVars:
111+
Enabled: false
112+
113+
# Make it easier for developers to move between Elixir and Ruby.
114+
Style/StringLiterals:
115+
EnforcedStyle: double_quotes

.travis.yml

-13
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,6 @@ language: ruby
22

33
matrix:
44
include:
5-
- name: "Rails 4.2 on Ruby 2.3.8"
6-
rvm: 2.3.8
7-
gemfile: gemfiles/rails_4.2.gemfile
8-
9-
- name: "Rails 5.0.2 on Ruby 2.4.6"
10-
rvm: 2.4.6
11-
gemfile: gemfiles/rails_5.0.2.gemfile
12-
- name: "Rails 5.0.6 on Ruby 2.4.6"
13-
rvm: 2.4.6
14-
gemfile: gemfiles/rails_5.0.6.gemfile
15-
- name: "Rails 5.0.7 on Ruby 2.4.6"
16-
rvm: 2.4.6
17-
gemfile: gemfiles/rails_5.0.7.gemfile
185
- name: "Rails 5.1.4 on Ruby 2.4.6"
196
rvm: 2.4.6
207
gemfile: gemfiles/rails_5.1.4.gemfile

Appraisals

+16-33
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,23 @@
1-
appraise 'rails_4.2' do
2-
gem 'rails', '~> 4.2.0'
3-
gem 'activerecord-jdbcsqlite3-adapter', '~> 1.0', platform: :jruby
4-
gem 'sqlite3', '~> 1.3.0', platform: :ruby
1+
appraise "rails_5.1.4" do
2+
gem "rails", "5.1.4"
3+
gem "sqlite3", "~> 1.3.0", platform: :ruby
4+
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
55
end
66

7-
appraise 'rails_5.0.2' do
8-
gem 'minitest', '5.10.1'
9-
gem 'rails', '5.0.2'
10-
gem 'sqlite3', '~> 1.3.0', platform: :ruby
7+
appraise "rails_5.1.5" do
8+
gem "rails", "~> 5.1.5"
9+
gem "sqlite3", "~> 1.3.0", platform: :ruby
10+
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
1111
end
1212

13-
appraise 'rails_5.0.6' do
14-
gem 'rails', '5.0.6'
15-
gem 'sqlite3', '~> 1.3.0', platform: :ruby
13+
appraise "rails_5.2" do
14+
gem "rails", "~> 5.2.0"
15+
gem "sqlite3", "~> 1.3.0", platform: :ruby
16+
gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
1617
end
1718

18-
appraise 'rails_5.0.7' do
19-
gem 'rails', '~> 5.0.7'
20-
gem 'sqlite3', '~> 1.3.0', platform: :ruby
21-
end
22-
23-
appraise 'rails_5.1.4' do
24-
gem 'rails', '5.1.4'
25-
gem 'sqlite3', '~> 1.3.0', platform: :ruby
26-
end
27-
28-
appraise 'rails_5.1.5' do
29-
gem 'rails', '~> 5.1.5'
30-
gem 'sqlite3', '~> 1.3.0', platform: :ruby
31-
end
32-
33-
appraise 'rails_5.2' do
34-
gem 'rails', '~> 5.2.0'
35-
gem 'sqlite3', '~> 1.3.0', platform: :ruby
36-
end
37-
38-
appraise 'rails_6.0' do
39-
gem 'rails', '6.0.0.rc1'
19+
appraise "rails_6.0" do
20+
gem "rails", "~> 6.0.0"
21+
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
22+
gem "sqlite3", "~> 1.4.0", platform: :ruby
4023
end

Gemfile

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
1-
source 'https://rubygems.org'
1+
source "https://rubygems.org"
22

33
gemspec
44

5-
gem 'active_model_serializers'
6-
gem 'awesome_print'
7-
gem 'minitest'
8-
gem 'rake'
5+
gem "appraisal"
6+
gem "puma"
97

10-
gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
11-
gem 'appraisal'
12-
gem 'jdbc-sqlite3', platform: :jruby
13-
gem 'puma'
14-
gem 'sqlite3', platform: :ruby
8+
gem "active_model_serializers"
9+
gem "awesome_print"
10+
gem "minitest"
11+
gem "rake"
12+
gem "sprockets", "< 4.0"
1513

16-
gem 'rails', '6.0.0.rc1'
14+
gem "rails", "~> 5.0.0"
15+
gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platform: :jruby
16+
gem "sqlite3", "~> 1.3.0", platform: :ruby
17+
gem "jdbc-sqlite3", platform: :jruby
18+
19+
group :development do
20+
gem "rubocop"
21+
end

Rakefile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
# Setup bundler to avoid having to run bundle exec all the time.
2-
require 'rubygems'
3-
require 'bundler/setup'
2+
require "rubygems"
3+
require "bundler/setup"
44

5-
require 'rake/testtask'
6-
require_relative 'lib/rails_semantic_logger/version'
5+
require "rake/testtask"
6+
require_relative "lib/rails_semantic_logger/version"
77

88
task :gem do
9-
system 'gem build rails_semantic_logger.gemspec'
9+
system "gem build rails_semantic_logger.gemspec"
1010
end
1111

1212
task publish: :gem do
1313
system "git tag -a v#{RailsSemanticLogger::VERSION} -m 'Tagging #{RailsSemanticLogger::VERSION}'"
14-
system 'git push --tags'
14+
system "git push --tags"
1515
system "gem push rails_semantic_logger-#{RailsSemanticLogger::VERSION}.gem"
1616
system "rm rails_semantic_logger-#{RailsSemanticLogger::VERSION}.gem"
1717
end
1818

1919
Rake::TestTask.new(:test) do |t|
20-
t.pattern = 'test/**/*_test.rb'
20+
t.pattern = "test/**/*_test.rb"
2121
t.verbose = true
2222
t.warning = false
2323
end
2424

2525
# By default run tests against all appraisals
26-
if !ENV['APPRAISAL_INITIALIZED'] && !ENV['TRAVIS']
27-
require 'appraisal'
26+
if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
27+
require "appraisal"
2828
task default: :appraisal
2929
else
3030
task default: :test

gemfiles/rails_4.2.gemfile

-16
This file was deleted.

gemfiles/rails_5.0.2.gemfile

-16
This file was deleted.

gemfiles/rails_5.0.6.gemfile

-16
This file was deleted.

gemfiles/rails_5.0.7.gemfile

-16
This file was deleted.

gemfiles/rails_5.1.4.gemfile

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@
22

33
source "https://rubygems.org"
44

5+
gem "appraisal"
6+
gem "puma"
57
gem "active_model_serializers"
68
gem "awesome_print"
79
gem "minitest"
810
gem "rake"
9-
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
10-
gem "appraisal"
11-
gem "jdbc-sqlite3", platform: :jruby
12-
gem "puma"
13-
gem "sqlite3", "~> 1.3.0", platform: :ruby
11+
gem "sprockets", "< 4.0"
1412
gem "rails", "5.1.4"
13+
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
14+
gem "sqlite3", "~> 1.3.0", platform: :ruby
15+
gem "jdbc-sqlite3", platform: :jruby
16+
17+
group :development do
18+
gem "rubocop"
19+
end
1520

1621
gemspec path: "../"

gemfiles/rails_5.1.5.gemfile

+10-5
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@
22

33
source "https://rubygems.org"
44

5+
gem "appraisal"
6+
gem "puma"
57
gem "active_model_serializers"
68
gem "awesome_print"
79
gem "minitest"
810
gem "rake"
9-
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
10-
gem "appraisal"
11-
gem "jdbc-sqlite3", platform: :jruby
12-
gem "puma"
13-
gem "sqlite3", "~> 1.3.0", platform: :ruby
11+
gem "sprockets", "< 4.0"
1412
gem "rails", "~> 5.1.5"
13+
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
14+
gem "sqlite3", "~> 1.3.0", platform: :ruby
15+
gem "jdbc-sqlite3", platform: :jruby
16+
17+
group :development do
18+
gem "rubocop"
19+
end
1520

1621
gemspec path: "../"

0 commit comments

Comments
 (0)