.fixtures.yml

@@ -1,8 +1,6 @@
 fixtures:
   repositories:
-    stdlib:
-      repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
-      ref:  "4.15.0"
+    stdlib:  "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     ruby:    "https://github.com/puppetlabs/puppetlabs-ruby.git"
     gcc:     "https://github.com/puppetlabs/puppetlabs-gcc.git"
     pe_gem:  "https://github.com/puppetlabs/puppetlabs-pe_gem.git"

.github/CONTRIBUTING.md

@@ -40,9 +40,24 @@ you must set an environment variable such as:
 
     export PUPPET_VERSION="~> 4.2.0"
 
-Install the dependencies like so...
+You can install all needed gems for spec tests into the modules directory by
+running:
 
-    bundle install
+```sh
+bundle install --path .vendor/ --without development --without system_tests --without release
+```
+
+If you also want to run acceptance tests:
+
+```sh
+bundle install --path .vendor/ --without development --with system_tests --without release
+```
+
+Our all in one solution if you don't know if you need to install or update gems:
+
+```sh
+bundle install --path .vendor/ --without development --with system_tests --without release; bundle update; bundle clean
+```
 
 ## Syntax and style
 

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '1.9.0'
+modulesync_config_version: '1.9.2'

.travis.yml

@@ -3,8 +3,11 @@ sudo: false
 dist: trusty
 language: ruby
 cache: bundler
+# related to https://github.com/rubygems/rubygems/issues/2123
 before_install:
-  - rm -f Gemfile.lock
+  - 'rm -f Gemfile.lock'
+  - 'gem update --system'
+  - 'gem install bundler'
 script:
   - 'bundle exec rake $CHECK'
 matrix:
@@ -13,16 +16,16 @@ matrix:
   - rvm: 2.1.9
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=12
-  - rvm: 2.4.3
+  - rvm: 2.4.4
     bundler_args: --without system_tests development release
-    env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
-  - rvm: 2.5.0
+    env: PUPPET_VERSION="~> 5.0" CHECK=test
+  - rvm: 2.5.1
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
-  - rvm: 2.4.3
+  - rvm: 2.4.4
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
-  - rvm: 2.4.3
+  - rvm: 2.5.1
     bundler_args: --without system_tests development release
     env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
 branches:

CHANGELOG.md

@@ -4,6 +4,25 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
+## [v6.6.0](https://github.com/voxpupuli/puppet-r10k/tree/v6.6.0) (2018-07-06)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-r10k/compare/v6.5.1...v6.6.0)
+
+**Implemented enhancements:**
+
+- provide proper default for $r10k\_basedir [\#440](https://github.com/voxpupuli/puppet-r10k/pull/440) ([bastelfreak](https://github.com/bastelfreak))
+- wrap is\_pe fact in fact\(\) method to fail safely if it isn't present [\#438](https://github.com/voxpupuli/puppet-r10k/pull/438) ([bastelfreak](https://github.com/bastelfreak))
+- make cachedir optional [\#437](https://github.com/voxpupuli/puppet-r10k/pull/437) ([Andor](https://github.com/Andor))
+
+**Closed issues:**
+
+- Newest r10k breaks erb parsing [\#420](https://github.com/voxpupuli/puppet-r10k/issues/420)
+
+**Merged pull requests:**
+
+- Remove docker nodesets [\#434](https://github.com/voxpupuli/puppet-r10k/pull/434) ([bastelfreak](https://github.com/bastelfreak))
+- drop EOL OSs; fix puppet version range [\#433](https://github.com/voxpupuli/puppet-r10k/pull/433) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [v6.5.1](https://github.com/voxpupuli/puppet-r10k/tree/v6.5.1) (2018-05-01)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-r10k/compare/v6.5.0...v6.5.1)
@@ -937,4 +956,4 @@ These should not affect the functionality of the module.
 
 
 
-\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -25,7 +25,7 @@ group :test do
   gem 'redcarpet',                                                  :require => false
   gem 'rubocop', '~> 0.49.1',                                       :require => false if RUBY_VERSION >= '2.3.0'
   gem 'rubocop-rspec', '~> 1.15.0',                                 :require => false if RUBY_VERSION >= '2.3.0'
-  gem 'mocha', '>= 1.2.1',                                          :require => false
+  gem 'mocha', '~> 1.4.0',                                          :require => false
   gem 'coveralls',                                                  :require => false
   gem 'simplecov-console',                                          :require => false
   gem 'rack', '~> 1.0',                                             :require => false if RUBY_VERSION < '2.2.2'
@@ -40,7 +40,7 @@ group :development do
 end
 
 group :system_tests do
-  gem 'winrm',                         :require => false
+  gem 'winrm',                              :require => false
   if beaker_version = ENV['BEAKER_VERSION']
     gem 'beaker', *location_for(beaker_version)
   else
@@ -51,9 +51,10 @@ group :system_tests do
   else
     gem 'beaker-rspec',  :require => false
   end
-  gem 'serverspec',                    :require => false
-  gem 'beaker-puppet_install_helper',  :require => false
-  gem 'beaker-module_install_helper',  :require => false
+  gem 'serverspec',                         :require => false
+  gem 'beaker-hostgenerator', '>= 1.1.10',  :require => false
+  gem 'beaker-puppet_install_helper',       :require => false
+  gem 'beaker-module_install_helper',       :require => false
 end
 
 group :release do

manifests/params.pp

@@ -10,7 +10,11 @@
   $sources                = undef
   $puppet_master          = true
 
-  $r10k_basedir              = $facts['puppet_environmentpath']
+  if 'puppet_environment' in $facts {
+    $r10k_basedir            = $facts['puppet_environmentpath']
+  } else {
+    $r10k_basedir            = '/etc/puppetlabs/code/environments'
+  }
   $r10k_cache_dir            = "${facts['puppet_vardir']}/r10k"
   $r10k_config_file          = '/etc/puppetlabs/r10k/r10k.yaml'
   $r10k_binary               = 'r10k'
@@ -44,7 +48,7 @@
   # We check for the function right now instead of $::pe_server_version
   # which does not get populated on agent nodes as some users use r10k
   # with razor see https://github.com/acidprime/r10k/pull/219
-  if $::is_pe == true or $::is_pe == 'true' {
+  if fact('is_pe') == true or fact('is_pe') == 'true' {
     # < PE 4
     $is_pe_server      = true
   }elsif is_function_available('pe_compiling_server_version') {

metadata.json

@@ -2,7 +2,7 @@
   "author": "Vox Pupuli",
   "license": "Apache-2.0",
   "name": "puppet-r10k",
-  "version": "6.5.1",
+  "version": "6.6.0",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -28,7 +28,6 @@
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7"
       ]
@@ -54,7 +53,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.15.0 < 5.0.0"
+      "version_requirement": ">= 4.19.0 < 5.0.0"
     },
     {
       "name": "puppetlabs/ruby",

spec/classes/config_spec.rb

@@ -98,6 +98,16 @@
 
         it { is_expected.to contain_file('r10k.yaml').with_content(%r{^.*:postrun: \[\"/usr/bin/curl\", \"-F\", \"deploy=done\", \"http://my-app\.site/endpoint\"\]\n.*$}) }
       end
+
+      context 'with empty cachedir' do
+        let :params do
+          {
+            cachedir: ''
+          }
+        end
+
+        it { is_expected.to contain_file('r10k.yaml').without_content(%r{^:cachedir: .*$}) }
+      end
     end
   end
 end