Skip to content

Commit

Permalink
(maint) - Pdk Update
Browse files Browse the repository at this point in the history
  • Loading branch information
David Swan committed May 12, 2020
1 parent 07a868e commit 9d0b9ee
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .rubocop.yml
Expand Up @@ -40,6 +40,10 @@ Style/BlockDelimiters:
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
be consistent then.
EnforcedStyle: braces_for_chaining
Style/BracesAroundHashParameters:
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
See https://github.com/rubocop-hq/rubocop/pull/7643
Enabled: true
Style/ClassAndModuleChildren:
Description: Compact style reduces the required amount of indentation.
EnforcedStyle: compact
Expand Down
2 changes: 1 addition & 1 deletion .vscode/extensions.json
@@ -1,6 +1,6 @@
{
"recommendations": [
"jpogran.puppet-vscode",
"puppet.puppet-vscode",
"rebornix.Ruby"
]
}
2 changes: 0 additions & 2 deletions Gemfile
Expand Up @@ -29,8 +29,6 @@ group :development do
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
gem 'ed25519', '>= 1.2', '< 2.0'
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
end

puppet_version = ENV['PUPPET_GEM_VERSION']
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
Expand Up @@ -88,5 +88,5 @@
],
"pdk-version": "1.17.0",
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
"template-ref": "1.17.0-0-gd3a4319"
"template-ref": "heads/master-0-g095317c"
}
1 change: 1 addition & 0 deletions spec/spec_helper.rb
Expand Up @@ -42,6 +42,7 @@
# set to strictest setting for testing
# by default Puppet runs at warning level
Puppet.settings[:strict] = :warning
Puppet.settings[:strict_variables] = true
end
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
c.after(:suite) do
Expand Down

0 comments on commit 9d0b9ee

Please sign in to comment.