Skip to content

Commit 57af490

Browse files
jbhjbh
committed
PDK update
1 parent a305bed commit 57af490

9 files changed

+263
-118
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt

‎.pdkignore

+3-6
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
/log/
1717
/pkg/
1818
/spec/fixtures/manifests/
19-
/spec/fixtures/modules/
19+
/spec/fixtures/modules/*
2020
/tmp/
2121
/vendor/
2222
/convert_report.txt
@@ -26,20 +26,17 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
32+
/.github/
3433
/.gitignore
35-
/.gitlab-ci.yml
3634
/.pdkignore
3735
/.puppet-lint.rc
3836
/Rakefile
3937
/rakelib/
4038
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
39+
/..yml
4340
/.yardopts
4441
/spec/
4542
/.vscode/

‎.rubocop.yml

+217-6
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ require:
33
- rubocop-performance
44
- rubocop-rspec
55
AllCops:
6+
NewCops: enable
67
DisplayCopNames: true
7-
TargetRubyVersion: '2.5'
8+
TargetRubyVersion: '2.6'
89
Include:
910
- "**/*.rb"
1011
Exclude:
@@ -111,8 +112,14 @@ Style/MethodCalledOnDoEndBlock:
111112
Enabled: true
112113
Style/StringMethods:
113114
Enabled: true
115+
Bundler/GemFilename:
116+
Enabled: false
114117
Bundler/InsecureProtocolSource:
115118
Enabled: false
119+
Capybara/CurrentPathExpectation:
120+
Enabled: false
121+
Capybara/VisibilityMatcher:
122+
Enabled: false
116123
Gemspec/DuplicatedAssignment:
117124
Enabled: false
118125
Gemspec/OrderedDependencies:
@@ -287,11 +294,9 @@ Performance/UriDefaultParser:
287294
Enabled: false
288295
RSpec/Be:
289296
Enabled: false
290-
RSpec/Capybara/CurrentPathExpectation:
291-
Enabled: false
292297
RSpec/Capybara/FeatureMethods:
293298
Enabled: false
294-
RSpec/Capybara/VisibilityMatcher:
299+
RSpec/ContainExactly:
295300
Enabled: false
296301
RSpec/ContextMethod:
297302
Enabled: false
@@ -331,6 +336,8 @@ RSpec/LeakyConstantDeclaration:
331336
Enabled: false
332337
RSpec/LetBeforeExamples:
333338
Enabled: false
339+
RSpec/MatchArray:
340+
Enabled: false
334341
RSpec/MissingExampleGroupArgument:
335342
Enabled: false
336343
RSpec/MultipleExpectations:
@@ -373,8 +380,6 @@ Style/AccessModifierDeclarations:
373380
Enabled: false
374381
Style/AccessorGrouping:
375382
Enabled: false
376-
Style/AsciiComments:
377-
Enabled: false
378383
Style/BisectedAttrAccessor:
379384
Enabled: false
380385
Style/CaseLikeIf:
@@ -485,35 +490,241 @@ Style/TrailingMethodEndStatement:
485490
Enabled: false
486491
Style/UnpackFirst:
487492
Enabled: false
493+
Capybara/MatchStyle:
494+
Enabled: false
495+
Capybara/NegationMatcher:
496+
Enabled: false
497+
Capybara/SpecificActions:
498+
Enabled: false
499+
Capybara/SpecificFinders:
500+
Enabled: false
501+
Capybara/SpecificMatcher:
502+
Enabled: false
503+
Gemspec/DeprecatedAttributeAssignment:
504+
Enabled: false
505+
Gemspec/DevelopmentDependencies:
506+
Enabled: false
507+
Gemspec/RequireMFA:
508+
Enabled: false
509+
Layout/LineContinuationLeadingSpace:
510+
Enabled: false
511+
Layout/LineContinuationSpacing:
512+
Enabled: false
513+
Layout/LineEndStringConcatenationIndentation:
514+
Enabled: false
515+
Layout/SpaceBeforeBrackets:
516+
Enabled: false
517+
Lint/AmbiguousAssignment:
518+
Enabled: false
519+
Lint/AmbiguousOperatorPrecedence:
520+
Enabled: false
521+
Lint/AmbiguousRange:
522+
Enabled: false
523+
Lint/ConstantOverwrittenInRescue:
524+
Enabled: false
525+
Lint/DeprecatedConstants:
526+
Enabled: false
488527
Lint/DuplicateBranch:
489528
Enabled: false
529+
Lint/DuplicateMagicComment:
530+
Enabled: false
531+
Lint/DuplicateMatchPattern:
532+
Enabled: false
490533
Lint/DuplicateRegexpCharacterClassElement:
491534
Enabled: false
492535
Lint/EmptyBlock:
493536
Enabled: false
494537
Lint/EmptyClass:
495538
Enabled: false
539+
Lint/EmptyInPattern:
540+
Enabled: false
541+
Lint/IncompatibleIoSelectWithFiberScheduler:
542+
Enabled: false
543+
Lint/LambdaWithoutLiteralBlock:
544+
Enabled: false
496545
Lint/NoReturnInBeginEndBlocks:
497546
Enabled: false
547+
Lint/NonAtomicFileOperation:
548+
Enabled: false
549+
Lint/NumberedParameterAssignment:
550+
Enabled: false
551+
Lint/OrAssignmentToConstant:
552+
Enabled: false
553+
Lint/RedundantDirGlobSort:
554+
Enabled: false
555+
Lint/RefinementImportMethods:
556+
Enabled: false
557+
Lint/RequireRangeParentheses:
558+
Enabled: false
559+
Lint/RequireRelativeSelfPath:
560+
Enabled: false
561+
Lint/SymbolConversion:
562+
Enabled: false
498563
Lint/ToEnumArguments:
499564
Enabled: false
565+
Lint/TripleQuotes:
566+
Enabled: false
500567
Lint/UnexpectedBlockArity:
501568
Enabled: false
502569
Lint/UnmodifiedReduceAccumulator:
503570
Enabled: false
571+
Lint/UselessRescue:
572+
Enabled: false
573+
Lint/UselessRuby2Keywords:
574+
Enabled: false
575+
Metrics/CollectionLiteralLength:
576+
Enabled: false
577+
Naming/BlockForwarding:
578+
Enabled: false
504579
Performance/CollectionLiteralInLoop:
505580
Enabled: false
581+
Performance/ConcurrentMonotonicTime:
582+
Enabled: false
583+
Performance/MapCompact:
584+
Enabled: false
585+
Performance/RedundantEqualityComparisonBlock:
586+
Enabled: false
587+
Performance/RedundantSplitRegexpArgument:
588+
Enabled: false
589+
Performance/StringIdentifierArgument:
590+
Enabled: false
591+
RSpec/BeEq:
592+
Enabled: false
593+
RSpec/BeNil:
594+
Enabled: false
595+
RSpec/ChangeByZero:
596+
Enabled: false
597+
RSpec/ClassCheck:
598+
Enabled: false
599+
RSpec/DuplicatedMetadata:
600+
Enabled: false
601+
RSpec/ExcessiveDocstringSpacing:
602+
Enabled: false
603+
RSpec/FactoryBot/ConsistentParenthesesStyle:
604+
Enabled: false
605+
RSpec/FactoryBot/FactoryNameStyle:
606+
Enabled: false
607+
RSpec/FactoryBot/SyntaxMethods:
608+
Enabled: false
609+
RSpec/IdenticalEqualityAssertion:
610+
Enabled: false
611+
RSpec/NoExpectationExample:
612+
Enabled: false
613+
RSpec/PendingWithoutReason:
614+
Enabled: false
615+
RSpec/Rails/AvoidSetupHook:
616+
Enabled: false
617+
RSpec/Rails/HaveHttpStatus:
618+
Enabled: false
619+
RSpec/Rails/InferredSpecType:
620+
Enabled: false
621+
RSpec/Rails/MinitestAssertions:
622+
Enabled: false
623+
RSpec/Rails/TravelAround:
624+
Enabled: false
625+
RSpec/RedundantAround:
626+
Enabled: false
627+
RSpec/SkipBlockInsideExample:
628+
Enabled: false
629+
RSpec/SortMetadata:
630+
Enabled: false
631+
RSpec/SubjectDeclaration:
632+
Enabled: false
633+
RSpec/VerifiedDoubleReference:
634+
Enabled: false
635+
Security/CompoundHash:
636+
Enabled: false
637+
Security/IoMethods:
638+
Enabled: false
506639
Style/ArgumentsForwarding:
507640
Enabled: false
641+
Style/ArrayIntersect:
642+
Enabled: false
508643
Style/CollectionCompact:
509644
Enabled: false
645+
Style/ComparableClamp:
646+
Enabled: false
647+
Style/ConcatArrayLiterals:
648+
Enabled: false
649+
Style/DataInheritance:
650+
Enabled: false
651+
Style/DirEmpty:
652+
Enabled: false
510653
Style/DocumentDynamicEvalDefinition:
511654
Enabled: false
655+
Style/EmptyHeredoc:
656+
Enabled: false
657+
Style/EndlessMethod:
658+
Enabled: false
659+
Style/EnvHome:
660+
Enabled: false
661+
Style/FetchEnvVar:
662+
Enabled: false
663+
Style/FileEmpty:
664+
Enabled: false
665+
Style/FileRead:
666+
Enabled: false
667+
Style/FileWrite:
668+
Enabled: false
669+
Style/HashConversion:
670+
Enabled: false
671+
Style/HashExcept:
672+
Enabled: false
673+
Style/IfWithBooleanLiteralBranches:
674+
Enabled: false
675+
Style/InPatternThen:
676+
Enabled: false
677+
Style/MagicCommentFormat:
678+
Enabled: false
679+
Style/MapCompactWithConditionalBlock:
680+
Enabled: false
681+
Style/MapToHash:
682+
Enabled: false
683+
Style/MapToSet:
684+
Enabled: false
685+
Style/MinMaxComparison:
686+
Enabled: false
687+
Style/MultilineInPatternThen:
688+
Enabled: false
512689
Style/NegatedIfElseCondition:
513690
Enabled: false
691+
Style/NestedFileDirname:
692+
Enabled: false
514693
Style/NilLambda:
515694
Enabled: false
695+
Style/NumberedParameters:
696+
Enabled: false
697+
Style/NumberedParametersLimit:
698+
Enabled: false
699+
Style/ObjectThen:
700+
Enabled: false
701+
Style/OpenStructUse:
702+
Enabled: false
703+
Style/OperatorMethodCall:
704+
Enabled: false
705+
Style/QuotedSymbols:
706+
Enabled: false
516707
Style/RedundantArgument:
517708
Enabled: false
709+
Style/RedundantConstantBase:
710+
Enabled: false
711+
Style/RedundantDoubleSplatHashBraces:
712+
Enabled: false
713+
Style/RedundantEach:
714+
Enabled: false
715+
Style/RedundantHeredocDelimiterQuotes:
716+
Enabled: false
717+
Style/RedundantInitialize:
718+
Enabled: false
719+
Style/RedundantLineContinuation:
720+
Enabled: false
721+
Style/RedundantSelfAssignmentBranch:
722+
Enabled: false
723+
Style/RedundantStringEscape:
724+
Enabled: false
725+
Style/SelectByRegexp:
726+
Enabled: false
727+
Style/StringChars:
728+
Enabled: false
518729
Style/SwapValues:
519730
Enabled: false

‎.vscode/extensions.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
33
"puppet.puppet-vscode",
4-
"rebornix.Ruby"
4+
"Shopify.ruby-lsp"
55
]
66
}

‎Gemfile

+27-13
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,36 @@ def location_for(place_or_version, fake_version = nil)
1313
end
1414
end
1515

16-
ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
17-
minor_version = ruby_version_segments[0..1].join('.')
18-
1916
group :development do
20-
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21-
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22-
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23-
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
24-
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
25-
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
26-
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
27-
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false
17+
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
18+
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
19+
gem "json", '= 2.5.1', require: false if Gem::Requirement.create(['>= 3.0.0', '< 3.0.5']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
20+
gem "json", '= 2.6.1', require: false if Gem::Requirement.create(['>= 3.1.0', '< 3.1.3']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
21+
gem "json", '= 2.6.3', require: false if Gem::Requirement.create(['>= 3.2.0', '< 4.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
22+
gem "racc", '~> 1.4.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 3.0.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
23+
gem "deep_merge", '~> 1.0', require: false
24+
gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
25+
gem "facterdb", '~> 1.18', require: false
26+
gem "metadata-json-lint", '~> 4.0', require: false
27+
gem "rspec-puppet-facts", '~> 3.0', require: false
28+
gem "dependency_checker", '~> 1.0.0', require: false
29+
gem "parallel_tests", '= 3.12.1', require: false
30+
gem "pry", '~> 0.10', require: false
31+
gem "simplecov-console", '~> 0.9', require: false
32+
gem "puppet-debugger", '~> 1.0', require: false
33+
gem "rubocop", '~> 1.50.0', require: false
34+
gem "rubocop-performance", '= 1.16.0', require: false
35+
gem "rubocop-rspec", '= 2.19.0', require: false
36+
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
37+
end
38+
group :development, :release_prep do
39+
gem "puppet-strings", '~> 4.0', require: false
40+
gem "puppetlabs_spec_helper", '~> 7.0', require: false
2841
end
2942
group :system_tests do
30-
gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
31-
gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
43+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
44+
gem "CFPropertyList", '< 3.0.7', require: false, platforms: [:mswin, :mingw, :x64_mingw]
45+
gem "serverspec", '~> 2.41', require: false
3246
end
3347

3448
puppet_version = ENV['PUPPET_GEM_VERSION']

0 commit comments

Comments
 (0)