Skip to content

Commit d134fdf

Browse files
authored
Merge pull request #67 from fluent-plugins-nursery/suppress-rubocop-warnings
Suppress rubocop warnings
2 parents 5711fc7 + c26e88f commit d134fdf

File tree

5 files changed

+35
-21
lines changed

5 files changed

+35
-21
lines changed

.rubocop.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ AllCops:
44
Exclude:
55
- "vendor/**/*"
66

7+
Layout/MultilineMethodCallIndentation:
8+
EnforcedStyle: indented
9+
Layout/SpaceInsideBlockBraces:
10+
EnforcedStyle: space
11+
SpaceBeforeBlockParameters: false
712
Lint/UnderscorePrefixedVariableName:
813
Enabled: false
914
Lint/UnusedMethodArgument:
@@ -19,6 +24,9 @@ Metrics/ParameterLists:
1924
Metrics/MethodLength:
2025
Max: 30
2126

27+
Naming/FileName:
28+
Enabled: false
29+
2230
Style/AsciiComments:
2331
Enabled: false
2432
Style/HashSyntax:
@@ -29,25 +37,20 @@ Style/FrozenStringLiteralComment:
2937
Enabled: false
3038
Style/StringLiterals:
3139
EnforcedStyle: double_quotes
32-
Style/TrailingCommaInLiteral:
40+
Style/TrailingCommaInArrayLiteral:
3341
Enabled: false
34-
Style/TrailingCommaInArguments:
42+
Style/TrailingCommaInHashLiteral:
3543
Enabled: false
36-
Style/FileName:
44+
Style/TrailingCommaInArguments:
3745
Enabled: false
3846
Style/Documentation:
3947
Enabled: false
4048
Style/WordArray:
4149
Enabled: false
4250
Style/BarePercentLiterals:
4351
EnforcedStyle: percent_q
44-
Style/SpaceInsideBlockBraces:
45-
EnforcedStyle: space
46-
SpaceBeforeBlockParameters: false
4752
Style/BracesAroundHashParameters:
4853
Enabled: false
49-
Style/MultilineMethodCallIndentation:
50-
EnforcedStyle: indented
5154
Style/DoubleNegation:
5255
Enabled: false
5356
Style/EmptyCaseCondition:

.travis.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@ notifications:
99
on_failure: always
1010
on_start: never
1111

12-
rvm:
13-
- 2.1
14-
- 2.2
15-
- 2.3
16-
- 2.4.3
17-
- 2.5.0
18-
19-
gemfile:
20-
- Gemfile
21-
- gemfiles/fluentd_v0.14.gemfile
12+
matrix:
13+
include:
14+
- rvm: 2.1
15+
gemfile: gemfiles/ruby2.3.gemfile
16+
- rvm: 2.2
17+
gemfile: gemfiles/ruby2.3.gemfile
18+
- rvm: 2.3
19+
gemfile: gemfiles/ruby2.3.gemfile
20+
- rvm: 2.4.5
21+
gemfile: Gemfile
22+
- rvm: 2.5.5
23+
gemfile: Gemfile
24+
- rvm: 2.6.2
25+
gemfile: Gemfile

Appraisals

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
appraise "fluentd v0.14" do
2-
gem "fluentd", "~> 0.14.0"
1+
appraise "ruby2.3" do
2+
gem "bundler", "~> 1.11"
33
end

fluent-plugin-concat.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
1717
spec.require_paths = ["lib"]
1818

1919
spec.add_runtime_dependency "fluentd", ">= 0.14.0", "< 2"
20-
spec.add_development_dependency "bundler", "~> 1.11"
20+
spec.add_development_dependency "bundler"
2121
spec.add_development_dependency "rake", "~> 12.0"
2222
spec.add_development_dependency "test-unit", ">= 3.1.0"
2323
spec.add_development_dependency "test-unit-rr"

gemfiles/ruby2.3.gemfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# This file was generated by Appraisal
2+
3+
source "https://rubygems.org"
4+
5+
gem "bundler", "~> 1.11"
6+
7+
gemspec path: "../"

0 commit comments

Comments
 (0)