Support Puppet v4 AIO

This adds support for running under Puppet v4 with Ruby v2.3.1 and
explicitly tests supported versions.

Author: ghoneycutt

.fixtures.yml

@@ -1,5 +1,7 @@
 fixtures:
   repositories:
-    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
+    stdlib:
+      repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+      ref: '4.6.0'
   symlinks:
-    "ruby": "#{source_dir}"
+    ruby: "#{source_dir}"

.gitignore

@@ -1,5 +1,3 @@
-*.sw*
-
 # Default .gitignore for Ruby
 *.gem
 *.rbc
@@ -23,6 +21,9 @@ doc/
 # Vim
 *.swp
 
+# Eclipse
+.project
+
 # OS X
 .DS_Store
 

.travis.yml

@@ -1,14 +1,75 @@
 ---
-sudo: true
 language: ruby
-bundler_args: --without development system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.9
+  - 2.3.1
+
+env:
+  matrix:
+    - PUPPET_GEM_VERSION="~> 3.1.0"
+    - PUPPET_GEM_VERSION="~> 3.2.0"
+    - PUPPET_GEM_VERSION="~> 3.3.0"
+    - PUPPET_GEM_VERSION="~> 3.4.0"
+    - PUPPET_GEM_VERSION="~> 3.5.0"
+    - PUPPET_GEM_VERSION="~> 3.6.0"
+    - PUPPET_GEM_VERSION="~> 3.7.0"
+    - PUPPET_GEM_VERSION="~> 3.8.0"
+    - PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
+    - PUPPET_GEM_VERSION="~> 4.0.0"
+    - PUPPET_GEM_VERSION="~> 4.1.0"
+    - PUPPET_GEM_VERSION="~> 4.2.0"
+    - PUPPET_GEM_VERSION="~> 4.3.0"
+    - PUPPET_GEM_VERSION="~> 4.4.0"
+    - PUPPET_GEM_VERSION="~> 4.5.0"
+    - PUPPET_GEM_VERSION="~> 4.6.0"
+    - PUPPET_GEM_VERSION="~> 4.7.0"
+    - PUPPET_GEM_VERSION="~> 4.8.0"
+    - PUPPET_GEM_VERSION="~> 4"
+
+sudo: false
+
+bundler_args: '--without development system_tests'
+
+before_install:
+  - 'gem update --system'
+  - 'gem update bundler'
+
+script: 'SPEC_OPTS="--format documentation" bundle exec rake validate lint spec'
+
 matrix:
   fast_finish: true
-  include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.8
-    env: PUPPET_GEM_VERSION="~> 3.0"
+  exclude:
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.1.9
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.1.9
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+    - rvm: 2.1.9
+      env: PUPPET_GEM_VERSION="~> 3.3.0"
+    - rvm: 2.1.9
+      env: PUPPET_GEM_VERSION="~> 3.4.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.1.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.2.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.3.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.4.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.5.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.6.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.7.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3.8.0"
+    - rvm: 2.3.1
+      env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes"
+
 notifications:
   email: false

Gemfile

@@ -1,47 +1,34 @@
-source ENV['GEM_SOURCE'] || "https://rubygems.org"
-
-def location_for(place, fake_version = nil)
-  if place =~ /^(git:[^#]*)#(.*)/
-    [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
-    ['>= 0', { :path => File.expand_path($1), :require => false }]
-  else
-    [place, { :require => false }]
-  end
-end
-
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
+source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 if puppetversion = ENV['PUPPET_GEM_VERSION']
   gem 'puppet', puppetversion, :require => false
 else
   gem 'puppet', :require => false
 end
 
-gem 'metadata-json-lint'
-gem 'puppetlabs_spec_helper', '>= 1.2.0'
-gem 'simplecov'
-gem 'puppet_facts'
-gem 'rspec-puppet'
-gem 'puppet-lint', '~> 2.0'
-gem 'puppet-lint-alias-check'
-gem 'puppet-lint-empty_string-check'
-gem 'puppet-lint-file_ensure-check'
-gem 'puppet-lint-file_source_rights-check'
-gem 'puppet-lint-leading_zero-check'
-gem 'puppet-lint-spaceship_operator_without_tag-check'
-gem 'puppet-lint-trailing_comma-check'
-gem 'puppet-lint-unquoted_string-check'
-gem 'puppet-lint-variable_contains_upcase'
+gem 'puppetlabs_spec_helper', '>= 1.2.0', :require => false
+gem 'facter', '>= 1.7.0', :require => false
+gem 'rspec-puppet', :require => false
+gem 'puppet-lint', '~> 2.0', :require => false
+gem 'puppet-lint-absolute_classname-check', :require => false
+gem 'puppet-lint-alias-check', :require => false
+gem 'puppet-lint-empty_string-check', :require => false
+gem 'puppet-lint-file_ensure-check', :require => false
+gem 'puppet-lint-file_source_rights-check', :require => false
+gem 'puppet-lint-leading_zero-check', :require => false
+gem 'puppet-lint-spaceship_operator_without_tag-check', :require => false
+gem 'puppet-lint-trailing_comma-check', :require => false
+gem 'puppet-lint-undef_in_function-check', :require => false
+gem 'puppet-lint-unquoted_string-check', :require => false
+gem 'puppet-lint-variable_contains_upcase', :require => false
 
-gem 'rspec',     '~> 2.0'   if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
-gem 'rake',      '~> 10.0'  if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9'
-gem 'json',      '<= 1.8'   if RUBY_VERSION < '2.0.0'
-gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0'
+gem 'rspec','~> 2.0', :require => false               if RUBY_VERSION < '1.9'
+gem 'rake', '~> 10.0', :require => false              if RUBY_VERSION < '1.9'
+gem 'json', '<= 1.8', :require => false               if RUBY_VERSION < '2.0.0'
+gem 'json_pure', '<= 2.0.1', :require => false        if RUBY_VERSION < '2.0.0'
+gem 'json', :require => false                         if RUBY_VERSION >= '2.0.0'
+gem 'metadata-json-lint', '0.0.11', :require => false if RUBY_VERSION < '1.9'
+gem 'metadata-json-lint', :require => false           if RUBY_VERSION >= '1.9'
 
 group :system_tests do
   if beaker_version = ENV['BEAKER_VERSION']
@@ -50,9 +37,9 @@ group :system_tests do
   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
-    gem 'beaker-rspec',  :require => false
+    gem 'beaker-rspec', :require => false
   end
-  gem 'serverspec',    :require => false
+  gem 'serverspec', :require => false
   gem 'beaker-puppet_install_helper', :require => false
 end
 

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2012 Puppet Labs Inc
+Copyright (C) 2012-2016 Puppet Labs Inc
 
 Puppet Labs can be contacted at: [email protected]
 

README.md

@@ -3,7 +3,7 @@
 This module manages Ruby and Rubygems.
 
 # Compatibility
-Puppet v3 with Ruby 1.9.3 and 2.1.8 on the following platforms.
+Puppet v3 with Ruby 1.9.3, 2.0.0, 2.1.9 and 2.3.1 on the following platforms.
 
   * Debian 6
   * Debian 7

Rakefile

@@ -1,11 +1,19 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-
-PuppetLint.configuration.fail_on_warnings = true
-PuppetLint.configuration.send('relative')
 PuppetLint.configuration.send('disable_80chars')
 PuppetLint.configuration.send('disable_140chars')
-PuppetLint.configuration.send('disable_class_inherits_from_params_class')
-PuppetLint.configuration.send('disable_documentation')
-PuppetLint.configuration.send('disable_single_quote_string_with_variables')
+PuppetLint.configuration.relative = true
 PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]
+
+desc 'Validate manifests, templates, and ruby files'
+task :validate do
+  Dir['manifests/**/*.pp'].each do |manifest|
+    sh "puppet parser validate --noop #{manifest}"
+  end
+  Dir['spec/**/*.rb','lib/**/*.rb'].each do |ruby_file|
+    sh "ruby -c #{ruby_file}" unless ruby_file =~ /spec\/fixtures/
+  end
+  Dir['templates/**/*.erb'].each do |template|
+    sh "erb -P -x -T '-' #{template} | ruby -c"
+  end
+end

manifests/bundle.pp

@@ -52,7 +52,7 @@
 (
   $command      = 'install',
   $option       = undef,
-  $rails_env    = $ruby::params::rails_env,
+  $rails_env    = undef,
   $multicore    = undef,
   $creates      = undef,
   $cwd          = undef,
@@ -72,6 +72,12 @@
 
   require ::ruby
 
+  if $rails_env == undef {
+    $rails_env_real = $ruby::params::rails_env
+  } else {
+    $rails_env_real = $rails_env
+  }
+
   # ensure minimum path requirements for bundler
   if $path {
     $real_path = unique(flatten([$path, $ruby::params::minimum_path]))
@@ -81,9 +87,9 @@
 
   # merge the environment and rails_env parameters
   if $environment {
-    $real_environment = unique(flatten([$environment, ["RAILS_ENV=${rails_env}"]]))
+    $real_environment = unique(flatten([$environment, ["RAILS_ENV=${rails_env_real}"]]))
   } else {
-    $real_environment = "RAILS_ENV=${rails_env}"
+    $real_environment = "RAILS_ENV=${rails_env_real}"
   }
 
   if $multicore {
@@ -93,7 +99,7 @@
       $multicore_str = " --jobs ${multicore}"
     }
   } else {
-    $multicore_str = ''
+    $multicore_str = undef
   }
 
   case $command {
@@ -162,5 +168,4 @@
     unless      => $real_unless,
     require     => Package['bundler'],
   }
-
 }

manifests/rake.pp

@@ -63,7 +63,7 @@
 define ruby::rake
 (
   $task,
-  $rails_env    = $ruby::params::rails_env,
+  $rails_env    = undef,
   $bundle       = false,
   $creates      = undef,
   $cwd          = undef,
@@ -83,6 +83,12 @@
 
   require ::ruby
 
+  if $rails_env == undef {
+    $rails_env_real = $ruby::params::rails_env
+  } else {
+    $rails_env_real = $rails_env
+  }
+
   # Hmm this works on http://rubular.com/
   # validate_re($task, '^[a-z][a-z0-9]*((:[a-z][a-z0-9]*)?)*$', "The rake task '${task}' does not conform to an expected format.")
 
@@ -95,9 +101,9 @@
 
   # merge the environment and rails_env parameters
   if $environment {
-    $real_environment = unique(flatten([$environment, ["RAILS_ENV=${rails_env}"]]))
+    $real_environment = unique(flatten([$environment, ["RAILS_ENV=${rails_env_real}"]]))
   } else {
-    $real_environment = "RAILS_ENV=${rails_env}"
+    $real_environment = "RAILS_ENV=${rails_env_real}"
   }
 
   $real_command = join(['rake', $task],' ')
@@ -108,7 +114,7 @@
     ruby::bundle{"ruby_rake_${name}":
       command     => 'exec',
       option      => $real_command,
-      rails_env   => $rails_env,
+      rails_env   => $rails_env_real,
       creates     => $creates,
       cwd         => $cwd,
       environment => $environment,
@@ -145,5 +151,4 @@
       require     => Package['rake'],
     }
   }
-
 }

metadata.json

@@ -69,12 +69,16 @@
     }
   ],
   "requirements": [
+    {
+      "name": "pe",
+      "version_requirement": ">= 3.2.0 < 5.0.0"
+    },
     {
       "name": "puppet",
-      "version_requirement": "3.x"
+      "version_requirement": ">= 3.0.0 < 5.0.0"
     }
   ],
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">=3.2.0 <5.0.0"}
+    {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"}
   ]
 }