pdksync_heads/master-0-gbf720df

diff --git a/.gitattributes b/.gitattributes
index 6a4f81a9de15704a01b313c6af5c0cf9c7756d03..9032a014a054849db4e22f22b6536cf92c7edd27 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,3 @@
-#This file is generated by ModuleSync, do not edit.
 *.rb eol=lf
 *.erb eol=lf
 *.pp eol=lf

diff --git a/.pdkignore b/.pdkignore
index 650022e58e7fcced551fb38f7bfdf73e65cb3e84..b713b3b1f79b287fc7c489e7140f2a55dd89b5ba 100644 (file)
--- a/.pdkignore
+++ b/.pdkignore
@@ -22,3 +22,16 @@
 /convert_report.txt
 /update_report.txt
 .DS_Store
+/appveyor.yml
+/.fixtures.yml
+/Gemfile
+/.gitattributes
+/.gitignore
+/.gitlab-ci.yml
+/.pdkignore
+/Rakefile
+/.rspec
+/.rubocop.yml
+/.travis.yml
+/.yardopts
+/spec/

diff --git a/.puppet-lint.rc b/.puppet-lint.rc
index f4abb47dc59498422d191cbbc692e6c64c7cb437..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/.puppet-lint.rc
+++ b/.puppet-lint.rc
@@ -1 +0,0 @@
---no-single_quote_string_with_variables-check

diff --git a/.travis.yml b/.travis.yml
index f427aa5e5afcaf746a16d0db4dac76a362eb3f56..aed69c2ce09fa8746f3e4dd744c8b42cbea94734 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 ---
-sudo: false
 dist: trusty
 language: ruby
 cache: bundler
@@ -13,7 +12,7 @@ script:
   - 'bundle exec rake $CHECK'
 bundler_args: --without system_tests
 rvm:
-  - 2.5.0
+  - 2.5.1
 env:
   global:
     - BEAKER_PUPPET_COLLECTION=puppet6 PUPPET_GEM_VERSION="~> 6.0"
@@ -24,7 +23,7 @@ matrix:
       bundler_args: 
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/debian-8 BEAKER_TESTMODE=apply
-      rvm: 2.5.0
+      rvm: 2.5.1
       script: bundle exec rake beaker
       services: docker
       sudo: required
@@ -32,7 +31,7 @@ matrix:
       bundler_args: 
       dist: trusty
       env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_PUPPET_COLLECTION=puppet6 BEAKER_set=docker/ubuntu-14.04 BEAKER_TESTMODE=apply
-      rvm: 2.5.0
+      rvm: 2.5.1
       script: bundle exec rake beaker
       services: docker
       sudo: required

diff --git a/Rakefile b/Rakefile
index 112dc4212b029e4b9ccb32b721b70301f92e294c..cf0d5236395776072c01cb3ec8a81529bf21490b 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,7 @@ 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 'puppet_pot_generator/rake_tasks'
 
 def changelog_user

diff --git a/metadata.json b/metadata.json
index 977bb291aa2ec01e158c434c9b6c10c8f29b1f91..dab3e4cda1d591ebdd93ebd6af8f8a9ef41d584c 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -41,6 +41,6 @@
     }
   ],
   "template-url": "https://github.com/puppetlabs/pdk-templates",
-  "template-ref": "heads/master-0-gabccfb1",
-  "pdk-version": "1.7.0"
-}
+  "template-ref": "heads/master-0-gbf720df",
+  "pdk-version": "1.8.0"
+}
\ No newline at end of file

diff --git a/spec/default_facts.yml b/spec/default_facts.yml
index e10d991db2309d55e9b3ff432aeb50399b90fd67..ea1e4808e3a67f50ea6d64d23a0eb8b3fd25437f 100644 (file)
--- a/spec/default_facts.yml
+++ b/spec/default_facts.yml
@@ -2,7 +2,6 @@
 #
 # Facts specified here will override the values provided by rspec-puppet-facts.
 ---
-concat_basedir: ""
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index a7281d530037b7c417fa03ab50dad09176ff2b1d..35654b3d2cab1789591caaaa414631fd7ded9376 100644 (file)
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -36,8 +36,8 @@ end
 
 def ensure_module_defined(module_name)
   module_name.split('::').reduce(Object) do |last_module, next_module|
-    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module)
-    last_module.const_get(next_module)
+    last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)
+    last_module.const_get(next_module, false)
   end
 end