Add Gemfile and puppet 4 checks

In anticipation of puppet 4, start trying to deal with puppet 4 things
that can be helpfully predicted by puppet lint plugins. This patch also
corrects lint errors caught by the puppet-lint-absolute_classname-check
and puppet-lint-empty_string-check gems as well as arrow alignment
which wasn't being caught under the system version of puppet-lint.

Change-Id: I91cb2fdeb458edbd41e777be74d292a564bf2d58
This commit is contained in:
Colleen Murphy 2015-07-20 17:30:31 -07:00
parent 21b54b74b6
commit 16af77007c
3 changed files with 62 additions and 30 deletions

2
.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
Gemfile.lock
.bundled_gems/

30
Gemfile Normal file
View File

@ -0,0 +1,30 @@
source 'https://rubygems.org'
group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'metadata-json-lint'
# This is nice and all, but let's not worry about it until we've actually
# got puppet 4.x sorted
# gem 'puppet-lint-param-docs'
gem 'puppet-lint-absolute_classname-check'
gem 'puppet-lint-absolute_template_path'
gem 'puppet-lint-trailing_newline-check'
# Puppet 4.x related lint checks
gem 'puppet-lint-unquoted_string-check'
gem 'puppet-lint-empty_string-check'
gem 'puppet-lint-leading_zero-check'
gem 'puppet-lint-variable_contains_upcase'
gem 'puppet-lint-spaceship_operator_without_tag-check'
gem 'puppet-lint-undef_in_function-check'
if puppetversion = ENV['PUPPET_GEM_VERSION']
gem 'puppet', puppetversion, :require => false
else
gem 'puppet', '~> 3.0', :require => false
end
end
# vim:ft=ruby

View File

@ -79,9 +79,9 @@ class drupal (
$site_ssl_cert_file_contents = undef, $site_ssl_cert_file_contents = undef,
$site_ssl_key_file_contents = undef, $site_ssl_key_file_contents = undef,
$site_ssl_chain_file_contents = undef, $site_ssl_chain_file_contents = undef,
$site_ssl_cert_file = '', $site_ssl_cert_file = undef,
$site_ssl_key_file = '', $site_ssl_key_file = undef,
$site_ssl_chain_file = '', $site_ssl_chain_file = undef,
$package_repository = undef, $package_repository = undef,
$package_branch = undef, $package_branch = undef,
$conf = undef, $conf = undef,
@ -90,7 +90,7 @@ class drupal (
$conf_openid_provider = undef, $conf_openid_provider = undef,
) { ) {
include ::httpd include ::httpd
include pear include ::pear
# ssl certificates # ssl certificates
if $site_ssl_enabled == true { if $site_ssl_enabled == true {