Merge remote-tracking branch 'upstream/master'

.msync.yml

-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:

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/pear.pp

@@ -21,18 +21,19 @@ class php::pear (
   if $package {
     $package_name = $package
   } else {
+    if $facts['os']['name'] == 'Amazon' {
+      # On Amazon Linux the package name is also just 'php-pear'.
+      # This would normally not be problematic but if you specify a
+      # package_prefix other than 'php' then it will fail.
+      $package_name = "php-${::php::params::pear_package_suffix}"
+    }
+    else {
       case $facts['os']['family'] {
         'Debian': {
           # Debian is a litte stupid: The pear package is called 'php-pear'
           # even though others are called 'php5-fpm' or 'php5-dev'
           $package_name = "php-${::php::params::pear_package_suffix}"
         }
-      'Amazon': {
-        # On Amazon Linux the package name is also just 'php-pear'.
-        # This would normally not be problematic but if you specify a
-        # package_prefix other than 'php' then it will fail.
-        $package_name = "php-${::php::params::pear_package_suffix}"
-      }
         'FreeBSD': {
           # On FreeBSD the package name is just 'pear'.
           $package_name = $::php::params::pear_package_suffix
@@ -43,6 +44,7 @@ class php::pear (
         }
       }
     }
+  }
 
   # Default PHP come with xml module and no seperate package for it
   if $facts['os']['name'] == 'Ubuntu' and versioncmp($facts['os']['release']['full'], '16.04') >= 0 {