Skip to content

Commit e010479

Browse files
authored
Merge pull request #114 from bastelfreak/rubocop
rubocop: regenerate todo file & exclude vendor dirs
2 parents 55a50b8 + 235e648 commit e010479

File tree

2 files changed

+22
-8
lines changed

2 files changed

+22
-8
lines changed

.rubocop.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ AllCops:
1616
- 'ext/suse/puppet.spec'
1717
- 'lib/puppet/vendor/**/*'
1818
- 'lib/puppet/pops/parser/eparser.rb'
19+
- 'vendor/**/*'
20+
- '.vendor/**/*'
1921

2022
Metrics/AbcSize:
2123
Enabled: false

.rubocop_todo.yml

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ I18n/GetText/DecorateFunctionMessage:
1111
Enabled: false
1212

1313
# This cop supports safe auto-correction (--auto-correct).
14+
# Configuration parameters: AutoCorrect.
1415
I18n/GetText/DecorateString:
1516
Enabled: false
1617

@@ -93,7 +94,6 @@ Layout/BeginEndAlignment:
9394
Layout/BlockAlignment:
9495
Exclude:
9596
- 'lib/puppet/defaults.rb'
96-
- 'lib/puppet/node/environment.rb'
9797
- 'lib/puppet/parser/functions/lookup.rb'
9898
- 'lib/puppet/provider/package/dnfmodule.rb'
9999
- 'lib/puppet/type/file.rb'
@@ -332,7 +332,6 @@ Layout/MultilineHashBraceLayout:
332332
- 'lib/puppet/defaults.rb'
333333
- 'lib/puppet/face/facts.rb'
334334
- 'lib/puppet/file_serving/metadata.rb'
335-
- 'lib/puppet/indirector/catalog/compiler.rb'
336335
- 'lib/puppet/info_service/class_information_service.rb'
337336
- 'lib/puppet/pops/evaluator/evaluator_impl.rb'
338337
- 'lib/puppet/pops/loader/ruby_legacy_function_instantiator.rb'
@@ -588,7 +587,22 @@ Lint/BooleanSymbol:
588587
# Configuration parameters: AllowedMethods.
589588
# AllowedMethods: enums
590589
Lint/ConstantDefinitionInBlock:
591-
Enabled: false
590+
Exclude:
591+
- 'lib/puppet/face/config.rb'
592+
- 'lib/puppet/face/help.rb'
593+
- 'lib/puppet/face/node/clean.rb'
594+
- 'lib/puppet/provider/package/aix.rb'
595+
- 'lib/puppet/provider/package/apt.rb'
596+
- 'lib/puppet/provider/package/gem.rb'
597+
- 'lib/puppet/provider/package/pip.rb'
598+
- 'lib/puppet/provider/package/yum.rb'
599+
- 'lib/puppet/provider/service/upstart.rb'
600+
- 'lib/puppet/provider/user/directoryservice.rb'
601+
- 'lib/puppet/type/file.rb'
602+
- 'lib/puppet/type/file/source.rb'
603+
- 'lib/puppet/type/resources.rb'
604+
- 'lib/puppet/type/schedule.rb'
605+
- 'lib/puppet/type/tidy.rb'
592606

593607
# This cop supports safe auto-correction (--auto-correct).
594608
Lint/DeprecatedOpenSSLConstant:
@@ -920,7 +934,10 @@ Naming/VariableNumber:
920934
# SupportedStyles: inline, group
921935
Style/AccessModifierDeclarations:
922936
Exclude:
937+
- 'lib/puppet/util/command_line/trollop.rb'
923938
- 'lib/puppet/util/suidmanager.rb'
939+
- 'lib/puppet/util/windows/com.rb'
940+
- 'lib/puppet/util/windows/monkey_patches/process.rb'
924941

925942
# This cop supports safe auto-correction (--auto-correct).
926943
# Configuration parameters: EnforcedStyle.
@@ -1167,11 +1184,6 @@ Style/Encoding:
11671184
- 'lib/puppet/type/package.rb'
11681185
- 'lib/puppet/util/windows/service.rb'
11691186

1170-
# This cop supports safe auto-correction (--auto-correct).
1171-
Style/EvalWithLocation:
1172-
Exclude:
1173-
- 'lib/puppet/interface/action_builder.rb'
1174-
11751187
# This cop supports safe auto-correction (--auto-correct).
11761188
Style/EvenOdd:
11771189
Exclude:

0 commit comments

Comments
 (0)