Skip to content

Commit a0c9177

Browse files
authored
Merge pull request #62 from EncoreTechnologies/feature/pdk-1.18.0
PDK v1.18.0
2 parents 17dd179 + e741194 commit a0c9177

7 files changed

Lines changed: 23 additions & 5 deletions

File tree

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,3 @@
3333
bolt.log
3434
Puppetfile.lock
3535
modules
36-
site-modules

.rubocop.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ Style/BlockDelimiters:
4040
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
4141
be consistent then.
4242
EnforcedStyle: braces_for_chaining
43+
Style/BracesAroundHashParameters:
44+
Description: Braces are required by Ruby 2.7. Cop removed from RuboCop v0.80.0.
45+
See https://github.com/rubocop-hq/rubocop/pull/7643
46+
Enabled: true
4347
Style/ClassAndModuleChildren:
4448
Description: Compact style reduces the required amount of indentation.
4549
EnforcedStyle: compact

.sync.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,8 @@ Gemfile:
5252
# extras:
5353
# - "# exclude plans because puppet-syntax doesn't support them yet: https://github.com/voxpupuli/puppet-syntax/issues/95"
5454
# - 'PuppetSyntax.exclude_paths = ["plans/**/*", "vendor/**/*"]'
55+
.travis.yml:
56+
deploy_to_forge:
57+
enabled: true
58+
user: encore
59+
secure: "dAqckSD7HGROLA3AMl7CT5Mrw1NLqYBMRUMlR44dNuuFcUfigdW0VnIQrwotip304zJ68bWNpN2xi9QBfB1MDa8tymEQ35apaxvltJlTdKazlMnukl8TVp5WvtTBrwziwMfb99JZFLNMuReqZh+JHkfQjyjtLAglEf+QtNgmOzcXihUMl1kbV5XnrGQ7UDbc65ReT3khTIfZu6iCXqY/3JHOHLBd+EYc01EfOA/JQb1V/gIAf0zNSum4LZ4HoWrPXjts+w8pigJcCM0jxwpBFAex3uKSOTGC2lUG/xTwZXKT8lXWqZlbpAoahDDuH3CsvAA9FnnWQoXGIwryeZ2W0IVwYJvOvYtoepyd3//Tsvtma6wJuzqxlggpVCcb7Pm9IKXiUCXMnbQ4HP6YR/Mk5yt/+1Xl2RwJCve4fII9mo8OG657JyOio8BO+mznGJiZ5fCpQwtt3J8nlhnP5fDumNiggfhh2pzzZmSRp/LlsmVyJvWwweNskbX69F1g6r2NvEmiFedLjAg2jeOcRI7YiOsNsXwn4F/87RG6rOKw469MIcH74Td6oYYgSjaOMnLz07ZqL8YNxTwXhH7kc1MB92J+0GYX0iM38WpJFr30o/fu+wJzitKBSiFB2fQ1av1akBGFrBMX1GQIAj6USMQSpcIvVcCzCNcSS9cNUqTw7gI="

.travis.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,12 @@ branches:
4747
- /^v\d/
4848
notifications:
4949
email: false
50+
deploy:
51+
provider: puppetforge
52+
username: encore
53+
password:
54+
secure: "dAqckSD7HGROLA3AMl7CT5Mrw1NLqYBMRUMlR44dNuuFcUfigdW0VnIQrwotip304zJ68bWNpN2xi9QBfB1MDa8tymEQ35apaxvltJlTdKazlMnukl8TVp5WvtTBrwziwMfb99JZFLNMuReqZh+JHkfQjyjtLAglEf+QtNgmOzcXihUMl1kbV5XnrGQ7UDbc65ReT3khTIfZu6iCXqY/3JHOHLBd+EYc01EfOA/JQb1V/gIAf0zNSum4LZ4HoWrPXjts+w8pigJcCM0jxwpBFAex3uKSOTGC2lUG/xTwZXKT8lXWqZlbpAoahDDuH3CsvAA9FnnWQoXGIwryeZ2W0IVwYJvOvYtoepyd3//Tsvtma6wJuzqxlggpVCcb7Pm9IKXiUCXMnbQ4HP6YR/Mk5yt/+1Xl2RwJCve4fII9mo8OG657JyOio8BO+mznGJiZ5fCpQwtt3J8nlhnP5fDumNiggfhh2pzzZmSRp/LlsmVyJvWwweNskbX69F1g6r2NvEmiFedLjAg2jeOcRI7YiOsNsXwn4F/87RG6rOKw469MIcH74Td6oYYgSjaOMnLz07ZqL8YNxTwXhH7kc1MB92J+0GYX0iM38WpJFr30o/fu+wJzitKBSiFB2fQ1av1akBGFrBMX1GQIAj6USMQSpcIvVcCzCNcSS9cNUqTw7gI="
55+
on:
56+
tags: true
57+
all_branches: true
58+
condition: "$DEPLOY_TO_FORGE = yes"

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"recommendations": [
3-
"jpogran.puppet-vscode",
3+
"puppet.puppet-vscode",
44
"rebornix.Ruby"
55
]
66
}

metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"version_requirement": ">= 4.10.0 < 7.0.0"
8383
}
8484
],
85-
"pdk-version": "1.17.0",
86-
"template-url": "https://github.com/puppetlabs/pdk-templates#1.17.0",
87-
"template-ref": "tags/1.17.0-0-gd3a4319"
85+
"pdk-version": "1.18.0",
86+
"template-url": "https://github.com/puppetlabs/pdk-templates#1.18.0",
87+
"template-ref": "tags/1.18.0-0-g095317c"
8888
}

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
# set to strictest setting for testing
3939
# by default Puppet runs at warning level
4040
Puppet.settings[:strict] = :warning
41+
Puppet.settings[:strict_variables] = true
4142
end
4243
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
4344
c.after(:suite) do

0 commit comments

Comments
 (0)