.msync.yml

@@ -1 +1 @@
-modulesync_config_version: '1.5.0'
+modulesync_config_version: '1.6.0'

.rubocop.yml

@@ -46,7 +46,7 @@ Style/HashSyntax:
 Style/RedundantReturn:
   Enabled: True
 
-Style/EndOfLine:
+Layout/EndOfLine:
   Enabled: False
 
 Lint/AmbiguousOperator:

.travis.yml

@@ -4,12 +4,7 @@ dist: trusty
 language: ruby
 cache: bundler
 before_install:
-  - bundle -v
-  - rm Gemfile.lock || true
-  - gem update --system
-  - gem update bundler
-  - gem --version
-  - bundle -v
+  - rm -f Gemfile.lock
 script:
   - 'bundle exec rake $CHECK'
 matrix:

CHANGELOG.md

@@ -4,6 +4,19 @@ 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.3.2](https://github.com/voxpupuli/puppet-r10k/tree/v6.3.2) (2018-01-08)
+
+[Full Changelog](https://github.com/voxpupuli/puppet-r10k/compare/v6.3.1...v6.3.2)
+
+**Closed issues:**
+
+- Request: Move webhook into a gem [\#399](https://github.com/voxpupuli/puppet-r10k/issues/399)
+
+**Merged pull requests:**
+
+- Bump upper limit of the make dependency [\#403](https://github.com/voxpupuli/puppet-r10k/pull/403) ([toepi](https://github.com/toepi))
+- Pin webrick gem [\#401](https://github.com/voxpupuli/puppet-r10k/pull/401) ([D4rkSh1t](https://github.com/D4rkSh1t))
+
 ## [v6.3.1](https://github.com/voxpupuli/puppet-r10k/tree/v6.3.1) (2017-12-07)
 
 [Full Changelog](https://github.com/voxpupuli/puppet-r10k/compare/v6.3.0...v6.3.1)
@@ -370,7 +383,7 @@ These should not affect the functionality of the module.
 - Actually run as non-root, --user is for matching not chuid. [\#173](https://github.com/voxpupuli/puppet-r10k/pull/173) ([robbat2](https://github.com/robbat2))
 - Gentoo & Pidfile/Init fixes [\#172](https://github.com/voxpupuli/puppet-r10k/pull/172) ([robbat2](https://github.com/robbat2))
 - Fix non-ssl, abilliy to customize templates, and run with less privileges \(but call r10k/mco via sudo\) [\#170](https://github.com/voxpupuli/puppet-r10k/pull/170) ([robbat2](https://github.com/robbat2))
-- Update stash\_mco.rb [\#169](https://github.com/voxpupuli/puppet-r10k/pull/169) ([brdude](https://github.com/brdude))
+- Update stash\_mco.rb [\#169](https://github.com/voxpupuli/puppet-r10k/pull/169) ([rdrgmnzs](https://github.com/rdrgmnzs))
 - Fix a few typos. [\#167](https://github.com/voxpupuli/puppet-r10k/pull/167) ([gabe-sky](https://github.com/gabe-sky))
 - Add support for OpenBSD, some noteworthy points to mention: [\#163](https://github.com/voxpupuli/puppet-r10k/pull/163) ([buzzdeee](https://github.com/buzzdeee))
 - add logic to prevent issue with pe\_version on foss puppet with strict\_variables enabled [\#161](https://github.com/voxpupuli/puppet-r10k/pull/161) ([smithtrevor](https://github.com/smithtrevor))
@@ -888,4 +901,4 @@ These should not affect the functionality of the module.
 
 
 
-\* *This Change Log 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

@@ -57,7 +57,7 @@ group :system_tests do
 end
 
 group :release do
-  gem 'github_changelog_generator',  :require => false if RUBY_VERSION >= '2.2.2'
+  gem 'github_changelog_generator',  :require => false, :git => 'https://github.com/skywinder/github-changelog-generator'
   gem 'puppet-blacksmith',           :require => false
   gem 'voxpupuli-release',           :require => false, :git => 'https://github.com/voxpupuli/voxpupuli-release-gem'
   gem 'puppet-strings', '~> 1.0',    :require => false

README.md

@@ -489,6 +489,12 @@ class { 'r10k::webhook':
 By default, the `r10k::webhook::package` class uses the `puppet_gem` provider to install the latest ruby 2.1 compatible version of sinatra ('~> 1.0').
 If you are overriding `r10k::webhook::package::provider`, you will also need to override `r10k::webhook::package::sinatra_version`.
 
+### Webhook webrick gem installation
+
+By default, the `r10k::webhook::package` class uses the `puppet_gem` provider to install the webrick gem (version 1.3.1)
+This version is compatible with all ruby version (webrick version 1.4.1 require Ruby version >=2.3.0)
+If you are overriding `r10k::webhook::package::provider`, you may also override `r10k::webhook::package::webrick_version`.
+
 ### Webhook Slack notifications
 
 You can enable Slack notifications for the webhook. You will need a

Rakefile

@@ -26,6 +26,12 @@ exclude_paths = %w(
 PuppetLint.configuration.ignore_paths = exclude_paths
 PuppetSyntax.exclude_paths = exclude_paths
 
+desc 'Auto-correct puppet-lint offenses'
+task 'lint:auto_correct' do
+  PuppetLint.configuration.fix = true
+  Rake::Task[:lint].invoke
+end
+
 desc 'Run acceptance tests'
 RSpec::Core::RakeTask.new(:acceptance) do |t|
   t.pattern = 'spec/acceptance'
@@ -48,6 +54,27 @@ task test_with_coveralls: [:test] do
   end
 end
 
+desc "Print supported beaker sets"
+task 'beaker_sets', [:directory] do |t, args|
+  directory = args[:directory]
+
+  metadata = JSON.load(File.read('metadata.json'))
+
+  (metadata['operatingsystem_support'] || []).each do |os|
+    (os['operatingsystemrelease'] || []).each do |release|
+      if directory
+        beaker_set = "#{directory}/#{os['operatingsystem'].downcase}-#{release}"
+      else
+        beaker_set = "#{os['operatingsystem'].downcase}-#{release}-x64"
+      end
+
+      filename = "spec/acceptance/nodesets/#{beaker_set}.yml"
+
+      puts beaker_set if File.exists? filename
+    end
+  end
+end
+
 begin
   require 'github_changelog_generator/task'
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|

manifests/params.pp

@@ -151,6 +151,7 @@
   $webhook_ignore_environments   = []
   $webhook_mco_arguments         = undef
   $webhook_sinatra_version       = '~> 1.0'      # Sinatra 2 requires rack 2 which in turn requires ruby 2.2. Puppet 4 AIO ships with ruby 2.1
+  $webhook_webrick_version       = '1.3.1'       # Webrick 1.4 requires ruby >= 2.3
   $webhook_generate_types        = false
 
   # Service Settings for SystemD in EL7

manifests/webhook/package.pp

@@ -4,6 +4,7 @@
   $is_pe_server    = $r10k::params::is_pe_server,
   $provider        = $r10k::params::provider,
   $sinatra_version = $r10k::params::webhook_sinatra_version,
+  $webrick_version = $r10k::params::webhook_webrick_version,
 ) inherits r10k::params {
   if !defined(Package['sinatra']) {
     package { 'sinatra':
@@ -15,7 +16,7 @@
   if (! $is_pe_server) {
     if !defined(Package['webrick']) {
       package { 'webrick':
-        ensure   => installed,
+        ensure   => $webrick_version,
         provider => $provider,
         before   => Service['webhook'],
       }

metadata.json

@@ -2,7 +2,7 @@
   "author": "Vox Pupuli",
   "license": "Apache-2.0",
   "name": "puppet-r10k",
-  "version": "6.3.1",
+  "version": "6.3.2",
   "operatingsystem_support": [
     {
       "operatingsystem": "RedHat",
@@ -66,7 +66,7 @@
     },
     {
       "name": "puppet/make",
-      "version_requirement": ">= 1.0.0 < 2.0.0"
+      "version_requirement": ">= 1.0.0 < 3.0.0"
     },
     {
       "name": "puppetlabs/inifile",

spec/classes/webhook/package_spec.rb

@@ -41,7 +41,7 @@
         end
 
         it { is_expected.to contain_package('sinatra').with(ensure: '~> 1.0') }
-        it { is_expected.to contain_package('webrick').with(ensure: 'installed') }
+        it { is_expected.to contain_package('webrick').with(ensure: '1.3.1') }
         it { is_expected.to contain_package('json').with(ensure: 'installed') }
       end
     end