Skip to content

Commit e4b1a8e

Browse files
authored
Merge pull request #66 from mhashizume/PA-5963/main/concurrent-ruby
Update to PDK template 3.0.1
2 parents f56c509 + c46a21f commit e4b1a8e

File tree

12 files changed

+253
-46
lines changed

12 files changed

+253
-46
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Publish module"
22

33
on:
44
workflow_dispatch:
5-
5+
66
jobs:
77
release:
88
uses: "puppetlabs/cat-github-actions/.github/workflows/module_release.yml@main"

.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/

.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:
@@ -113,8 +113,14 @@ Style/MethodCalledOnDoEndBlock:
113113
Enabled: true
114114
Style/StringMethods:
115115
Enabled: true
116+
Bundler/GemFilename:
117+
Enabled: false
116118
Bundler/InsecureProtocolSource:
117119
Enabled: false
120+
Capybara/CurrentPathExpectation:
121+
Enabled: false
122+
Capybara/VisibilityMatcher:
123+
Enabled: false
118124
Gemspec/DuplicatedAssignment:
119125
Enabled: false
120126
Gemspec/OrderedDependencies:
@@ -287,11 +293,9 @@ Performance/UriDefaultParser:
287293
Enabled: false
288294
RSpec/Be:
289295
Enabled: false
290-
RSpec/Capybara/CurrentPathExpectation:
291-
Enabled: false
292296
RSpec/Capybara/FeatureMethods:
293297
Enabled: false
294-
RSpec/Capybara/VisibilityMatcher:
298+
RSpec/ContainExactly:
295299
Enabled: false
296300
RSpec/ContextMethod:
297301
Enabled: false
@@ -331,6 +335,8 @@ RSpec/LeakyConstantDeclaration:
331335
Enabled: false
332336
RSpec/LetBeforeExamples:
333337
Enabled: false
338+
RSpec/MatchArray:
339+
Enabled: false
334340
RSpec/MissingExampleGroupArgument:
335341
Enabled: false
336342
RSpec/MultipleExpectations:
@@ -373,8 +379,6 @@ Style/AccessModifierDeclarations:
373379
Enabled: false
374380
Style/AccessorGrouping:
375381
Enabled: false
376-
Style/AsciiComments:
377-
Enabled: false
378382
Style/BisectedAttrAccessor:
379383
Enabled: false
380384
Style/CaseLikeIf:
@@ -485,35 +489,235 @@ Style/TrailingMethodEndStatement:
485489
Enabled: false
486490
Style/UnpackFirst:
487491
Enabled: false
492+
Capybara/MatchStyle:
493+
Enabled: false
494+
Capybara/NegationMatcher:
495+
Enabled: false
496+
Capybara/SpecificActions:
497+
Enabled: false
498+
Capybara/SpecificFinders:
499+
Enabled: false
500+
Capybara/SpecificMatcher:
501+
Enabled: false
502+
Gemspec/DeprecatedAttributeAssignment:
503+
Enabled: false
504+
Gemspec/DevelopmentDependencies:
505+
Enabled: false
506+
Gemspec/RequireMFA:
507+
Enabled: false
508+
Layout/LineContinuationLeadingSpace:
509+
Enabled: false
510+
Layout/LineContinuationSpacing:
511+
Enabled: false
512+
Layout/LineEndStringConcatenationIndentation:
513+
Enabled: false
514+
Layout/SpaceBeforeBrackets:
515+
Enabled: false
516+
Lint/AmbiguousAssignment:
517+
Enabled: false
518+
Lint/AmbiguousOperatorPrecedence:
519+
Enabled: false
520+
Lint/AmbiguousRange:
521+
Enabled: false
522+
Lint/ConstantOverwrittenInRescue:
523+
Enabled: false
524+
Lint/DeprecatedConstants:
525+
Enabled: false
488526
Lint/DuplicateBranch:
489527
Enabled: false
528+
Lint/DuplicateMagicComment:
529+
Enabled: false
490530
Lint/DuplicateRegexpCharacterClassElement:
491531
Enabled: false
492532
Lint/EmptyBlock:
493533
Enabled: false
494534
Lint/EmptyClass:
495535
Enabled: false
536+
Lint/EmptyInPattern:
537+
Enabled: false
538+
Lint/IncompatibleIoSelectWithFiberScheduler:
539+
Enabled: false
540+
Lint/LambdaWithoutLiteralBlock:
541+
Enabled: false
496542
Lint/NoReturnInBeginEndBlocks:
497543
Enabled: false
544+
Lint/NonAtomicFileOperation:
545+
Enabled: false
546+
Lint/NumberedParameterAssignment:
547+
Enabled: false
548+
Lint/OrAssignmentToConstant:
549+
Enabled: false
550+
Lint/RedundantDirGlobSort:
551+
Enabled: false
552+
Lint/RefinementImportMethods:
553+
Enabled: false
554+
Lint/RequireRangeParentheses:
555+
Enabled: false
556+
Lint/RequireRelativeSelfPath:
557+
Enabled: false
558+
Lint/SymbolConversion:
559+
Enabled: false
498560
Lint/ToEnumArguments:
499561
Enabled: false
562+
Lint/TripleQuotes:
563+
Enabled: false
500564
Lint/UnexpectedBlockArity:
501565
Enabled: false
502566
Lint/UnmodifiedReduceAccumulator:
503567
Enabled: false
568+
Lint/UselessRescue:
569+
Enabled: false
570+
Lint/UselessRuby2Keywords:
571+
Enabled: false
572+
Metrics/CollectionLiteralLength:
573+
Enabled: false
574+
Naming/BlockForwarding:
575+
Enabled: false
504576
Performance/CollectionLiteralInLoop:
505577
Enabled: false
578+
Performance/ConcurrentMonotonicTime:
579+
Enabled: false
580+
Performance/MapCompact:
581+
Enabled: false
582+
Performance/RedundantEqualityComparisonBlock:
583+
Enabled: false
584+
Performance/RedundantSplitRegexpArgument:
585+
Enabled: false
586+
Performance/StringIdentifierArgument:
587+
Enabled: false
588+
RSpec/BeEq:
589+
Enabled: false
590+
RSpec/BeNil:
591+
Enabled: false
592+
RSpec/ChangeByZero:
593+
Enabled: false
594+
RSpec/ClassCheck:
595+
Enabled: false
596+
RSpec/DuplicatedMetadata:
597+
Enabled: false
598+
RSpec/ExcessiveDocstringSpacing:
599+
Enabled: false
600+
RSpec/FactoryBot/ConsistentParenthesesStyle:
601+
Enabled: false
602+
RSpec/FactoryBot/FactoryNameStyle:
603+
Enabled: false
604+
RSpec/FactoryBot/SyntaxMethods:
605+
Enabled: false
606+
RSpec/IdenticalEqualityAssertion:
607+
Enabled: false
608+
RSpec/NoExpectationExample:
609+
Enabled: false
610+
RSpec/PendingWithoutReason:
611+
Enabled: false
612+
RSpec/Rails/AvoidSetupHook:
613+
Enabled: false
614+
RSpec/Rails/HaveHttpStatus:
615+
Enabled: false
616+
RSpec/Rails/InferredSpecType:
617+
Enabled: false
618+
RSpec/Rails/MinitestAssertions:
619+
Enabled: false
620+
RSpec/Rails/TravelAround:
621+
Enabled: false
622+
RSpec/RedundantAround:
623+
Enabled: false
624+
RSpec/SkipBlockInsideExample:
625+
Enabled: false
626+
RSpec/SortMetadata:
627+
Enabled: false
628+
RSpec/SubjectDeclaration:
629+
Enabled: false
630+
RSpec/VerifiedDoubleReference:
631+
Enabled: false
632+
Security/CompoundHash:
633+
Enabled: false
634+
Security/IoMethods:
635+
Enabled: false
506636
Style/ArgumentsForwarding:
507637
Enabled: false
638+
Style/ArrayIntersect:
639+
Enabled: false
508640
Style/CollectionCompact:
509641
Enabled: false
642+
Style/ComparableClamp:
643+
Enabled: false
644+
Style/ConcatArrayLiterals:
645+
Enabled: false
646+
Style/DirEmpty:
647+
Enabled: false
510648
Style/DocumentDynamicEvalDefinition:
511649
Enabled: false
650+
Style/EmptyHeredoc:
651+
Enabled: false
652+
Style/EndlessMethod:
653+
Enabled: false
654+
Style/EnvHome:
655+
Enabled: false
656+
Style/FetchEnvVar:
657+
Enabled: false
658+
Style/FileEmpty:
659+
Enabled: false
660+
Style/FileRead:
661+
Enabled: false
662+
Style/FileWrite:
663+
Enabled: false
664+
Style/HashConversion:
665+
Enabled: false
666+
Style/HashExcept:
667+
Enabled: false
668+
Style/IfWithBooleanLiteralBranches:
669+
Enabled: false
670+
Style/InPatternThen:
671+
Enabled: false
672+
Style/MagicCommentFormat:
673+
Enabled: false
674+
Style/MapCompactWithConditionalBlock:
675+
Enabled: false
676+
Style/MapToHash:
677+
Enabled: false
678+
Style/MapToSet:
679+
Enabled: false
680+
Style/MinMaxComparison:
681+
Enabled: false
682+
Style/MultilineInPatternThen:
683+
Enabled: false
512684
Style/NegatedIfElseCondition:
513685
Enabled: false
686+
Style/NestedFileDirname:
687+
Enabled: false
514688
Style/NilLambda:
515689
Enabled: false
690+
Style/NumberedParameters:
691+
Enabled: false
692+
Style/NumberedParametersLimit:
693+
Enabled: false
694+
Style/ObjectThen:
695+
Enabled: false
696+
Style/OpenStructUse:
697+
Enabled: false
698+
Style/OperatorMethodCall:
699+
Enabled: false
700+
Style/QuotedSymbols:
701+
Enabled: false
516702
Style/RedundantArgument:
517703
Enabled: false
704+
Style/RedundantConstantBase:
705+
Enabled: false
706+
Style/RedundantDoubleSplatHashBraces:
707+
Enabled: false
708+
Style/RedundantEach:
709+
Enabled: false
710+
Style/RedundantHeredocDelimiterQuotes:
711+
Enabled: false
712+
Style/RedundantInitialize:
713+
Enabled: false
714+
Style/RedundantSelfAssignmentBranch:
715+
Enabled: false
716+
Style/RedundantStringEscape:
717+
Enabled: false
718+
Style/SelectByRegexp:
719+
Enabled: false
720+
Style/StringChars:
721+
Enabled: false
518722
Style/SwapValues:
519723
Enabled: false

.sync.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ Gemfile:
1919
- gem: beaker-puppet
2020
from_env: BEAKER_PUPPET_VERSION
2121
version: '~> 1.22'
22-
- gem: github_changelog_generator
23-
version: '= 1.16.4'
24-
- gem: concurrent-ruby
25-
version: '= 1.1.10'
2622
# We can unpin async when we move to Ruby 3
2723
- gem: async
2824
version: '~> 1'
@@ -36,9 +32,13 @@ appveyor.yml:
3632
delete: true
3733
.travis.yml:
3834
delete: true
39-
.github/workflows/auto_release.yml:
40-
unmanaged: false
4135
.github/workflows/release.yml:
4236
unmanaged: false
37+
.github/workflows/release_prep.yml:
38+
unmanaged: false
4339
.gitlab-ci.yml:
4440
delete: true
41+
# We still use the Vox acceptance Rake task instead of Litmus
42+
Rakefile:
43+
requires:
44+
- voxpupuli/acceptance/rake

0 commit comments

Comments
 (0)