Skip to content

Commit 9882ba2

Browse files
david22swanDavid Swan
and
David Swan
authored
pdksync - (maint) - Pdk Update (puppetlabs#147)
* (maint) - Pdk Update * (maint) - add back gems removed by pdk update Co-authored-by: David Swan <[email protected]>
1 parent f8b637a commit 9882ba2

File tree

5 files changed

+7
-10
lines changed

5 files changed

+7
-10
lines changed

.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

.travis.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ jobs:
3333
- "bundle exec rake 'litmus:install_agent[puppet5]'"
3434
- "bundle exec rake litmus:install_module"
3535
bundler_args:
36-
dist: trusty
3736
env: PLATFORMS=travis_deb_puppet5
3837
rvm: 2.5.7
3938
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -45,7 +44,6 @@ jobs:
4544
- "bundle exec rake 'litmus:install_agent[puppet5]'"
4645
- "bundle exec rake litmus:install_module"
4746
bundler_args:
48-
dist: trusty
4947
env: PLATFORMS=travis_ub_puppet5
5048
rvm: 2.5.7
5149
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -57,7 +55,6 @@ jobs:
5755
- "bundle exec rake 'litmus:install_agent[puppet5]'"
5856
- "bundle exec rake litmus:install_module"
5957
bundler_args:
60-
dist: trusty
6158
env: PLATFORMS=travis_el6_puppet5
6259
rvm: 2.5.7
6360
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -69,7 +66,6 @@ jobs:
6966
- "bundle exec rake 'litmus:install_agent[puppet5]'"
7067
- "bundle exec rake litmus:install_module"
7168
bundler_args:
72-
dist: trusty
7369
env: PLATFORMS=travis_el7_puppet5
7470
rvm: 2.5.7
7571
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -81,7 +77,6 @@ jobs:
8177
- "bundle exec rake 'litmus:install_agent[puppet6]'"
8278
- "bundle exec rake litmus:install_module"
8379
bundler_args:
84-
dist: trusty
8580
env: PLATFORMS=travis_deb_puppet6
8681
rvm: 2.5.7
8782
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -93,7 +88,6 @@ jobs:
9388
- "bundle exec rake 'litmus:install_agent[puppet6]'"
9489
- "bundle exec rake litmus:install_module"
9590
bundler_args:
96-
dist: trusty
9791
env: PLATFORMS=travis_ub_puppet6
9892
rvm: 2.5.7
9993
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -105,7 +99,6 @@ jobs:
10599
- "bundle exec rake 'litmus:install_agent[puppet6]'"
106100
- "bundle exec rake litmus:install_module"
107101
bundler_args:
108-
dist: trusty
109102
env: PLATFORMS=travis_el6_puppet6
110103
rvm: 2.5.7
111104
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]
@@ -117,7 +110,6 @@ jobs:
117110
- "bundle exec rake 'litmus:install_agent[puppet6]'"
118111
- "bundle exec rake litmus:install_module"
119112
bundler_args:
120-
dist: trusty
121113
env: PLATFORMS=travis_el7_puppet6
122114
rvm: 2.5.7
123115
script: ["travis_wait 45 bundle exec rake litmus:acceptance:parallel"]

.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,5 @@
7070
"description": "Tasks that manipulate a service",
7171
"pdk-version": "1.17.0",
7272
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
73-
"template-ref": "1.17.0-0-gd3a4319"
73+
"template-ref": "heads/master-0-g095317c"
7474
}

spec/spec_helper.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
# set to strictest setting for testing
4343
# by default Puppet runs at warning level
4444
Puppet.settings[:strict] = :warning
45+
Puppet.settings[:strict_variables] = true
4546
end
4647
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
4748
c.after(:suite) do

0 commit comments

Comments
 (0)