Skip to content

Commit 1daaa90

Browse files
committed
Update to pdk-templates and puppet-module-gems 1.0.0
1 parent 7d6e875 commit 1daaa90

File tree

7 files changed

+91
-77
lines changed

7 files changed

+91
-77
lines changed

.rubocop.yml

+48-70
Original file line numberDiff line numberDiff line change
@@ -83,66 +83,26 @@ Performance/BigDecimalWithNumericArgument:
8383
Enabled: true
8484
Performance/BlockGivenWithExplicitBlock:
8585
Enabled: true
86-
Performance/Caller:
87-
Enabled: true
8886
Performance/CaseWhenSplat:
8987
Enabled: true
90-
Performance/Casecmp:
91-
Enabled: true
92-
Performance/CollectionLiteralInLoop:
93-
Enabled: true
94-
Performance/CompareWithBlock:
95-
Enabled: true
9688
Performance/ConstantRegexp:
9789
Enabled: true
98-
Performance/Count:
99-
Enabled: true
100-
Performance/Detect:
101-
Enabled: true
102-
Performance/DoubleStartEndWith:
103-
Enabled: true
104-
Performance/EndWith:
105-
Enabled: true
106-
Performance/FixedSize:
107-
Enabled: true
108-
Performance/FlatMap:
109-
Enabled: true
11090
Performance/MethodObjectAsBlock:
11191
Enabled: true
112-
Performance/RangeInclude:
113-
Enabled: true
114-
Performance/RedundantBlockCall:
115-
Enabled: true
116-
Performance/RedundantMatch:
117-
Enabled: true
118-
Performance/RedundantMerge:
119-
Enabled: true
12092
Performance/RedundantSortBlock:
12193
Enabled: true
12294
Performance/RedundantStringChars:
12395
Enabled: true
124-
Performance/RegexpMatch:
125-
Enabled: true
126-
Performance/ReverseEach:
127-
Enabled: true
12896
Performance/ReverseFirst:
12997
Enabled: true
130-
Performance/Size:
131-
Enabled: true
13298
Performance/SortReverse:
13399
Enabled: true
134100
Performance/Squeeze:
135101
Enabled: true
136-
Performance/StartWith:
137-
Enabled: true
138102
Performance/StringInclude:
139103
Enabled: true
140-
Performance/StringReplacement:
141-
Enabled: true
142104
Performance/Sum:
143105
Enabled: true
144-
Performance/TimesMap:
145-
Enabled: true
146106
Style/CollectionMethods:
147107
Enabled: true
148108
Style/MethodCalledOnDoEndBlock:
@@ -199,20 +159,12 @@ Lint/DeprecatedOpenSSLConstant:
199159
Enabled: false
200160
Lint/DisjunctiveAssignmentInConstructor:
201161
Enabled: false
202-
Lint/DuplicateBranch:
203-
Enabled: false
204162
Lint/DuplicateElsifCondition:
205163
Enabled: false
206-
Lint/DuplicateRegexpCharacterClassElement:
207-
Enabled: false
208164
Lint/DuplicateRequire:
209165
Enabled: false
210166
Lint/DuplicateRescueException:
211167
Enabled: false
212-
Lint/EmptyBlock:
213-
Enabled: false
214-
Lint/EmptyClass:
215-
Enabled: false
216168
Lint/EmptyConditionalBody:
217169
Enabled: false
218170
Lint/EmptyFile:
@@ -233,8 +185,6 @@ Lint/MixedRegexpCaptureTypes:
233185
Enabled: false
234186
Lint/NestedPercentLiteral:
235187
Enabled: false
236-
Lint/NoReturnInBeginEndBlocks:
237-
Enabled: false
238188
Lint/NonDeterministicRequireOrder:
239189
Enabled: false
240190
Lint/OrderedMagicComments:
@@ -269,18 +219,12 @@ Lint/ShadowedArgument:
269219
Enabled: false
270220
Lint/StructNewOverride:
271221
Enabled: false
272-
Lint/ToEnumArguments:
273-
Enabled: false
274222
Lint/ToJSON:
275223
Enabled: false
276224
Lint/TopLevelReturnWithArgument:
277225
Enabled: false
278226
Lint/TrailingCommaInAttributeDeclaration:
279227
Enabled: false
280-
Lint/UnexpectedBlockArity:
281-
Enabled: false
282-
Lint/UnmodifiedReduceAccumulator:
283-
Enabled: false
284228
Lint/UnreachableLoop:
285229
Enabled: false
286230
Lint/UriEscapeUnescape:
@@ -295,6 +239,8 @@ Metrics/AbcSize:
295239
Enabled: false
296240
Metrics/BlockLength:
297241
Enabled: false
242+
Metrics/BlockNesting:
243+
Enabled: false
298244
Metrics/ClassLength:
299245
Enabled: false
300246
Metrics/CyclomaticComplexity:
@@ -309,6 +255,8 @@ Metrics/PerceivedComplexity:
309255
Enabled: false
310256
Migration/DepartmentName:
311257
Enabled: false
258+
Naming/AccessorMethodName:
259+
Enabled: false
312260
Naming/BlockParameterName:
313261
Enabled: false
314262
Naming/HeredocDelimiterCase:
@@ -321,6 +269,18 @@ Naming/MethodParameterName:
321269
Enabled: false
322270
Naming/RescuedExceptionsVariableName:
323271
Enabled: false
272+
Performance/BindCall:
273+
Enabled: false
274+
Performance/DeletePrefix:
275+
Enabled: false
276+
Performance/DeleteSuffix:
277+
Enabled: false
278+
Performance/InefficientHashSearch:
279+
Enabled: false
280+
Performance/UnfreezeString:
281+
Enabled: false
282+
Performance/UriDefaultParser:
283+
Enabled: false
324284
RSpec/Be:
325285
Enabled: false
326286
RSpec/Capybara/CurrentPathExpectation:
@@ -409,8 +369,6 @@ Style/AccessModifierDeclarations:
409369
Enabled: false
410370
Style/AccessorGrouping:
411371
Enabled: false
412-
Style/ArgumentsForwarding:
413-
Enabled: false
414372
Style/AsciiComments:
415373
Enabled: false
416374
Style/BisectedAttrAccessor:
@@ -419,8 +377,6 @@ Style/CaseLikeIf:
419377
Enabled: false
420378
Style/ClassEqualityComparison:
421379
Enabled: false
422-
Style/CollectionCompact:
423-
Enabled: false
424380
Style/ColonMethodDefinition:
425381
Enabled: false
426382
Style/CombinableLoops:
@@ -429,8 +385,6 @@ Style/CommentedKeyword:
429385
Enabled: false
430386
Style/Dir:
431387
Enabled: false
432-
Style/DocumentDynamicEvalDefinition:
433-
Enabled: false
434388
Style/DoubleCopDisableDirective:
435389
Enabled: false
436390
Style/EmptyBlockParameter:
@@ -469,12 +423,8 @@ Style/MixinUsage:
469423
Enabled: false
470424
Style/MultilineWhenThen:
471425
Enabled: false
472-
Style/NegatedIfElseCondition:
473-
Enabled: false
474426
Style/NegatedUnless:
475427
Enabled: false
476-
Style/NilLambda:
477-
Enabled: false
478428
Style/NumericPredicate:
479429
Enabled: false
480430
Style/OptionalBooleanParameter:
@@ -483,8 +433,6 @@ Style/OrAssignment:
483433
Enabled: false
484434
Style/RandomWithOffset:
485435
Enabled: false
486-
Style/RedundantArgument:
487-
Enabled: false
488436
Style/RedundantAssignment:
489437
Enabled: false
490438
Style/RedundantCondition:
@@ -517,8 +465,6 @@ Style/StringConcatenation:
517465
Enabled: false
518466
Style/Strip:
519467
Enabled: false
520-
Style/SwapValues:
521-
Enabled: false
522468
Style/SymbolProc:
523469
Enabled: false
524470
Style/TrailingBodyOnClass:
@@ -533,3 +479,35 @@ Style/TrailingMethodEndStatement:
533479
Enabled: false
534480
Style/UnpackFirst:
535481
Enabled: false
482+
Lint/DuplicateBranch:
483+
Enabled: false
484+
Lint/DuplicateRegexpCharacterClassElement:
485+
Enabled: false
486+
Lint/EmptyBlock:
487+
Enabled: false
488+
Lint/EmptyClass:
489+
Enabled: false
490+
Lint/NoReturnInBeginEndBlocks:
491+
Enabled: false
492+
Lint/ToEnumArguments:
493+
Enabled: false
494+
Lint/UnexpectedBlockArity:
495+
Enabled: false
496+
Lint/UnmodifiedReduceAccumulator:
497+
Enabled: false
498+
Performance/CollectionLiteralInLoop:
499+
Enabled: false
500+
Style/ArgumentsForwarding:
501+
Enabled: false
502+
Style/CollectionCompact:
503+
Enabled: false
504+
Style/DocumentDynamicEvalDefinition:
505+
Enabled: false
506+
Style/NegatedIfElseCondition:
507+
Enabled: false
508+
Style/NilLambda:
509+
Enabled: false
510+
Style/RedundantArgument:
511+
Enabled: false
512+
Style/SwapValues:
513+
Enabled: false

.sync.yml

-5
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,7 @@ Gemfile:
4343
optional:
4444
":development":
4545
- gem: github_changelog_generator
46-
git: https://github.com/skywinder/github-changelog-generator
47-
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
48-
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
4946
Rakefile:
50-
extras:
51-
"FastGettext.default_text_domain = 'default-text-domain'"
5247
changelog_user: puppetlabs
5348
spec/spec_helper.rb:
5449
mock_with: ":rspec"

.travis.yml

+20
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ jobs:
6767
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
6868
services: docker
6969
stage: acceptance
70+
- bundler_args: --with system_tests
71+
before_script:
72+
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
73+
- "bundle exec rake 'litmus:install_agent[puppet5]'"
74+
- "bundle exec rake litmus:install_module"
75+
env: PLATFORMS=travis_el8_puppet5
76+
rvm: 2.5.7
77+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
78+
services: docker
79+
stage: acceptance
7080
- bundler_args: --with system_tests
7181
before_script:
7282
- "bundle exec rake 'litmus:provision_list[travis_deb]'"
@@ -87,6 +97,16 @@ jobs:
8797
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
8898
services: docker
8999
stage: acceptance
100+
- bundler_args: --with system_tests
101+
before_script:
102+
- "bundle exec rake 'litmus:provision_list[travis_el8]'"
103+
- "bundle exec rake 'litmus:install_agent[puppet6]'"
104+
- "bundle exec rake litmus:install_module"
105+
env: PLATFORMS=travis_el8_puppet6
106+
rvm: 2.5.7
107+
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
108+
services: docker
109+
stage: acceptance
90110
-
91111
env: CHECK="check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop syntax lint metadata_lint"
92112
stage: static

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ group :development do
2424
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
2525
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
2626
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
27+
gem "github_changelog_generator", require: false
2828
end
2929
group :system_tests do
3030
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]

Rakefile

-1
Original file line numberDiff line numberDiff line change
@@ -85,4 +85,3 @@ EOM
8585
end
8686
end
8787

88-
FastGettext.default_text_domain = 'default-text-domain'

data/common.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
--- {}

hiera.yaml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
version: 5
3+
4+
defaults: # Used for any hierarchy level that omits these keys.
5+
datadir: data # This path is relative to hiera.yaml's directory.
6+
data_hash: yaml_data # Use the built-in YAML backend.
7+
8+
hierarchy:
9+
- name: "osfamily/major release"
10+
paths:
11+
# Used to distinguish between Debian and Ubuntu
12+
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
13+
- "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
14+
# Used for Solaris
15+
- "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
16+
- name: "osfamily"
17+
paths:
18+
- "os/%{facts.os.name}.yaml"
19+
- "os/%{facts.os.family}.yaml"
20+
- name: 'common'
21+
path: 'common.yaml'

0 commit comments

Comments
 (0)