Skip to content

Commit ffc7a40

Browse files
authored
Merge pull request #695 from mhashizume/PA-5963/main/concurrent-ruby
Update to PDK template 3.0.1
2 parents f1853b4 + ad4b749 commit ffc7a40

File tree

17 files changed

+281
-66
lines changed

17 files changed

+281
-66
lines changed

.github/workflows/auto_release.yml renamed to .github/workflows/release_prep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Auto release"
1+
name: "Release Prep"
22

33
on:
44
workflow_dispatch:

.gitignore

Lines changed: 1 addition & 1 deletion
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

Lines changed: 3 additions & 6 deletions
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/

.puppet-lint.rc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
--relative
2+
--no-puppet_url_without_modules-check

.rubocop.yml

Lines changed: 212 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:
@@ -37,6 +37,8 @@ Style/BlockDelimiters:
3737
be consistent then.
3838
EnforcedStyle: braces_for_chaining
3939
Style/ClassAndModuleChildren:
40+
Description: Compact style reduces the required amount of indentation.
41+
EnforcedStyle: compact
4042
Enabled: false
4143
Style/EmptyElse:
4244
Description: Enforce against empty else clauses, but allow `nil` for clarity.
@@ -114,8 +116,14 @@ Style/MethodCalledOnDoEndBlock:
114116
Enabled: true
115117
Style/StringMethods:
116118
Enabled: true
119+
Bundler/GemFilename:
120+
Enabled: false
117121
Bundler/InsecureProtocolSource:
118122
Enabled: false
123+
Capybara/CurrentPathExpectation:
124+
Enabled: false
125+
Capybara/VisibilityMatcher:
126+
Enabled: false
119127
Gemspec/DuplicatedAssignment:
120128
Enabled: false
121129
Gemspec/OrderedDependencies:
@@ -290,11 +298,9 @@ Performance/UriDefaultParser:
290298
Enabled: false
291299
RSpec/Be:
292300
Enabled: false
293-
RSpec/Capybara/CurrentPathExpectation:
294-
Enabled: false
295301
RSpec/Capybara/FeatureMethods:
296302
Enabled: false
297-
RSpec/Capybara/VisibilityMatcher:
303+
RSpec/ContainExactly:
298304
Enabled: false
299305
RSpec/ContextMethod:
300306
Enabled: false
@@ -334,6 +340,8 @@ RSpec/LeakyConstantDeclaration:
334340
Enabled: false
335341
RSpec/LetBeforeExamples:
336342
Enabled: false
343+
RSpec/MatchArray:
344+
Enabled: false
337345
RSpec/MissingExampleGroupArgument:
338346
Enabled: false
339347
RSpec/MultipleExpectations:
@@ -376,8 +384,6 @@ Style/AccessModifierDeclarations:
376384
Enabled: false
377385
Style/AccessorGrouping:
378386
Enabled: false
379-
Style/AsciiComments:
380-
Enabled: false
381387
Style/BisectedAttrAccessor:
382388
Enabled: false
383389
Style/CaseLikeIf:
@@ -488,35 +494,235 @@ Style/TrailingMethodEndStatement:
488494
Enabled: false
489495
Style/UnpackFirst:
490496
Enabled: false
497+
Capybara/MatchStyle:
498+
Enabled: false
499+
Capybara/NegationMatcher:
500+
Enabled: false
501+
Capybara/SpecificActions:
502+
Enabled: false
503+
Capybara/SpecificFinders:
504+
Enabled: false
505+
Capybara/SpecificMatcher:
506+
Enabled: false
507+
Gemspec/DeprecatedAttributeAssignment:
508+
Enabled: false
509+
Gemspec/DevelopmentDependencies:
510+
Enabled: false
511+
Gemspec/RequireMFA:
512+
Enabled: false
513+
Layout/LineContinuationLeadingSpace:
514+
Enabled: false
515+
Layout/LineContinuationSpacing:
516+
Enabled: false
517+
Layout/LineEndStringConcatenationIndentation:
518+
Enabled: false
519+
Layout/SpaceBeforeBrackets:
520+
Enabled: false
521+
Lint/AmbiguousAssignment:
522+
Enabled: false
523+
Lint/AmbiguousOperatorPrecedence:
524+
Enabled: false
525+
Lint/AmbiguousRange:
526+
Enabled: false
527+
Lint/ConstantOverwrittenInRescue:
528+
Enabled: false
529+
Lint/DeprecatedConstants:
530+
Enabled: false
491531
Lint/DuplicateBranch:
492532
Enabled: false
533+
Lint/DuplicateMagicComment:
534+
Enabled: false
493535
Lint/DuplicateRegexpCharacterClassElement:
494536
Enabled: false
495537
Lint/EmptyBlock:
496538
Enabled: false
497539
Lint/EmptyClass:
498540
Enabled: false
541+
Lint/EmptyInPattern:
542+
Enabled: false
543+
Lint/IncompatibleIoSelectWithFiberScheduler:
544+
Enabled: false
545+
Lint/LambdaWithoutLiteralBlock:
546+
Enabled: false
499547
Lint/NoReturnInBeginEndBlocks:
500548
Enabled: false
549+
Lint/NonAtomicFileOperation:
550+
Enabled: false
551+
Lint/NumberedParameterAssignment:
552+
Enabled: false
553+
Lint/OrAssignmentToConstant:
554+
Enabled: false
555+
Lint/RedundantDirGlobSort:
556+
Enabled: false
557+
Lint/RefinementImportMethods:
558+
Enabled: false
559+
Lint/RequireRangeParentheses:
560+
Enabled: false
561+
Lint/RequireRelativeSelfPath:
562+
Enabled: false
563+
Lint/SymbolConversion:
564+
Enabled: false
501565
Lint/ToEnumArguments:
502566
Enabled: false
567+
Lint/TripleQuotes:
568+
Enabled: false
503569
Lint/UnexpectedBlockArity:
504570
Enabled: false
505571
Lint/UnmodifiedReduceAccumulator:
506572
Enabled: false
573+
Lint/UselessRescue:
574+
Enabled: false
575+
Lint/UselessRuby2Keywords:
576+
Enabled: false
577+
Metrics/CollectionLiteralLength:
578+
Enabled: false
579+
Naming/BlockForwarding:
580+
Enabled: false
507581
Performance/CollectionLiteralInLoop:
508582
Enabled: false
583+
Performance/ConcurrentMonotonicTime:
584+
Enabled: false
585+
Performance/MapCompact:
586+
Enabled: false
587+
Performance/RedundantEqualityComparisonBlock:
588+
Enabled: false
589+
Performance/RedundantSplitRegexpArgument:
590+
Enabled: false
591+
Performance/StringIdentifierArgument:
592+
Enabled: false
593+
RSpec/BeEq:
594+
Enabled: false
595+
RSpec/BeNil:
596+
Enabled: false
597+
RSpec/ChangeByZero:
598+
Enabled: false
599+
RSpec/ClassCheck:
600+
Enabled: false
601+
RSpec/DuplicatedMetadata:
602+
Enabled: false
603+
RSpec/ExcessiveDocstringSpacing:
604+
Enabled: false
605+
RSpec/FactoryBot/ConsistentParenthesesStyle:
606+
Enabled: false
607+
RSpec/FactoryBot/FactoryNameStyle:
608+
Enabled: false
609+
RSpec/FactoryBot/SyntaxMethods:
610+
Enabled: false
611+
RSpec/IdenticalEqualityAssertion:
612+
Enabled: false
613+
RSpec/NoExpectationExample:
614+
Enabled: false
615+
RSpec/PendingWithoutReason:
616+
Enabled: false
617+
RSpec/Rails/AvoidSetupHook:
618+
Enabled: false
619+
RSpec/Rails/HaveHttpStatus:
620+
Enabled: false
621+
RSpec/Rails/InferredSpecType:
622+
Enabled: false
623+
RSpec/Rails/MinitestAssertions:
624+
Enabled: false
625+
RSpec/Rails/TravelAround:
626+
Enabled: false
627+
RSpec/RedundantAround:
628+
Enabled: false
629+
RSpec/SkipBlockInsideExample:
630+
Enabled: false
631+
RSpec/SortMetadata:
632+
Enabled: false
633+
RSpec/SubjectDeclaration:
634+
Enabled: false
635+
RSpec/VerifiedDoubleReference:
636+
Enabled: false
637+
Security/CompoundHash:
638+
Enabled: false
639+
Security/IoMethods:
640+
Enabled: false
509641
Style/ArgumentsForwarding:
510642
Enabled: false
643+
Style/ArrayIntersect:
644+
Enabled: false
511645
Style/CollectionCompact:
512646
Enabled: false
647+
Style/ComparableClamp:
648+
Enabled: false
649+
Style/ConcatArrayLiterals:
650+
Enabled: false
651+
Style/DirEmpty:
652+
Enabled: false
513653
Style/DocumentDynamicEvalDefinition:
514654
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
515689
Style/NegatedIfElseCondition:
516690
Enabled: false
691+
Style/NestedFileDirname:
692+
Enabled: false
517693
Style/NilLambda:
518694
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
519707
Style/RedundantArgument:
520708
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/RedundantSelfAssignmentBranch:
720+
Enabled: false
721+
Style/RedundantStringEscape:
722+
Enabled: false
723+
Style/SelectByRegexp:
724+
Enabled: false
725+
Style/StringChars:
726+
Enabled: false
521727
Style/SwapValues:
522728
Enabled: false

.sync.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ Gemfile:
2828
- gem: beaker-puppet
2929
from_env: BEAKER_PUPPET_VERSION
3030
version: '~> 1.22'
31-
- gem: github_changelog_generator
32-
version: '= 1.16.4'
3331
- gem: beaker-module_install_helper
34-
- gem: concurrent-ruby
35-
version: '= 1.1.10'
3632
- gem: beaker-puppet_install_helper
3733
- gem: nokogiri
3834
- gem: 'bolt'
@@ -46,19 +42,26 @@ Gemfile:
4642
":system_tests":
4743
- gem: voxpupuli-acceptance
4844
version: '~> 1.0'
45+
4946
appveyor.yml:
5047
delete: true
5148
.travis.yml:
5249
delete: true
53-
.github/workflows/auto_release.yml:
54-
unmanaged: false
5550
.github/workflows/release.yml:
5651
unmanaged: false
52+
.github/workflows/release_prep.yml:
53+
unmanaged: false
5754
.gitlab-ci.yml:
5855
delete: true
5956
spec/default_facts.yml:
6057
delete: true
6158
spec/spec_helper.rb:
6259
unmanaged: true
60+
# puppet_url_without modules check in puppet-lint assumes any puppet:/// URL is
61+
# using the module mount. pe_packages is a custom mount and doesn't need
62+
# modules.
6363
Rakefile:
64-
changelog_since_tag: 'v4.13.0'
64+
extra_disabled_lint_checks:
65+
- puppet_url_without_modules
66+
requires:
67+
- voxpupuli/acceptance/rake

.vscode/extensions.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"recommendations": [
3+
"puppet.puppet-vscode",
4+
"rebornix.Ruby"
5+
]
6+
}

0 commit comments

Comments
 (0)