.github/CONTRIBUTING.md

@@ -2,10 +2,11 @@ This module has grown over time based on a range of contributions from
 people using it. If you follow these contributing guidelines your patch
 will likely make it into a release a little quicker.
 
-
 ## Contributing
 
-Please note that this project is released with a Contributor Code of Conduct. By participating in this project you agree to abide by its terms. [Contributor Code of Conduct](https://voxpupuli.org/coc/).
+Please note that this project is released with a Contributor Code of Conduct.
+By participating in this project you agree to abide by its terms.
+[Contributor Code of Conduct](https://voxpupuli.org/coc/).
 
 1. Fork the repo.
 
@@ -76,7 +77,6 @@ To run the linter, the syntax checker and the unit tests:
 
     bundle exec rake test
 
-
 ## Integration tests
 
 The unit tests just check the code runs, not that it does exactly what

.github/ISSUE_TEMPLATE.md

@@ -1,23 +1,26 @@
 <!--
 Thank you for contributing to this project!
+
 - This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
 - Please check that here is no existing issue or PR that addresses your problem.
 - Please fill the following form to enable us to help you.
+- Our vulnerabilities reporting process is at https://voxpupuli.org/security/
+
 -->
 
-### Affected Puppet, Ruby, OS and module versions/distributions
+## Affected Puppet, Ruby, OS and module versions/distributions
 
 - Puppet:
 - Ruby:
 - Distribution:
 - Module version:
 
-### How to reproduce (e.g Puppet code you use)
+## How to reproduce (e.g Puppet code you use)
 
-### What are you seeing
+## What are you seeing
 
-### What behaviour did you expect instead
+## What behaviour did you expect instead
 
-### Output log
+## Output log
 
-### Any additional information you'd like to impart
+## Any additional information you'd like to impart

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,8 @@
 <!--
 Thank you for contributing to this project!
+
 - This project has a Contributor Code of Conduct: https://voxpupuli.org/coc/
 - Please check that here is no existing issue or PR that addresses your problem.
+- Our vulnerabilities reporting process is at https://voxpupuli.org/security/
+
 -->

.gitignore

@@ -11,5 +11,5 @@ coverage/
 log/
 .idea/
 *.iml
-.*.sw
+.*.sw?
 .yardoc/

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '0.15.0'
+modulesync_config_version: '0.16.7'

.rubocop.yml

@@ -510,3 +510,11 @@ RSpec/ExampleLength:
 
 RSpec/NamedSubject:
   Enabled: False
+
+# disabled for now since they cause a lot of issues
+# these issues aren't easy to fix
+RSpec/RepeatedDescription:
+  Enabled: False
+
+RSpec/NestedGroups:
+  Enabled: False

.travis.yml

@@ -23,24 +23,26 @@ matrix:
     env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test
   - rvm: 2.1.9
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.2.5
+  - rvm: 2.2.6
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.3.1
+  - rvm: 2.3.3
     env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes
-  - rvm: 2.3.1
+  - rvm: 2.3.3
     env: PUPPET_VERSION="~> 4.0" CHECK=rubocop
-  - rvm: 2.3.1
+  - rvm: 2.3.3
     env: PUPPET_VERSION="~> 4.0" CHECK=test
-  - rvm: 2.4.0-preview1
+  - rvm: 2.4.0
     env: PUPPET_VERSION="~> 4.0" CHECK=test
   allow_failures:
-    - rvm: 2.4.0-preview1
+    - rvm: 2.4.0
+branches:
+  only:
+  - master
+  - /^v\d/
 notifications:
   email: false
 deploy:
   provider: puppetforge
-  deploy:
-    branch: ha-bug-puppet-forge
   user: puppet
   password:
     secure: "dfKeMkCSF59QPTPC5FbP4HVQVnEl7ktVoWi3cqz/dDA6EjR/szanjwDgrDIs522NoO/r516NmbT5hvMit1qGPE9kIODlbfopuyTxsS4WGxB5dATL71DRWiemfjWynUS6Xyb4LU7MTWIQNvYsTnrPdC3aSN101IwyzQVMSkWHp24="

CHANGELOG.md

@@ -1,9 +1,18 @@
-# Change log
+# Changelog
 
 All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest Vox Pupuli modulesync defaults.
 These should not impact the functionality of the module.
 
+## 2017-01-13 - Release 2.4.0
+
+This is the last release with Puppet 3 support!
+* Do not make files in the gnupg home executable
+* Support deep_merge_options with 'deeper' merge_behavior 
+* Correct spelling of @merge_behavior in template
+* Bump min version_requirement for Puppet + deps
+* Strict variables fix for `pe_server_version`
+
 ## 2016-11-07 Release 2.3.0
 
 * [GH-128](https://github.com/voxpupuli/puppet-hiera/issues/128)

Gemfile

@@ -25,8 +25,8 @@ group :test do
   gem 'metadata-json-lint',                                         :require => false
   gem 'puppet-blacksmith',                                          :require => false
   gem 'voxpupuli-release',                                          :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem.git'
-  gem 'puppet-strings', '~> 0.99.0',                                :require => false
-  gem 'rubocop-rspec', '~> 1.6',                                    :require => false if RUBY_VERSION >= '2.3.0'
+  gem 'puppet-strings', '~> 1.0.0',                                 :require => false
+  gem 'rubocop-rspec', '~> 1.9.0',                                  :require => false if RUBY_VERSION >= '2.3.0'
   gem 'json_pure', '<= 2.0.1',                                      :require => false if RUBY_VERSION < '2.0.0'
   gem 'mocha', '>= 1.2.1',                                          :require => false
   gem 'coveralls',                                                  :require => false if RUBY_VERSION >= '2.0.0'

manifests/eyaml_gpg.pp

@@ -46,6 +46,6 @@
     ensure  => directory,
     recurse => true,
     purge   => false,
-    mode    => '0700',
+    mode    => '0600',
   }
 }

manifests/params.pp

@@ -36,7 +36,7 @@
   } else {
     if $::puppetversion and versioncmp($::puppetversion, '4.0.0') >= 0 {
       # Configure for AIO packaging.
-      if $::pe_server_version {
+      if getvar('::pe_server_version') {
         $master_service = 'pe-puppetserver'
         $provider       = 'puppetserver_gem'
       } else {
@@ -55,7 +55,7 @@
       $datadir        = "${confdir}/hieradata"
       $manage_package = true
     }
-    if $::pe_server_version {
+    if getvar('::pe_server_version') {
       $owner = 'pe-puppet'
       $group = 'pe-puppet'
     } else {

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "puppet-hiera",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "author": "Vox Pupuli",
   "summary": "Deploy hiera.yaml with hierarchy, and datadir",
   "license": "Apache-2.0",
@@ -10,11 +10,11 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.3.1 < 5.0.0"
+      "version_requirement": ">= 4.6.0 < 5.0.0"
     },
     {
       "name": "puppetlabs/inifile",
-      "version_requirement": ">= 1.0.0 < 2.0.0"
+      "version_requirement": ">= 1.4.1 < 2.0.0"
     }
   ],
   "data_provider": null,
@@ -51,13 +51,9 @@
     }
   ],
   "requirements": [
-    {
-      "name": "pe",
-      "version_requirement": ">= 3.0.0 <= 2016.2.0"
-    },
     {
       "name": "puppet",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
+      "version_requirement": ">= 3.8.7 < 5.0.0"
     }
   ]
 }

spec/acceptance/nodesets/fedora-24-x64.yml

@@ -0,0 +1,15 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+HOSTS:
+  fedora-24-x64:
+    roles:
+      - master
+    platform: fedora-24-x86_64
+    box: fedora/24-cloud-base
+    hypervisor: vagrant
+CONFIG:
+  type: aio
+...
+# vim: syntax=yaml

spec/acceptance/nodesets/fedora-25-x64.yml

@@ -0,0 +1,18 @@
+---
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+#
+# platform is fedora 24 because there is no
+# puppet-agent for fedora 25 by 2016-12-30
+HOSTS:
+  fedora-25-x64:
+    roles:
+      - master
+    platform: fedora-24-x86_64
+    box: fedora/25-cloud-base
+    hypervisor: vagrant
+CONFIG:
+  type: aio
+...
+# vim: syntax=yaml

spec/classes/hiera_spec.rb

@@ -7,8 +7,7 @@
         {
           puppetversion: '3.8.6',
           is_pe: false,
-          pe_version: '0.0.0',
-          pe_server_version: '0.0.0'
+          pe_version: '0.0.0'
         }
       end
       describe 'default params' do
@@ -301,8 +300,7 @@
         {
           puppetversion: Puppet.version,
           is_pe: false,
-          pe_version: '0.0.0',
-          pe_server_version: '0.0.0'
+          pe_version: '0.0.0'
         }
       end
       describe 'default params' do

spec/default_facts.yml

@@ -1,6 +1,14 @@
+# This file is managed via modulesync
+# https://github.com/voxpupuli/modulesync
+# https://github.com/voxpupuli/modulesync_config
+#
+# use default_module_facts.yaml for module specific
+# facts.
+#
+# Hint if using with rspec-puppet-facts ("on_supported_os.each"):
+#   if a same named fact exists in facterdb it will be overridden.
 ---
 concat_basedir: "/tmp"
 ipaddress: "172.16.254.254"
 is_pe: false
 macaddress: "AA:AA:AA:AA:AA:AA"
-selinux_config_mode: "disabled"

spec/spec_helper.rb

@@ -2,7 +2,7 @@
 require 'rspec-puppet-facts'
 include RspecPuppetFacts
 
-unless RUBY_VERSION =~ %r{^1.9}
+if Dir.exist?(File.expand_path('../../lib', __FILE__)) && RUBY_VERSION !~ %r{^1.9}
   require 'coveralls'
   require 'simplecov'
   require 'simplecov-console'
@@ -12,7 +12,10 @@
     Coveralls::SimpleCov::Formatter
   ]
   SimpleCov.start do
+    track_files 'lib/**/*.rb'
     add_filter '/spec'
+    add_filter '/vendor'
+    add_filter '/.vendor'
   end
 end
 

templates/hiera.yaml.erb

@@ -18,7 +18,7 @@
 <% if @merge_behavior -%>
 :merge_behavior: <%= @merge_behavior %>
 <% end -%>
-<% if @merge_behavior == 'deep' && !@deep_merge_options.empty? -%>
+<% if (@merge_behavior == 'deep' || @merge_behavior == 'deeper') && !@deep_merge_options.empty? -%>
 :deep_merge_options:
   <%- @deep_merge_options.each do |option_key, option_value| -%>
   :<%= option_key %>: <%= option_value %>