Skip to content

Commit 7a0e134

Browse files
authored
Merge pull request #33 from danielparks/pdk-update
2 parents d4f15ac + 0fc4d13 commit 7a0e134

File tree

7 files changed

+246
-44
lines changed

7 files changed

+246
-44
lines changed

.github/workflows/pr-checks.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,16 @@ on:
1010
jobs:
1111
validate:
1212
name: Validate
13-
runs-on: ubuntu-latest
13+
runs-on: ubuntu-22.04
1414

1515
steps:
1616
- uses: actions/checkout@v3
17-
- uses: ruby/setup-ruby@v1
18-
with:
19-
ruby-version: "2.7"
20-
bundler-cache: true
21-
- run: gem install --no-document --minimal-deps pdk
17+
- name: Install pdk
18+
run: |
19+
wget https://apt.puppet.com/puppet-tools-release-jammy.deb
20+
sudo dpkg -i puppet-tools-release-jammy.deb
21+
sudo apt-get update
22+
sudo apt-get install -y pdk
2223
- run: pdk validate
2324

2425
- run: pdk bundle exec puppet strings generate --format markdown

.pdkignore

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,22 @@
2626
.envrc
2727
/inventory.yaml
2828
/spec/fixtures/litmus_inventory.yaml
29-
/appveyor.yml
30-
/.editorconfig
3129
/.fixtures.yml
3230
/Gemfile
3331
/.gitattributes
3432
/.gitignore
35-
/.gitlab-ci.yml
3633
/.pdkignore
3734
/.puppet-lint.rc
3835
/Rakefile
3936
/rakelib/
4037
/.rspec
41-
/.rubocop.yml
42-
/.travis.yml
38+
/..yml
4339
/.yardopts
4440
/spec/
4541
/.vscode/
4642
/.sync.yml
4743
/.devcontainer/
44+
/.editorconfig
4845
/.github
4946
/provision.yaml
5047
/release.rb

.rubocop.yml

Lines changed: 210 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ require:
44
- rubocop-rspec
55
AllCops:
66
DisplayCopNames: true
7-
TargetRubyVersion: '2.5'
7+
TargetRubyVersion: '2.6'
88
Include:
99
- "**/*.rb"
1010
Exclude:
@@ -123,8 +123,14 @@ Style/MethodCalledOnDoEndBlock:
123123
Enabled: true
124124
Style/StringMethods:
125125
Enabled: true
126+
Bundler/GemFilename:
127+
Enabled: false
126128
Bundler/InsecureProtocolSource:
127129
Enabled: false
130+
Capybara/CurrentPathExpectation:
131+
Enabled: false
132+
Capybara/VisibilityMatcher:
133+
Enabled: false
128134
Gemspec/DuplicatedAssignment:
129135
Enabled: false
130136
Gemspec/OrderedDependencies:
@@ -299,11 +305,9 @@ Performance/UriDefaultParser:
299305
Enabled: false
300306
RSpec/Be:
301307
Enabled: false
302-
RSpec/Capybara/CurrentPathExpectation:
303-
Enabled: false
304308
RSpec/Capybara/FeatureMethods:
305309
Enabled: false
306-
RSpec/Capybara/VisibilityMatcher:
310+
RSpec/ContainExactly:
307311
Enabled: false
308312
RSpec/ContextMethod:
309313
Enabled: false
@@ -343,6 +347,8 @@ RSpec/LeakyConstantDeclaration:
343347
Enabled: false
344348
RSpec/LetBeforeExamples:
345349
Enabled: false
350+
RSpec/MatchArray:
351+
Enabled: false
346352
RSpec/MissingExampleGroupArgument:
347353
Enabled: false
348354
RSpec/MultipleExpectations:
@@ -385,8 +391,6 @@ Style/AccessModifierDeclarations:
385391
Enabled: false
386392
Style/AccessorGrouping:
387393
Enabled: false
388-
Style/AsciiComments:
389-
Enabled: false
390394
Style/BisectedAttrAccessor:
391395
Enabled: false
392396
Style/CaseLikeIf:
@@ -497,35 +501,235 @@ Style/TrailingMethodEndStatement:
497501
Enabled: false
498502
Style/UnpackFirst:
499503
Enabled: false
504+
Capybara/MatchStyle:
505+
Enabled: false
506+
Capybara/NegationMatcher:
507+
Enabled: false
508+
Capybara/SpecificActions:
509+
Enabled: false
510+
Capybara/SpecificFinders:
511+
Enabled: false
512+
Capybara/SpecificMatcher:
513+
Enabled: false
514+
Gemspec/DeprecatedAttributeAssignment:
515+
Enabled: false
516+
Gemspec/DevelopmentDependencies:
517+
Enabled: false
518+
Gemspec/RequireMFA:
519+
Enabled: false
520+
Layout/LineContinuationLeadingSpace:
521+
Enabled: false
522+
Layout/LineContinuationSpacing:
523+
Enabled: false
524+
Layout/LineEndStringConcatenationIndentation:
525+
Enabled: false
526+
Layout/SpaceBeforeBrackets:
527+
Enabled: false
528+
Lint/AmbiguousAssignment:
529+
Enabled: false
530+
Lint/AmbiguousOperatorPrecedence:
531+
Enabled: false
532+
Lint/AmbiguousRange:
533+
Enabled: false
534+
Lint/ConstantOverwrittenInRescue:
535+
Enabled: false
536+
Lint/DeprecatedConstants:
537+
Enabled: false
500538
Lint/DuplicateBranch:
501539
Enabled: false
540+
Lint/DuplicateMagicComment:
541+
Enabled: false
502542
Lint/DuplicateRegexpCharacterClassElement:
503543
Enabled: false
504544
Lint/EmptyBlock:
505545
Enabled: false
506546
Lint/EmptyClass:
507547
Enabled: false
548+
Lint/EmptyInPattern:
549+
Enabled: false
550+
Lint/IncompatibleIoSelectWithFiberScheduler:
551+
Enabled: false
552+
Lint/LambdaWithoutLiteralBlock:
553+
Enabled: false
508554
Lint/NoReturnInBeginEndBlocks:
509555
Enabled: false
556+
Lint/NonAtomicFileOperation:
557+
Enabled: false
558+
Lint/NumberedParameterAssignment:
559+
Enabled: false
560+
Lint/OrAssignmentToConstant:
561+
Enabled: false
562+
Lint/RedundantDirGlobSort:
563+
Enabled: false
564+
Lint/RefinementImportMethods:
565+
Enabled: false
566+
Lint/RequireRangeParentheses:
567+
Enabled: false
568+
Lint/RequireRelativeSelfPath:
569+
Enabled: false
570+
Lint/SymbolConversion:
571+
Enabled: false
510572
Lint/ToEnumArguments:
511573
Enabled: false
574+
Lint/TripleQuotes:
575+
Enabled: false
512576
Lint/UnexpectedBlockArity:
513577
Enabled: false
514578
Lint/UnmodifiedReduceAccumulator:
515579
Enabled: false
580+
Lint/UselessRescue:
581+
Enabled: false
582+
Lint/UselessRuby2Keywords:
583+
Enabled: false
584+
Metrics/CollectionLiteralLength:
585+
Enabled: false
586+
Naming/BlockForwarding:
587+
Enabled: false
516588
Performance/CollectionLiteralInLoop:
517589
Enabled: false
590+
Performance/ConcurrentMonotonicTime:
591+
Enabled: false
592+
Performance/MapCompact:
593+
Enabled: false
594+
Performance/RedundantEqualityComparisonBlock:
595+
Enabled: false
596+
Performance/RedundantSplitRegexpArgument:
597+
Enabled: false
598+
Performance/StringIdentifierArgument:
599+
Enabled: false
600+
RSpec/BeEq:
601+
Enabled: false
602+
RSpec/BeNil:
603+
Enabled: false
604+
RSpec/ChangeByZero:
605+
Enabled: false
606+
RSpec/ClassCheck:
607+
Enabled: false
608+
RSpec/DuplicatedMetadata:
609+
Enabled: false
610+
RSpec/ExcessiveDocstringSpacing:
611+
Enabled: false
612+
RSpec/FactoryBot/ConsistentParenthesesStyle:
613+
Enabled: false
614+
RSpec/FactoryBot/FactoryNameStyle:
615+
Enabled: false
616+
RSpec/FactoryBot/SyntaxMethods:
617+
Enabled: false
618+
RSpec/IdenticalEqualityAssertion:
619+
Enabled: false
620+
RSpec/NoExpectationExample:
621+
Enabled: false
622+
RSpec/PendingWithoutReason:
623+
Enabled: false
624+
RSpec/Rails/AvoidSetupHook:
625+
Enabled: false
626+
RSpec/Rails/HaveHttpStatus:
627+
Enabled: false
628+
RSpec/Rails/InferredSpecType:
629+
Enabled: false
630+
RSpec/Rails/MinitestAssertions:
631+
Enabled: false
632+
RSpec/Rails/TravelAround:
633+
Enabled: false
634+
RSpec/RedundantAround:
635+
Enabled: false
636+
RSpec/SkipBlockInsideExample:
637+
Enabled: false
638+
RSpec/SortMetadata:
639+
Enabled: false
640+
RSpec/SubjectDeclaration:
641+
Enabled: false
642+
RSpec/VerifiedDoubleReference:
643+
Enabled: false
644+
Security/CompoundHash:
645+
Enabled: false
646+
Security/IoMethods:
647+
Enabled: false
518648
Style/ArgumentsForwarding:
519649
Enabled: false
650+
Style/ArrayIntersect:
651+
Enabled: false
520652
Style/CollectionCompact:
521653
Enabled: false
654+
Style/ComparableClamp:
655+
Enabled: false
656+
Style/ConcatArrayLiterals:
657+
Enabled: false
658+
Style/DirEmpty:
659+
Enabled: false
522660
Style/DocumentDynamicEvalDefinition:
523661
Enabled: false
662+
Style/EmptyHeredoc:
663+
Enabled: false
664+
Style/EndlessMethod:
665+
Enabled: false
666+
Style/EnvHome:
667+
Enabled: false
668+
Style/FetchEnvVar:
669+
Enabled: false
670+
Style/FileEmpty:
671+
Enabled: false
672+
Style/FileRead:
673+
Enabled: false
674+
Style/FileWrite:
675+
Enabled: false
676+
Style/HashConversion:
677+
Enabled: false
678+
Style/HashExcept:
679+
Enabled: false
680+
Style/IfWithBooleanLiteralBranches:
681+
Enabled: false
682+
Style/InPatternThen:
683+
Enabled: false
684+
Style/MagicCommentFormat:
685+
Enabled: false
686+
Style/MapCompactWithConditionalBlock:
687+
Enabled: false
688+
Style/MapToHash:
689+
Enabled: false
690+
Style/MapToSet:
691+
Enabled: false
692+
Style/MinMaxComparison:
693+
Enabled: false
694+
Style/MultilineInPatternThen:
695+
Enabled: false
524696
Style/NegatedIfElseCondition:
525697
Enabled: false
698+
Style/NestedFileDirname:
699+
Enabled: false
526700
Style/NilLambda:
527701
Enabled: false
702+
Style/NumberedParameters:
703+
Enabled: false
704+
Style/NumberedParametersLimit:
705+
Enabled: false
706+
Style/ObjectThen:
707+
Enabled: false
708+
Style/OpenStructUse:
709+
Enabled: false
710+
Style/OperatorMethodCall:
711+
Enabled: false
712+
Style/QuotedSymbols:
713+
Enabled: false
528714
Style/RedundantArgument:
529715
Enabled: false
716+
Style/RedundantConstantBase:
717+
Enabled: false
718+
Style/RedundantDoubleSplatHashBraces:
719+
Enabled: false
720+
Style/RedundantEach:
721+
Enabled: false
722+
Style/RedundantHeredocDelimiterQuotes:
723+
Enabled: false
724+
Style/RedundantInitialize:
725+
Enabled: false
726+
Style/RedundantSelfAssignmentBranch:
727+
Enabled: false
728+
Style/RedundantStringEscape:
729+
Enabled: false
730+
Style/SelectByRegexp:
731+
Enabled: false
732+
Style/StringChars:
733+
Enabled: false
530734
Style/SwapValues:
531735
Enabled: false

Gemfile

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ def location_for(place_or_version, fake_version = nil)
1414
end
1515

1616
group :development do
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 "voxpupuli-puppet-lint-plugins", '~> 4.0', require: false
23-
gem "facterdb", '~> 1.18', require: false
24-
gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false
25-
gem "puppetlabs_spec_helper", '~> 5.0', require: false
26-
gem "rspec-puppet-facts", '~> 2.0', require: false
27-
gem "codecov", '~> 0.2', require: false
28-
gem "dependency_checker", '~> 0.2', require: false
29-
gem "parallel_tests", '= 3.12.1', require: false
30-
gem "pry", '~> 0.10', require: false
31-
gem "simplecov-console", '~> 0.5', require: false
32-
gem "puppet-debugger", '~> 1.0', require: false
33-
gem "rubocop", '= 1.6.1', require: false
34-
gem "rubocop-performance", '= 1.9.1', require: false
35-
gem "rubocop-rspec", '= 2.0.1', require: false
36-
gem "rb-readline", '= 0.5.5', require: false, platforms: [:mswin, :mingw, :x64_mingw]
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 "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false
23+
gem "facterdb", '~> 1.18', require: false
24+
gem "metadata-json-lint", '~> 3.0', require: false
25+
gem "puppetlabs_spec_helper", '~> 6.0', require: false
26+
gem "rspec-puppet-facts", '~> 2.0', require: false
27+
gem "codecov", '~> 0.2', 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.5', require: false
32+
gem "puppet-debugger", '~> 1.0', require: false
33+
gem "rubocop", '= 1.48.1', 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]
3737
end
3838
group :system_tests do
39-
gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]
40-
gem "serverspec", '~> 2.41', require: false
39+
gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]
40+
gem "serverspec", '~> 2.41', require: false
4141
end
4242

4343
puppet_version = ENV['PUPPET_GEM_VERSION']

0 commit comments

Comments
 (0)