Commit 8f66a1b9 authored by Nathan Ward's avatar Nathan Ward
Browse files

Update pdk to 3.0.0

parent 62c8069d

.gitignore

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
/log/

/pkg/

/spec/fixtures/manifests/

/spec/fixtures/modules/

/spec/fixtures/modules/*

/tmp/

/vendor/

/convert_report.txt

.pdkignore

+2 −5
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
/log/

/pkg/

/spec/fixtures/manifests/

/spec/fixtures/modules/

/spec/fixtures/modules/*

/tmp/

/vendor/

/convert_report.txt
@@ -26,19 +26,16 @@ 
.envrc

/inventory.yaml

/spec/fixtures/litmus_inventory.yaml

/appveyor.yml

/.editorconfig

/.fixtures.yml

/Gemfile

/.gitattributes

/.gitignore

/.gitlab-ci.yml

/.pdkignore

/.puppet-lint.rc

/Rakefile

/rakelib/

/.rspec

/.rubocop.yml

/..yml

/.yardopts

/spec/

/.vscode/

.rubocop.yml

+210 −6
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ require: 
- rubocop-rspec

AllCops:

  DisplayCopNames: true

  TargetRubyVersion: '2.5'

  TargetRubyVersion: '2.6'

  Include:

  - "**/*.rb"

  Exclude:
@@ -111,8 +111,14 @@ Style/MethodCalledOnDoEndBlock: 
  Enabled: true

Style/StringMethods:

  Enabled: true

Bundler/GemFilename:

  Enabled: false

Bundler/InsecureProtocolSource:

  Enabled: false

Capybara/CurrentPathExpectation:

  Enabled: false

Capybara/VisibilityMatcher:

  Enabled: false

Gemspec/DuplicatedAssignment:

  Enabled: false

Gemspec/OrderedDependencies:
@@ -287,11 +293,9 @@ Performance/UriDefaultParser: 
  Enabled: false

RSpec/Be:

  Enabled: false

RSpec/Capybara/CurrentPathExpectation:

  Enabled: false

RSpec/Capybara/FeatureMethods:

  Enabled: false

RSpec/Capybara/VisibilityMatcher:

RSpec/ContainExactly:

  Enabled: false

RSpec/ContextMethod:

  Enabled: false
@@ -331,6 +335,8 @@ RSpec/LeakyConstantDeclaration: 
  Enabled: false

RSpec/LetBeforeExamples:

  Enabled: false

RSpec/MatchArray:

  Enabled: false

RSpec/MissingExampleGroupArgument:

  Enabled: false

RSpec/MultipleExpectations:
@@ -373,8 +379,6 @@ Style/AccessModifierDeclarations: 
  Enabled: false

Style/AccessorGrouping:

  Enabled: false

Style/AsciiComments:

  Enabled: false

Style/BisectedAttrAccessor:

  Enabled: false

Style/CaseLikeIf:
@@ -485,35 +489,235 @@ Style/TrailingMethodEndStatement: 
  Enabled: false

Style/UnpackFirst:

  Enabled: false

Capybara/MatchStyle:

  Enabled: false

Capybara/NegationMatcher:

  Enabled: false

Capybara/SpecificActions:

  Enabled: false

Capybara/SpecificFinders:

  Enabled: false

Capybara/SpecificMatcher:

  Enabled: false

Gemspec/DeprecatedAttributeAssignment:

  Enabled: false

Gemspec/DevelopmentDependencies:

  Enabled: false

Gemspec/RequireMFA:

  Enabled: false

Layout/LineContinuationLeadingSpace:

  Enabled: false

Layout/LineContinuationSpacing:

  Enabled: false

Layout/LineEndStringConcatenationIndentation:

  Enabled: false

Layout/SpaceBeforeBrackets:

  Enabled: false

Lint/AmbiguousAssignment:

  Enabled: false

Lint/AmbiguousOperatorPrecedence:

  Enabled: false

Lint/AmbiguousRange:

  Enabled: false

Lint/ConstantOverwrittenInRescue:

  Enabled: false

Lint/DeprecatedConstants:

  Enabled: false

Lint/DuplicateBranch:

  Enabled: false

Lint/DuplicateMagicComment:

  Enabled: false

Lint/DuplicateRegexpCharacterClassElement:

  Enabled: false

Lint/EmptyBlock:

  Enabled: false

Lint/EmptyClass:

  Enabled: false

Lint/EmptyInPattern:

  Enabled: false

Lint/IncompatibleIoSelectWithFiberScheduler:

  Enabled: false

Lint/LambdaWithoutLiteralBlock:

  Enabled: false

Lint/NoReturnInBeginEndBlocks:

  Enabled: false

Lint/NonAtomicFileOperation:

  Enabled: false

Lint/NumberedParameterAssignment:

  Enabled: false

Lint/OrAssignmentToConstant:

  Enabled: false

Lint/RedundantDirGlobSort:

  Enabled: false

Lint/RefinementImportMethods:

  Enabled: false

Lint/RequireRangeParentheses:

  Enabled: false

Lint/RequireRelativeSelfPath:

  Enabled: false

Lint/SymbolConversion:

  Enabled: false

Lint/ToEnumArguments:

  Enabled: false

Lint/TripleQuotes:

  Enabled: false

Lint/UnexpectedBlockArity:

  Enabled: false

Lint/UnmodifiedReduceAccumulator:

  Enabled: false

Lint/UselessRescue:

  Enabled: false

Lint/UselessRuby2Keywords:

  Enabled: false

Metrics/CollectionLiteralLength:

  Enabled: false

Naming/BlockForwarding:

  Enabled: false

Performance/CollectionLiteralInLoop:

  Enabled: false

Performance/ConcurrentMonotonicTime:

  Enabled: false

Performance/MapCompact:

  Enabled: false

Performance/RedundantEqualityComparisonBlock:

  Enabled: false

Performance/RedundantSplitRegexpArgument:

  Enabled: false

Performance/StringIdentifierArgument:

  Enabled: false

RSpec/BeEq:

  Enabled: false

RSpec/BeNil:

  Enabled: false

RSpec/ChangeByZero:

  Enabled: false

RSpec/ClassCheck:

  Enabled: false

RSpec/DuplicatedMetadata:

  Enabled: false

RSpec/ExcessiveDocstringSpacing:

  Enabled: false

RSpec/FactoryBot/ConsistentParenthesesStyle:

  Enabled: false

RSpec/FactoryBot/FactoryNameStyle:

  Enabled: false

RSpec/FactoryBot/SyntaxMethods:

  Enabled: false

RSpec/IdenticalEqualityAssertion:

  Enabled: false

RSpec/NoExpectationExample:

  Enabled: false

RSpec/PendingWithoutReason:

  Enabled: false

RSpec/Rails/AvoidSetupHook:

  Enabled: false

RSpec/Rails/HaveHttpStatus:

  Enabled: false

RSpec/Rails/InferredSpecType:

  Enabled: false

RSpec/Rails/MinitestAssertions:

  Enabled: false

RSpec/Rails/TravelAround:

  Enabled: false

RSpec/RedundantAround:

  Enabled: false

RSpec/SkipBlockInsideExample:

  Enabled: false

RSpec/SortMetadata:

  Enabled: false

RSpec/SubjectDeclaration:

  Enabled: false

RSpec/VerifiedDoubleReference:

  Enabled: false

Security/CompoundHash:

  Enabled: false

Security/IoMethods:

  Enabled: false

Style/ArgumentsForwarding:

  Enabled: false

Style/ArrayIntersect:

  Enabled: false

Style/CollectionCompact:

  Enabled: false

Style/ComparableClamp:

  Enabled: false

Style/ConcatArrayLiterals:

  Enabled: false

Style/DirEmpty:

  Enabled: false

Style/DocumentDynamicEvalDefinition:

  Enabled: false

Style/EmptyHeredoc:

  Enabled: false

Style/EndlessMethod:

  Enabled: false

Style/EnvHome:

  Enabled: false

Style/FetchEnvVar:

  Enabled: false

Style/FileEmpty:

  Enabled: false

Style/FileRead:

  Enabled: false

Style/FileWrite:

  Enabled: false

Style/HashConversion:

  Enabled: false

Style/HashExcept:

  Enabled: false

Style/IfWithBooleanLiteralBranches:

  Enabled: false

Style/InPatternThen:

  Enabled: false

Style/MagicCommentFormat:

  Enabled: false

Style/MapCompactWithConditionalBlock:

  Enabled: false

Style/MapToHash:

  Enabled: false

Style/MapToSet:

  Enabled: false

Style/MinMaxComparison:

  Enabled: false

Style/MultilineInPatternThen:

  Enabled: false

Style/NegatedIfElseCondition:

  Enabled: false

Style/NestedFileDirname:

  Enabled: false

Style/NilLambda:

  Enabled: false

Style/NumberedParameters:

  Enabled: false

Style/NumberedParametersLimit:

  Enabled: false

Style/ObjectThen:

  Enabled: false

Style/OpenStructUse:

  Enabled: false

Style/OperatorMethodCall:

  Enabled: false

Style/QuotedSymbols:

  Enabled: false

Style/RedundantArgument:

  Enabled: false

Style/RedundantConstantBase:

  Enabled: false

Style/RedundantDoubleSplatHashBraces:

  Enabled: false

Style/RedundantEach:

  Enabled: false

Style/RedundantHeredocDelimiterQuotes:

  Enabled: false

Style/RedundantInitialize:

  Enabled: false

Style/RedundantSelfAssignmentBranch:

  Enabled: false

Style/RedundantStringEscape:

  Enabled: false

Style/SelectByRegexp:

  Enabled: false

Style/StringChars:

  Enabled: false

Style/SwapValues:

  Enabled: false

Gemfile

+23 −22
Original line number Diff line number Diff line
@@ -19,24 +19,25 @@ group :development do 
  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))

  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))

  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))

  gem "voxpupuli-puppet-lint-plugins", '~> 4.0',   require: false

  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))

  gem "voxpupuli-puppet-lint-plugins", '~> 5.0', require: false

  gem "facterdb", '~> 1.18',                     require: false

  gem "metadata-json-lint", '>= 2.0.2', '< 4.0.0', require: false

  gem "puppetlabs_spec_helper", '~> 5.0',          require: false

  gem "metadata-json-lint", '~> 3.0',            require: false

  gem "puppetlabs_spec_helper", '~> 6.0',        require: false

  gem "rspec-puppet-facts", '~> 2.0',            require: false

  gem "codecov", '~> 0.2',                       require: false

  gem "dependency_checker", '~> 0.2',              require: false

  gem "dependency_checker", '~> 1.0.0',          require: false

  gem "parallel_tests", '= 3.12.1',              require: false

  gem "pry", '~> 0.10',                          require: false

  gem "simplecov-console", '~> 0.5',             require: false

  gem "puppet-debugger", '~> 1.0',               require: false

  gem "rubocop", '= 1.6.1',                        require: false

  gem "rubocop-performance", '= 1.9.1',            require: false

  gem "rubocop-rspec", '= 2.0.1',                  require: false

  gem "rubocop", '= 1.48.1',                     require: false

  gem "rubocop-performance", '= 1.16.0',         require: false

  gem "rubocop-rspec", '= 2.19.0',               require: false

  gem "rb-readline", '= 0.5.5',                  require: false, platforms: [:mswin, :mingw, :x64_mingw]

end

group :system_tests do

  gem "puppet_litmus", '< 1.0.0', require: false, platforms: [:ruby, :x64_mingw]

  gem "puppet_litmus", '~> 1.0', require: false, platforms: [:ruby, :x64_mingw]

  gem "serverspec", '~> 2.41',   require: false

end

Rakefile

+4 −5
Original line number Diff line number Diff line 
# frozen_string_literal: true



require 'bundler'

require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?

require 'puppet_litmus/rake_tasks' if Gem.loaded_specs.key? 'puppet_litmus'

require 'puppetlabs_spec_helper/rake_tasks'

require 'puppet-syntax/tasks/puppet-syntax'

require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?

require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?

require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?

require 'github_changelog_generator/task' if Gem.loaded_specs.key? 'github_changelog_generator'

require 'puppet-strings/tasks' if Gem.loaded_specs.key? 'puppet-strings'



def changelog_user

  return unless Rake.application.top_level_tasks.include? "changelog"
@@ -44,7 +43,7 @@ end 
PuppetLint.configuration.send('disable_relative')





if Bundler.rubygems.find_name('github_changelog_generator').any?

if Gem.loaded_specs.key? 'github_changelog_generator'

  GitHubChangelogGenerator::RakeTask.new :changelog do |config|

    raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?

    config.user = "#{changelog_user}"