Merge pull request #201 from voxpupuli/modulesync

modulesync 2.8.0

Author: bastelfreak

.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

manifests/client.pp

@@ -28,9 +28,9 @@
 # Copyright 2014 CoverMyMeds, unless otherwise noted
 #
 class gluster::client (
-  $repo           = $::gluster::params::repo,
-  $client_package = $::gluster::params::client_package,
-  $version        = $::gluster::params::version,
+  $repo           = $gluster::params::repo,
+  $client_package = $gluster::params::client_package,
+  $version        = $gluster::params::version,
 ) inherits ::gluster::params {
 
   class { 'gluster::install':

manifests/init.pp

@@ -42,15 +42,15 @@
 # Copyright 2014 CoverMyMeds, unless otherwise noted
 #
 class gluster  (
-  $client                 = $::gluster::params::install_client,
-  $client_package         = $::gluster::params::client_package,
-  $pool                   = $::gluster::params::pool,
-  $repo                   = $::gluster::params::repo,
-  $release                = $::gluster::params::release,
-  $server                 = $::gluster::params::install_server,
-  $server_package         = $::gluster::params::server_package,
-  $use_exported_resources = $::gluster::params::export_resources,
-  $version                = $::gluster::params::version,
+  $client                 = $gluster::params::install_client,
+  $client_package         = $gluster::params::client_package,
+  $pool                   = $gluster::params::pool,
+  $repo                   = $gluster::params::repo,
+  $release                = $gluster::params::release,
+  $server                 = $gluster::params::install_server,
+  $server_package         = $gluster::params::server_package,
+  $use_exported_resources = $gluster::params::export_resources,
+  $version                = $gluster::params::version,
   Optional[Hash] $volumes = undef,
 ) inherits ::gluster::params {
 
@@ -66,7 +66,7 @@
   if $server {
     # if we installed the server bits, manage the service
     class { 'gluster::service':
-      ensure => $::gluster::params::service_enable,
+      ensure => $gluster::params::service_enable,
     }
 
     if $use_exported_resources {

manifests/repo.pp

@@ -25,8 +25,8 @@
 # Copyright 2014 CoverMyMeds, unless otherwise noted
 #
 class gluster::repo (
-  $release = $::gluster::params::release,
-  $version = $::gluster::params::version,
+  $release = $gluster::params::release,
+  $version = $gluster::params::version,
 ) inherits ::gluster::params {
   case $::osfamily {
     'RedHat': {

manifests/repo/apt.pp

@@ -31,9 +31,9 @@
 # Copyright 2015 RL Solutions, unless otherwise noted
 #
 class gluster::repo::apt (
-  $version  = $::gluster::params::version,
-  $release  = $::gluster::params::release,
-  $priority = $::gluster::params::repo_priority,
+  $version  = $gluster::params::version,
+  $release  = $gluster::params::release,
+  $priority = $gluster::params::repo_priority,
 ) {
   include 'apt'
 

manifests/repo/yum.pp

@@ -23,9 +23,9 @@
 # Copyright 2014 CoverMyMeds, unless otherwise noted
 #
 class gluster::repo::yum (
-  $release         = $::gluster::params::release,
-  $repo_key_source = $::gluster::params::repo_gpg_key_source,
-  $priority        = $::gluster::params::repo_priority,
+  $release         = $gluster::params::release,
+  $repo_key_source = $gluster::params::repo_gpg_key_source,
+  $priority        = $gluster::params::repo_priority,
 ) inherits ::gluster::params {
 
   # CentOS Gluster repo only supports x86_64

manifests/service.pp

@@ -22,9 +22,9 @@
 # Copyright 2014 CoverMyMeds, unless otherwise noted
 #
 class gluster::service (
-  $ensure       = $::gluster::params::service_ensure,
-  $enable       = $::gluster::params::service_enable,
-  $service_name = $::gluster::params::service_name,
+  $ensure       = $gluster::params::service_ensure,
+  $enable       = $gluster::params::service_enable,
+  $service_name = $gluster::params::service_name,
 ) inherits ::gluster::params {
 
   service { $service_name :

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