Skip to content

Commit c549d5e

Browse files
authored
Merge pull request #1716 from namusyaka/update-rubocop
upgrade rubocop version
2 parents 1541bd7 + 0dc2436 commit c549d5e

Some content is hidden

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

64 files changed

+287
-234
lines changed

.rubocop_todo.yml

Lines changed: 78 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,117 @@
11
# This configuration was generated by
22
# `rubocop --auto-gen-config`
3-
# on 2017-07-11 00:59:31 +0100 using RuboCop version 0.47.0.
3+
# on 2017-12-10 01:15:22 +0900 using RuboCop version 0.51.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: 45
9+
# Offense count: 7
10+
# Cop supports --auto-correct.
11+
# Configuration parameters: EnforcedStyle, SupportedStyles.
12+
# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
13+
Layout/IndentHeredoc:
14+
Exclude:
15+
- 'lib/grape/router/route.rb'
16+
- 'spec/grape/api_spec.rb'
17+
- 'spec/grape/entity_spec.rb'
18+
19+
# Offense count: 2
20+
Lint/AmbiguousBlockAssociation:
21+
Exclude:
22+
- 'lib/grape/middleware/stack.rb'
23+
- 'spec/grape/dsl/routing_spec.rb'
24+
25+
# Offense count: 1
26+
Lint/RescueWithoutErrorClass:
27+
Exclude:
28+
- 'lib/grape/validations/validators/coerce.rb'
29+
30+
# Offense count: 49
1031
Metrics/AbcSize:
1132
Max: 44
1233

13-
# Offense count: 279
34+
# Offense count: 282
1435
# Configuration parameters: CountComments, ExcludedMethods.
1536
Metrics/BlockLength:
1637
Max: 3117
1738

18-
# Offense count: 8
39+
# Offense count: 9
1940
# Configuration parameters: CountComments.
2041
Metrics/ClassLength:
2142
Max: 288
2243

23-
# Offense count: 28
44+
# Offense count: 32
2445
Metrics/CyclomaticComplexity:
2546
Max: 14
2647

27-
# Offense count: 1114
48+
# Offense count: 1159
2849
# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
2950
# URISchemes: http, https
3051
Metrics/LineLength:
3152
Max: 215
3253

33-
# Offense count: 56
54+
# Offense count: 57
3455
# Configuration parameters: CountComments.
3556
Metrics/MethodLength:
3657
Max: 33
3758

38-
# Offense count: 10
59+
# Offense count: 11
3960
# Configuration parameters: CountComments.
4061
Metrics/ModuleLength:
4162
Max: 212
4263

43-
# Offense count: 17
64+
# Offense count: 21
4465
Metrics/PerceivedComplexity:
4566
Max: 14
4667

47-
# Offense count: 2
68+
# Offense count: 4
69+
# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
70+
# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
71+
Naming/FileName:
72+
Exclude:
73+
- 'Appraisals'
74+
- 'Gemfile'
75+
- 'Guardfile'
76+
- 'Rakefile'
77+
78+
# Offense count: 1
79+
# Configuration parameters: Blacklist.
80+
# Blacklist: END, (?-mix:EO[A-Z]{1})
81+
Naming/HeredocDelimiterNaming:
82+
Exclude:
83+
- 'lib/grape/router/route.rb'
84+
85+
# Offense count: 3
86+
# Cop supports --auto-correct.
87+
# Configuration parameters: AutoCorrect.
88+
Performance/HashEachMethods:
89+
Exclude:
90+
- 'lib/grape/api.rb'
91+
- 'lib/grape/middleware/versioner/header.rb'
92+
93+
# Offense count: 1
94+
# Cop supports --auto-correct.
95+
# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
96+
# SupportedStyles: line_count_based, semantic, braces_for_chaining
97+
# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
98+
# FunctionalMethods: let, let!, subject, watch
99+
# IgnoredMethods: lambda, proc, it
48100
Style/BlockDelimiters:
49101
Exclude:
50102
- 'spec/grape/middleware/formatter_spec.rb'
51103

104+
# Offense count: 1
105+
Style/CommentedKeyword:
106+
Exclude:
107+
- 'spec/grape/validations_spec.rb'
108+
109+
# Offense count: 2
110+
# Configuration parameters: SupportedStyles.
111+
# SupportedStyles: annotated, template
112+
Style/FormatStringToken:
113+
EnforcedStyle: template
114+
52115
# Offense count: 2
53116
Style/IdenticalConditionalBranches:
54117
Exclude:
@@ -58,3 +121,8 @@ Style/IdenticalConditionalBranches:
58121
Style/MethodMissing:
59122
Exclude:
60123
- 'lib/grape/router/attribute_translator.rb'
124+
125+
# Offense count: 1
126+
Style/MultipleComparison:
127+
Exclude:
128+
- 'lib/grape/validations/types/custom_type_coercer.rb'

Appraisals

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
appraise 'rails-3' do
22
gem 'rails', '3.2.19'
3-
gem 'rack-cache', '<= 1.2' # Pin as next rack-cache version (1.3) removes Ruby1.9 support
3+
gem 'rack-cache', '<= 1.2' # Pin as next rack-cache version (1.3) removes Ruby1.9 support
44
end
55

66
appraise 'rails-4' do

Gemfile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ gemspec
66

77
group :development, :test do
88
gem 'bundler'
9-
gem 'rake'
10-
gem 'rubocop', '0.47.0'
119
gem 'hashie'
10+
gem 'rake'
11+
gem 'rubocop', '0.51.0'
1212
end
1313

1414
group :development do
15+
gem 'appraisal'
16+
gem 'benchmark-ips'
1517
gem 'guard'
1618
gem 'guard-rspec'
1719
gem 'guard-rubocop'
18-
gem 'appraisal'
19-
gem 'benchmark-ips'
2020
end
2121

2222
group :test do
23+
gem 'cookiejar'
24+
gem 'coveralls', '~> 0.8.17', require: false
25+
gem 'danger-toc', '~> 0.1.0'
2326
gem 'grape-entity', '~> 0.6'
2427
gem 'maruku'
28+
gem 'mime-types'
29+
gem 'rack-jsonp', require: 'rack/jsonp'
2530
gem 'rack-test', '~> 0.6.3'
2631
gem 'rspec', '~> 3.0'
27-
gem 'cookiejar'
28-
gem 'rack-jsonp', require: 'rack/jsonp'
29-
gem 'mime-types'
3032
gem 'ruby-grape-danger', '~> 0.1.0', require: false
31-
gem 'coveralls', '~> 0.8.17', require: false
32-
gem 'danger-toc', '~> 0.1.0'
3333
end

Rakefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,4 @@ require 'rainbow/ext/string' unless String.respond_to?(:color)
2222
require 'rubocop/rake_task'
2323
RuboCop::RakeTask.new
2424

25-
task default: [:rubocop, :spec]
26-
25+
task default: %i[rubocop spec]

gemfiles/multi_json.gemfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,30 @@ gem 'multi_json', require: 'multi_json'
66

77
group :development, :test do
88
gem 'bundler'
9-
gem 'rake'
10-
gem 'rubocop', '0.47.0'
119
gem 'hashie'
10+
gem 'rake'
11+
gem 'rubocop', '0.51.0'
1212
end
1313

1414
group :development do
15+
gem 'appraisal'
16+
gem 'benchmark-ips'
1517
gem 'guard'
1618
gem 'guard-rspec'
1719
gem 'guard-rubocop'
18-
gem 'appraisal'
19-
gem 'benchmark-ips'
2020
end
2121

2222
group :test do
23+
gem 'cookiejar'
24+
gem 'coveralls', '~> 0.8.17', require: false
25+
gem 'danger-toc', '~> 0.1.0'
2326
gem 'grape-entity', '~> 0.6'
2427
gem 'maruku'
28+
gem 'mime-types'
29+
gem 'rack-jsonp', require: 'rack/jsonp'
2530
gem 'rack-test', '~> 0.6.3'
2631
gem 'rspec', '~> 3.0'
27-
gem 'cookiejar'
28-
gem 'rack-jsonp', require: 'rack/jsonp'
29-
gem 'mime-types'
3032
gem 'ruby-grape-danger', '~> 0.1.0', require: false
31-
gem 'coveralls', '~> 0.8.17', require: false
3233
end
3334

3435
gemspec path: '../'

gemfiles/multi_xml.gemfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,30 @@ gem 'multi_xml', require: 'multi_xml'
66

77
group :development, :test do
88
gem 'bundler'
9-
gem 'rake'
10-
gem 'rubocop', '0.47.0'
119
gem 'hashie'
10+
gem 'rake'
11+
gem 'rubocop', '0.51.0'
1212
end
1313

1414
group :development do
15+
gem 'appraisal'
16+
gem 'benchmark-ips'
1517
gem 'guard'
1618
gem 'guard-rspec'
1719
gem 'guard-rubocop'
18-
gem 'appraisal'
19-
gem 'benchmark-ips'
2020
end
2121

2222
group :test do
23+
gem 'cookiejar'
24+
gem 'coveralls', '~> 0.8.17', require: false
25+
gem 'danger-toc', '~> 0.1.0'
2326
gem 'grape-entity', '~> 0.6'
2427
gem 'maruku'
28+
gem 'mime-types'
29+
gem 'rack-jsonp', require: 'rack/jsonp'
2530
gem 'rack-test', '~> 0.6.3'
2631
gem 'rspec', '~> 3.0'
27-
gem 'cookiejar'
28-
gem 'rack-jsonp', require: 'rack/jsonp'
29-
gem 'mime-types'
3032
gem 'ruby-grape-danger', '~> 0.1.0', require: false
31-
gem 'coveralls', '~> 0.8.17', require: false
3233
end
3334

3435
gemspec path: '../'

gemfiles/rack_1.5.2.gemfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,30 @@ gem 'rack', '1.5.2'
66

77
group :development, :test do
88
gem 'bundler'
9-
gem 'rake'
10-
gem 'rubocop', '0.47.0'
119
gem 'hashie'
10+
gem 'rake'
11+
gem 'rubocop', '0.51.0'
1212
end
1313

1414
group :development do
15+
gem 'appraisal'
16+
gem 'benchmark-ips'
1517
gem 'guard'
1618
gem 'guard-rspec'
1719
gem 'guard-rubocop'
18-
gem 'appraisal'
19-
gem 'benchmark-ips'
2020
end
2121

2222
group :test do
23+
gem 'cookiejar'
24+
gem 'coveralls', '~> 0.8.17', require: false
25+
gem 'danger-toc', '~> 0.1.0'
2326
gem 'grape-entity', '~> 0.6'
2427
gem 'maruku'
28+
gem 'mime-types'
29+
gem 'rack-jsonp', require: 'rack/jsonp'
2530
gem 'rack-test', '~> 0.6.3'
2631
gem 'rspec', '~> 3.0'
27-
gem 'cookiejar'
28-
gem 'rack-jsonp', require: 'rack/jsonp'
29-
gem 'mime-types'
3032
gem 'ruby-grape-danger', '~> 0.1.0', require: false
31-
gem 'coveralls', '~> 0.8.17', require: false
3233
end
3334

3435
gemspec path: '../'

gemfiles/rack_edge.gemfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,30 @@ gem 'rack', github: 'rack/rack'
66

77
group :development, :test do
88
gem 'bundler'
9-
gem 'rake'
10-
gem 'rubocop', '0.47.0'
119
gem 'hashie'
10+
gem 'rake'
11+
gem 'rubocop', '0.51.0'
1212
end
1313

1414
group :development do
15+
gem 'appraisal'
16+
gem 'benchmark-ips'
1517
gem 'guard'
1618
gem 'guard-rspec'
1719
gem 'guard-rubocop'
18-
gem 'appraisal'
19-
gem 'benchmark-ips'
2020
end
2121

2222
group :test do
23+
gem 'cookiejar'
24+
gem 'coveralls', '~> 0.8.17', require: false
25+
gem 'danger-toc', '~> 0.1.0'
2326
gem 'grape-entity', '~> 0.6'
2427
gem 'maruku'
28+
gem 'mime-types'
29+
gem 'rack-jsonp', require: 'rack/jsonp'
2530
gem 'rack-test', '~> 0.6.3'
2631
gem 'rspec', '~> 3.0'
27-
gem 'cookiejar'
28-
gem 'rack-jsonp', require: 'rack/jsonp'
29-
gem 'mime-types'
3032
gem 'ruby-grape-danger', '~> 0.1.0', require: false
31-
gem 'coveralls', '~> 0.8.17', require: false
3233
end
3334

3435
gemspec path: '../'

gemfiles/rails_3.gemfile

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,30 @@ gem 'rack-cache', '<= 1.2'
77

88
group :development, :test do
99
gem 'bundler'
10-
gem 'rake'
11-
gem 'rubocop', '0.47.0'
1210
gem 'hashie'
11+
gem 'rake'
12+
gem 'rubocop', '0.51.0'
1313
end
1414

1515
group :development do
16+
gem 'appraisal'
17+
gem 'benchmark-ips'
1618
gem 'guard'
1719
gem 'guard-rspec'
1820
gem 'guard-rubocop'
19-
gem 'appraisal'
20-
gem 'benchmark-ips'
2121
end
2222

2323
group :test do
24+
gem 'cookiejar'
25+
gem 'coveralls', '~> 0.8.17', require: false
26+
gem 'danger-toc', '~> 0.1.0'
2427
gem 'grape-entity', '~> 0.6'
2528
gem 'maruku'
29+
gem 'mime-types'
30+
gem 'rack-jsonp', require: 'rack/jsonp'
2631
gem 'rack-test', '~> 0.6.3'
2732
gem 'rspec', '~> 3.0'
28-
gem 'cookiejar'
29-
gem 'rack-jsonp', require: 'rack/jsonp'
30-
gem 'mime-types'
3133
gem 'ruby-grape-danger', '~> 0.1.0', require: false
32-
gem 'coveralls', '~> 0.8.17', require: false
3334
end
3435

3536
gemspec path: '../'

0 commit comments

Comments
 (0)