Skip to content

Commit 2de508a

Browse files
committed
pdksync_heads/master-0-gbf720df
1 parent 44f58f1 commit 2de508a

8 files changed

+23
-11
lines changed

.gitattributes

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#This file is generated by ModuleSync, do not edit.
21
*.rb eol=lf
32
*.erb eol=lf
43
*.pp eol=lf
54
*.sh eol=lf
5+
*.epp eol=lf

.pdkignore

+13
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,16 @@
2222
/convert_report.txt
2323
/update_report.txt
2424
.DS_Store
25+
/appveyor.yml
26+
/.fixtures.yml
27+
/Gemfile
28+
/.gitattributes
29+
/.gitignore
30+
/.gitlab-ci.yml
31+
/.pdkignore
32+
/Rakefile
33+
/.rspec
34+
/.rubocop.yml
35+
/.travis.yml
36+
/.yardopts
37+
/spec/

.puppet-lint.rc

Whitespace-only changes.

.travis.yml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
sudo: false
32
dist: trusty
43
language: ruby
54
cache: bundler
@@ -13,7 +12,7 @@ script:
1312
- 'bundle exec rake $CHECK'
1413
bundler_args: --without system_tests
1514
rvm:
16-
- 2.5.0
15+
- 2.5.1
1716
env:
1817
global:
1918
- BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
@@ -25,15 +24,15 @@ matrix:
2524
bundler_args:
2625
dist: trusty
2726
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/centos-7 BEAKER_TESTMODE=apply
28-
rvm: 2.5.0
27+
rvm: 2.5.1
2928
script: bundle exec rake beaker
3029
services: docker
3130
sudo: required
3231
-
3332
bundler_args:
3433
dist: trusty
3534
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
36-
rvm: 2.5.0
35+
rvm: 2.5.1
3736
script: bundle exec rake beaker
3837
services: docker
3938
sudo: required

Rakefile

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ require 'puppetlabs_spec_helper/rake_tasks'
22
require 'puppet-syntax/tasks/puppet-syntax'
33
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
44
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
5+
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
56
require 'puppet-lint/tasks/puppet-lint'
67

78
def changelog_user

metadata.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
}
7979
],
8080
"description": "Module for Apache configuration",
81-
"pdk-version": "1.7.0",
81+
"pdk-version": "1.8.0",
8282
"template-url": "https://github.com/puppetlabs/pdk-templates",
83-
"template-ref": "heads/master-0-gabccfb1"
84-
}
83+
"template-ref": "heads/master-0-gbf720df"
84+
}

spec/default_facts.yml

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
#
33
# Facts specified here will override the values provided by rspec-puppet-facts.
44
---
5-
concat_basedir: ""
65
ipaddress: "172.16.254.254"
76
is_pe: false
87
macaddress: "AA:AA:AA:AA:AA:AA"

spec/spec_helper.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636

3737
def ensure_module_defined(module_name)
3838
module_name.split('::').reduce(Object) do |last_module, next_module|
39-
last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module)
40-
last_module.const_get(next_module)
39+
last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)
40+
last_module.const_get(next_module, false)
4141
end
4242
end
4343

0 commit comments

Comments
 (0)