From eb6f0e587fbb1733b9e164b464b1e2ab46e671c3 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Fri, 7 Aug 2015 10:34:30 -0700
Subject: [PATCH] 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-empty-check gem.

The $vhost_extra default was changed from empty string to undef, which
will be evaluated as nil in the template and will result in the same
behavior (printing nothing) if left unset.

Change-Id: I31588fb2d4c1894ad9785cd001100a83f4736f2f
---
 .gitignore        |  2 ++
 Gemfile           | 31 +++++++++++++++++++++++++++++++
 manifests/site.pp |  2 +-
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 .gitignore
 create mode 100644 Gemfile

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dade81e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Gemfile.lock
+.bundled_gems/
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..31fa1a2
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,31 @@
+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'
+  # Hold off on the empty string check for now
+  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
diff --git a/manifests/site.pp b/manifests/site.pp
index 5fa3f4c..a5541b5 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -6,7 +6,7 @@ define meetbot::site(
   $server,
   $use_ssl,
   $vhost_name = $::fqdn,
-  $vhost_extra = '',
+  $vhost_extra = undef,
   $manage_index = true,
 ) {