PDK 1.9.1; drop Puppet older than 4.10.12

.gitlab-ci.yml

@@ -15,28 +15,27 @@ before_script:
   - bundle -v
   - bundle install --without system_tests --path vendor/bundle --jobs $(nproc)
 
-parallel_spec-Ruby 2.1.9-Puppet ~> 4.0:
-  stage: unit
-  image: ruby:2.1.9
+syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.5.1-Puppet ~> 6.0:
+  stage: syntax
+  image: ruby:2.5.1
   script:
-    - bundle exec rake parallel_spec
+    - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
   variables:
-    PUPPET_GEM_VERSION: '~> 4.0'
-    RUBYGEMS_VERSION: '2.7.8'
+    PUPPET_GEM_VERSION: '~> 6.0'
 
-syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop-Ruby 2.4.4-Puppet ~> 5.5:
-  stage: syntax
-  image: ruby:2.4.4
+parallel_spec-Ruby 2.5.1-Puppet ~> 6.0:
+  stage: unit
+  image: ruby:2.5.1
   script:
-    - bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
+    - bundle exec rake parallel_spec
   variables:
-    PUPPET_GEM_VERSION: '~> 5.5'
+    PUPPET_GEM_VERSION: '~> 6.0'
 
-parallel_spec-Ruby 2.4.4-Puppet ~> 5.5:
+parallel_spec-Ruby 2.4.4-Puppet ~> 5.0:
   stage: unit
   image: ruby:2.4.4
   script:
     - bundle exec rake parallel_spec
   variables:
-    PUPPET_GEM_VERSION: '~> 5.5'
+    PUPPET_GEM_VERSION: '~> 5.0'
 

CHANGELOG

@@ -1,3 +1,7 @@
+2019-03-09 Release 1.1.0
+- PDK 1.9.1 compatilibilty
+- Drop Puppet older than 4.10.12
+
 2019-03-03 Release 1.0.2
 - PDK 1.9.0 compatibility
 - Drop testing against Ruby 2.1

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "waveclaw-facter_cacheable",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "author": "JD Powell <[email protected]>",
   "summary": "Provide a Cache for Facter facts",
   "license": "Apache-2.0",
@@ -67,10 +67,10 @@
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 4.7.0 < 7.0.0"
+      "version_requirement": ">= 4.10.12 < 7.0.0"
     }
   ],
-  "pdk-version": "1.9.0",
+  "pdk-version": "1.9.1",
   "template-url": "file:///opt/puppetlabs/pdk/share/cache/pdk-templates.git",
-  "template-ref": "1.9.0-0-g7281db5"
-}
+  "template-ref": "1.9.1-0-g6945d31"
+}

spec/spec_helper.rb

@@ -19,7 +19,7 @@
   next unless File.exist?(f) && File.readable?(f) && File.size?(f)
 
   begin
-    default_facts.merge!(YAML.safe_load(File.read(f)))
+    default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
   rescue => e
     RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
   end