Skip to content

Commit b0bc5c9

Browse files
authored
Merge pull request #1558 from dblock/rubocop-0.47.0
Fix build: upgraded and locked version of Rubocop.
2 parents 3c2e838 + 50bacb5 commit b0bc5c9

9 files changed

+24
-21
lines changed

.rubocop_todo.yml

+15-10
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2016-12-01 19:41:18 +0100 using RuboCop version 0.46.0.
3+
# on 2017-01-17 06:04:25 -0500 using RuboCop version 0.47.0.
44
# The point is for the user to remove these configuration records
55
# one by one as the offenses are removed from the code base.
66
# Note that changes in the inspected code, or installation of new
77
# versions of RuboCop, may require this file to be generated again.
88

9-
# Offense count: 3
10-
# this must be removed for preparation of ruby 2.4
11-
Lint/UnifiedInteger:
12-
Exclude:
13-
- 'lib/grape/dsl/inside_route.rb'
14-
- 'spec/grape/validations/validators/allow_blank_spec.rb'
15-
169
# Offense count: 44
1710
Metrics/AbcSize:
1811
Max: 44
1912

13+
# Offense count: 266
14+
# Configuration parameters: CountComments, ExcludedMethods.
15+
Metrics/BlockLength:
16+
Max: 3084
17+
2018
# Offense count: 1
19+
# Configuration parameters: CountBlocks.
2120
Metrics/BlockNesting:
2221
Max: 4
2322

@@ -30,13 +29,13 @@ Metrics/ClassLength:
3029
Metrics/CyclomaticComplexity:
3130
Max: 14
3231

33-
# Offense count: 964
32+
# Offense count: 975
3433
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
3534
# URISchemes: http, https
3635
Metrics/LineLength:
3736
Max: 215
3837

39-
# Offense count: 55
38+
# Offense count: 54
4039
# Configuration parameters: CountComments.
4140
Metrics/MethodLength:
4241
Max: 33
@@ -50,6 +49,12 @@ Metrics/ModuleLength:
5049
Metrics/PerceivedComplexity:
5150
Max: 14
5251

52+
# Offense count: 2
53+
Style/IdenticalConditionalBranches:
54+
Exclude:
55+
- 'lib/grape/dsl/desc.rb'
56+
57+
# Offense count: 1
5358
Style/MethodMissing:
5459
Exclude:
5560
- 'lib/grape/router/attribute_translator.rb'

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gemspec
77
group :development, :test do
88
gem 'bundler'
99
gem 'rake'
10-
gem 'rubocop', '~> 0.45'
10+
gem 'rubocop', '0.47.0'
1111
end
1212

1313
group :development do

gemfiles/rack_1.5.2.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'rack', '1.5.2'
77
group :development, :test do
88
gem 'bundler'
99
gem 'rake'
10-
gem 'rubocop', '~> 0.45'
10+
gem 'rubocop', '0.47.0'
1111
end
1212

1313
group :development do

gemfiles/rack_edge.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'rack', github: 'rack/rack'
77
group :development, :test do
88
gem 'bundler'
99
gem 'rake'
10-
gem 'rubocop', '~> 0.45'
10+
gem 'rubocop', '0.47.0'
1111
end
1212

1313
group :development do

gemfiles/rails_3.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ gem 'rack-cache', '<= 1.2'
88
group :development, :test do
99
gem 'bundler'
1010
gem 'rake'
11-
gem 'rubocop', '~> 0.45'
11+
gem 'rubocop', '0.47.0'
1212
end
1313

1414
group :development do

gemfiles/rails_4.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'rails', '4.1.6'
77
group :development, :test do
88
gem 'bundler'
99
gem 'rake'
10-
gem 'rubocop', '~> 0.45'
10+
gem 'rubocop', '0.47.0'
1111
end
1212

1313
group :development do

gemfiles/rails_5.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'rails', '5.0.0'
77
group :development, :test do
88
gem 'bundler'
99
gem 'rake'
10-
gem 'rubocop', '~> 0.45'
10+
gem 'rubocop', '0.47.0'
1111
end
1212

1313
group :development do

gemfiles/rails_edge.gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gem 'arel', github: 'rails/arel'
77
group :development, :test do
88
gem 'bundler'
99
gem 'rake'
10-
gem 'rubocop', '~> 0.45'
10+
gem 'rubocop', '0.47.0'
1111
end
1212

1313
group :development do

spec/grape/validations/types_spec.rb

+2-4
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
describe Grape::Validations::Types do
44
module TypesSpec
55
class FooType
6-
def self.parse(_)
7-
end
6+
def self.parse(_); end
87
end
98

109
class BarType
11-
def self.parse
12-
end
10+
def self.parse; end
1311
end
1412
end
1513

0 commit comments

Comments
 (0)