Merge pull request #192 from voxpupuli/modulesync

modulesync 2.8.0

Author: ekohl

.github/CONTRIBUTING.md

@@ -51,19 +51,34 @@ You can install all needed gems for spec tests into the modules directory by
 running:
 
 ```sh
-bundle install --path .vendor/ --without development system_tests release
+bundle install --path .vendor/ --without development system_tests release --jobs "$(nproc)"
 ```
 
 If you also want to run acceptance tests:
 
 ```sh
-bundle install --path .vendor/ --with system_tests --without development release
+bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"
 ```
 
 Our all in one solution if you don't know if you need to install or update gems:
 
 ```sh
-bundle install --path .vendor/ --with system_tests --without development release; bundle update; bundle clean
+bundle install --path .vendor/ --with system_tests --without development release --jobs "$(nproc)"; bundle update; bundle clean
+```
+
+As an alternative to the `--jobs "$(nproc)` parameter, you can set an
+environment variable:
+
+```sh
+BUNDLE_JOBS="$(nproc)"
+```
+
+### Note for OS X users
+
+`nproc` isn't a valid command unter OS x. As an alternative, you can do:
+
+```sh
+--jobs "$(sysctl -n hw.ncpu)"
 ```
 
 ## Syntax and style
@@ -160,7 +175,7 @@ created virtual machines will be in `.vagrant/beaker_vagrant_files`.
 Beaker also supports docker containers. We also use that in our automated CI
 pipeline at [travis-ci](http://travis-ci.org). To use that instead of Vagrant:
 
-```
+```sh
 PUPPET_INSTALL_TYPE=agent BEAKER_IS_PE=no BEAKER_PUPPET_COLLECTION=puppet5 BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} BEAKER_destroy=yes bundle exec rake beaker
 ```
 

.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '2.7.0'
+modulesync_config_version: '2.8.0'

Gemfile

@@ -21,6 +21,7 @@ group :test do
   gem 'puppet-lint-unquoted_string-check',                          :require => false
   gem 'puppet-lint-variable_contains_upcase',                       :require => false
   gem 'puppet-lint-absolute_classname-check',                       :require => false
+  gem 'puppet-lint-topscope-variable-check',                        :require => false
   gem 'metadata-json-lint',                                         :require => false
   gem 'redcarpet',                                                  :require => false
   gem 'rubocop', '~> 0.49.1',                                       :require => false

spec/classes/letsencrypt_spec.rb

@@ -15,7 +15,7 @@
         describe 'with defaults' do
           it { is_expected.to compile }
 
-          epel = facts[:osfamily] == 'RedHat'
+          epel = facts[:osfamily] == 'RedHat' && facts[:operatingsystem] != 'Fedora'
 
           it 'contains File[/usr/local/sbin/letsencrypt-domain-validation]' do
             is_expected.to contain_file('/usr/local/sbin/letsencrypt-domain-validation').
@@ -46,8 +46,7 @@
                    cron_monthday: ['*'])
             is_expected.to contain_cron('letsencrypt-renew').with_ensure('absent')
 
-            case facts[:operatingsystem]
-            when 'FreeBSD'
+            if facts[:osfamily] == 'FreeBSD'
               is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini email [email protected]')
               is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini server https://acme-v01.api.letsencrypt.org/directory')
               is_expected.to contain_file('letsencrypt-renewal-hooks-puppet').
@@ -64,8 +63,12 @@
               is_expected.to contain_file('letsencrypt-renewal-hooks-puppet').with_path('/etc/letsencrypt/renewal-hooks-puppet')
             end
 
-            if facts[:osfamily] == 'RedHat' && facts[:operatingsystemmajrelease] == '7'
-              is_expected.to contain_class('epel').that_comes_before('Package[letsencrypt]')
+            if facts[:osfamily] == 'RedHat'
+              if facts[:operatingsystem] == 'Fedora'
+                is_expected.not_to contain_class('epel')
+              else
+                is_expected.to contain_class('epel').that_comes_before('Package[letsencrypt]')
+              end
               is_expected.to contain_class('letsencrypt::install').with(install_method: 'package')
               is_expected.to contain_class('letsencrypt').with(package_command: 'certbot')
               is_expected.to contain_package('letsencrypt').with(name: 'certbot')

spec/defines/letsencrypt_certonly_spec.rb

@@ -23,16 +23,15 @@
         it { is_expected.to contain_class('Letsencrypt::Config') }
         it { is_expected.to contain_class('Letsencrypt::Params') }
 
-        case facts[:kernel]
-        when 'Linux'
+        if facts[:osfamily] == 'FreeBSD'
+          it { is_expected.to contain_file('/usr/local/etc/letsencrypt') }
+          it { is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini email [email protected]') }
+          it { is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini server https://acme-v01.api.letsencrypt.org/directory') }
+        else
           it { is_expected.to contain_file('/etc/letsencrypt') }
           it { is_expected.to contain_package('letsencrypt') } unless facts[:os]['release']['full'] == '14.04'
           it { is_expected.to contain_ini_setting('/etc/letsencrypt/cli.ini email [email protected]') }
           it { is_expected.to contain_ini_setting('/etc/letsencrypt/cli.ini server https://acme-v01.api.letsencrypt.org/directory') }
-        else
-          it { is_expected.to contain_file('/usr/local/etc/letsencrypt') }
-          it { is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini email [email protected]') }
-          it { is_expected.to contain_ini_setting('/usr/local/etc/letsencrypt/cli.ini server https://acme-v01.api.letsencrypt.org/directory') }
         end
         it { is_expected.to contain_exec('initialize letsencrypt') }
         it { is_expected.to contain_exec('letsencrypt certonly foo.example.com') }

spec/spec_helper.rb

@@ -7,6 +7,7 @@
 
 require 'puppetlabs_spec_helper/module_spec_helper'
 require 'rspec-puppet-facts'
+require 'bundler'
 include RspecPuppetFacts
 
 if File.exist?(File.join(__dir__, 'default_module_facts.yml'))
@@ -31,6 +32,7 @@
     add_filter '/spec'
     add_filter '/vendor'
     add_filter '/.vendor'
+    add_filter Bundler.configured_bundle_path.path
   end
 end