Skip to content

Commit fae8c41

Browse files
authored
Merge pull request #14 from boost/bump-rubocop-version
Bump rubocop version
2 parents f79fb59 + 930daaf commit fae8c41

File tree

7 files changed

+128
-61
lines changed

7 files changed

+128
-61
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ language: ruby
44
cache: bundler
55
rvm:
66
- 2.5.1
7-
before_install: gem install bundler -v 2.0.1
7+
before_install: gem install bundler -v 2.0.2

Gemfile.lock

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,58 @@ PATH
33
specs:
44
boost-styles (0.1.0)
55
haml_lint (~> 0.33)
6-
rubocop (~> 0.77)
7-
rubocop-performance (~> 1.5.1)
8-
rubocop-rails (~> 2.4.0)
6+
rubocop (~> 0.78)
7+
rubocop-performance (~> 1.5)
8+
rubocop-rails (~> 2.4)
99
rubocop-rspec (~> 1.37)
1010

1111
GEM
1212
remote: https://rubygems.org/
1313
specs:
14-
actioncable (5.2.3)
15-
actionpack (= 5.2.3)
14+
actioncable (5.2.4.1)
15+
actionpack (= 5.2.4.1)
1616
nio4r (~> 2.0)
1717
websocket-driver (>= 0.6.1)
18-
actionmailer (5.2.3)
19-
actionpack (= 5.2.3)
20-
actionview (= 5.2.3)
21-
activejob (= 5.2.3)
18+
actionmailer (5.2.4.1)
19+
actionpack (= 5.2.4.1)
20+
actionview (= 5.2.4.1)
21+
activejob (= 5.2.4.1)
2222
mail (~> 2.5, >= 2.5.4)
2323
rails-dom-testing (~> 2.0)
24-
actionpack (5.2.3)
25-
actionview (= 5.2.3)
26-
activesupport (= 5.2.3)
27-
rack (~> 2.0)
24+
actionpack (5.2.4.1)
25+
actionview (= 5.2.4.1)
26+
activesupport (= 5.2.4.1)
27+
rack (~> 2.0, >= 2.0.8)
2828
rack-test (>= 0.6.3)
2929
rails-dom-testing (~> 2.0)
3030
rails-html-sanitizer (~> 1.0, >= 1.0.2)
31-
actionview (5.2.3)
32-
activesupport (= 5.2.3)
31+
actionview (5.2.4.1)
32+
activesupport (= 5.2.4.1)
3333
builder (~> 3.1)
3434
erubi (~> 1.4)
3535
rails-dom-testing (~> 2.0)
3636
rails-html-sanitizer (~> 1.0, >= 1.0.3)
37-
activejob (5.2.3)
38-
activesupport (= 5.2.3)
37+
activejob (5.2.4.1)
38+
activesupport (= 5.2.4.1)
3939
globalid (>= 0.3.6)
40-
activemodel (5.2.3)
41-
activesupport (= 5.2.3)
42-
activerecord (5.2.3)
43-
activemodel (= 5.2.3)
44-
activesupport (= 5.2.3)
40+
activemodel (5.2.4.1)
41+
activesupport (= 5.2.4.1)
42+
activerecord (5.2.4.1)
43+
activemodel (= 5.2.4.1)
44+
activesupport (= 5.2.4.1)
4545
arel (>= 9.0)
46-
activestorage (5.2.3)
47-
actionpack (= 5.2.3)
48-
activerecord (= 5.2.3)
46+
activestorage (5.2.4.1)
47+
actionpack (= 5.2.4.1)
48+
activerecord (= 5.2.4.1)
4949
marcel (~> 0.3.1)
50-
activesupport (5.2.3)
50+
activesupport (5.2.4.1)
5151
concurrent-ruby (~> 1.0, >= 1.0.2)
5252
i18n (>= 0.7, < 2)
5353
minitest (~> 5.1)
5454
tzinfo (~> 1.1)
5555
arel (9.0.0)
5656
ast (2.4.0)
57-
builder (3.2.3)
57+
builder (3.2.4)
5858
concurrent-ruby (1.1.5)
5959
crass (1.0.5)
6060
diff-lcs (1.3)
@@ -64,15 +64,15 @@ GEM
6464
haml (5.1.2)
6565
temple (>= 0.8.0)
6666
tilt
67-
haml_lint (0.34.0)
67+
haml_lint (0.34.1)
6868
haml (>= 4.0, < 5.2)
6969
rainbow
7070
rubocop (>= 0.50.0)
7171
sysexits (~> 1.1)
7272
i18n (1.7.0)
7373
concurrent-ruby (~> 1.0)
7474
jaro_winkler (1.5.4)
75-
loofah (2.3.1)
75+
loofah (2.4.0)
7676
crass (~> 1.0.2)
7777
nokogiri (>= 1.5.9)
7878
mail (2.7.1)
@@ -83,37 +83,37 @@ GEM
8383
mimemagic (0.3.3)
8484
mini_mime (1.0.2)
8585
mini_portile2 (2.4.0)
86-
minitest (5.12.2)
86+
minitest (5.13.0)
8787
nio4r (2.5.2)
88-
nokogiri (1.10.4)
88+
nokogiri (1.10.7)
8989
mini_portile2 (~> 2.4.0)
9090
parallel (1.19.1)
91-
parser (2.6.5.0)
91+
parser (2.7.0.1)
9292
ast (~> 2.4.0)
93-
rack (2.0.7)
93+
rack (2.0.8)
9494
rack-test (1.1.0)
9595
rack (>= 1.0, < 3)
96-
rails (5.2.3)
97-
actioncable (= 5.2.3)
98-
actionmailer (= 5.2.3)
99-
actionpack (= 5.2.3)
100-
actionview (= 5.2.3)
101-
activejob (= 5.2.3)
102-
activemodel (= 5.2.3)
103-
activerecord (= 5.2.3)
104-
activestorage (= 5.2.3)
105-
activesupport (= 5.2.3)
96+
rails (5.2.4.1)
97+
actioncable (= 5.2.4.1)
98+
actionmailer (= 5.2.4.1)
99+
actionpack (= 5.2.4.1)
100+
actionview (= 5.2.4.1)
101+
activejob (= 5.2.4.1)
102+
activemodel (= 5.2.4.1)
103+
activerecord (= 5.2.4.1)
104+
activestorage (= 5.2.4.1)
105+
activesupport (= 5.2.4.1)
106106
bundler (>= 1.3.0)
107-
railties (= 5.2.3)
107+
railties (= 5.2.4.1)
108108
sprockets-rails (>= 2.0.0)
109109
rails-dom-testing (2.0.3)
110110
activesupport (>= 4.2.0)
111111
nokogiri (>= 1.6)
112112
rails-html-sanitizer (1.3.0)
113113
loofah (~> 2.3)
114-
railties (5.2.3)
115-
actionpack (= 5.2.3)
116-
activesupport (= 5.2.3)
114+
railties (5.2.4.1)
115+
actionpack (= 5.2.4.1)
116+
activesupport (= 5.2.4.1)
117117
method_source
118118
rake (>= 0.8.7)
119119
thor (>= 0.19.0, < 2.0)
@@ -123,28 +123,28 @@ GEM
123123
rspec-core (~> 3.9.0)
124124
rspec-expectations (~> 3.9.0)
125125
rspec-mocks (~> 3.9.0)
126-
rspec-core (3.9.0)
127-
rspec-support (~> 3.9.0)
126+
rspec-core (3.9.1)
127+
rspec-support (~> 3.9.1)
128128
rspec-expectations (3.9.0)
129129
diff-lcs (>= 1.2.0, < 2.0)
130130
rspec-support (~> 3.9.0)
131-
rspec-mocks (3.9.0)
131+
rspec-mocks (3.9.1)
132132
diff-lcs (>= 1.2.0, < 2.0)
133133
rspec-support (~> 3.9.0)
134-
rspec-support (3.9.0)
135-
rubocop (0.77.0)
134+
rspec-support (3.9.2)
135+
rubocop (0.78.0)
136136
jaro_winkler (~> 1.5.1)
137137
parallel (~> 1.10)
138138
parser (>= 2.6)
139139
rainbow (>= 2.2.2, < 4.0)
140140
ruby-progressbar (~> 1.7)
141141
unicode-display_width (>= 1.4.0, < 1.7)
142-
rubocop-performance (1.5.1)
142+
rubocop-performance (1.5.2)
143143
rubocop (>= 0.71.0)
144-
rubocop-rails (2.4.0)
144+
rubocop-rails (2.4.1)
145145
rack (>= 1.1)
146146
rubocop (>= 0.72.0)
147-
rubocop-rspec (1.37.0)
147+
rubocop-rspec (1.37.1)
148148
rubocop (>= 0.68.1)
149149
ruby-progressbar (1.10.1)
150150
sprockets (4.0.0)
@@ -156,10 +156,10 @@ GEM
156156
sprockets (>= 3.0.0)
157157
sysexits (1.2.0)
158158
temple (0.8.2)
159-
thor (0.20.3)
159+
thor (1.0.1)
160160
thread_safe (0.3.6)
161161
tilt (2.0.10)
162-
tzinfo (1.2.5)
162+
tzinfo (1.2.6)
163163
thread_safe (~> 0.1)
164164
unicode-display_width (1.6.0)
165165
websocket-driver (0.7.1)

boost-styles.gemspec

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ Gem::Specification.new do |spec|
4343
spec.add_development_dependency 'rspec', '~> 3.0'
4444

4545
spec.add_dependency 'haml_lint', '~> 0.33'
46-
spec.add_dependency 'rubocop', '~> 0.77'
47-
spec.add_dependency 'rubocop-performance', '~> 1.5.1'
46+
spec.add_dependency 'rubocop', '~> 0.78'
47+
spec.add_dependency 'rubocop-performance', '~> 1.5'
48+
spec.add_dependency 'rubocop-rails', '~> 2.4'
4849
spec.add_dependency 'rubocop-rspec', '~> 1.37'
49-
spec.add_dependency 'rubocop-rails', '~> 2.4.0'
5050
end

rubocop_default.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@ inherit_from:
77
- rubocop_rails.yml
88
- rubocop_performance.yml
99
- rubocop_rspec.yml
10+
11+
- rubocop_layout.yml
12+
- rubocop_metrics.yml
13+
- rubocop_style.yml

rubocop_layout.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# Method definitions after `private` or `protected` isolated calls need one
2+
# extra level of indentation.
3+
Layout/IndentationConsistency:
4+
Enabled: true
5+
EnforcedStyle: indented_internal_methods

rubocop_metrics.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# A calculated magnitude based on number of assignments,
2+
# branches, and conditions.
3+
Metrics/AbcSize:
4+
Enabled: true
5+
Max: 54.28
6+
7+
# This cop checks if the length of a block exceeds some maximum value.
8+
Metrics/BlockLength:
9+
Enabled: false
10+
11+
# Avoid excessive block nesting.
12+
Metrics/BlockNesting:
13+
Enabled: true
14+
Max: 4
15+
16+
# Avoid classes longer than 100 lines of code.
17+
Metrics/ClassLength:
18+
Enabled: false
19+
20+
# A complexity metric that is strongly correlated to the number
21+
# of test cases needed to validate a method.
22+
Metrics/CyclomaticComplexity:
23+
Enabled: true
24+
Max: 13
25+
26+
# Limit lines to 80 characters.
27+
Metrics/LineLength:
28+
Enabled: false
29+
30+
# Avoid methods longer than 10 lines of code.
31+
Metrics/MethodLength:
32+
Enabled: false
33+
34+
# Avoid modules longer than 100 lines of code.
35+
Metrics/ModuleLength:
36+
Enabled: false
37+
38+
# Avoid parameter lists longer than three or four parameters.
39+
Metrics/ParameterLists:
40+
Enabled: true
41+
Max: 8
42+
43+
# A complexity metric geared towards measuring complexity for a human reader.
44+
Metrics/PerceivedComplexity:
45+
Enabled: true
46+
Max: 14

rubocop_style.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
Style/FrozenStringLiteralComment:
2+
Enabled: true
3+
EnforcedStyle: always
4+
Exclude:
5+
- 'actionview/test/**/*.builder'
6+
- 'actionview/test/**/*.ruby'
7+
- 'actionpack/test/**/*.builder'
8+
- 'actionpack/test/**/*.ruby'
9+
- 'activestorage/db/migrate/**/*.rb'
10+
11+
Style/Documentation:
12+
Enabled: false

0 commit comments

Comments
 (0)