From 0404830aca658422b5fa449a9ecdf1df364b5fbb Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Tue, 14 Jul 2015 19:54:16 -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 errors caught by the
puppet-lint-empty_string-check gem. It makes the
$bugdaystats::site::configfile and $bugdaystats::site::httproot
parameters required since the file resources named after them could not
possibly work if they were left undefined or empty string. The
parameter $bugdaystats::site::serveradmin is currently unused in this
module, so we make it optional and default to undef in preparation for
when this functionality is added.

Change-Id: I9eef9a8d49c1ca597783b19fbbbe0129c6157cd5
---
 .gitignore        |  2 ++
 Gemfile           | 31 +++++++++++++++++++++++++++++++
 manifests/site.pp |  6 +++---
 3 files changed, 36 insertions(+), 3 deletions(-)
 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..b572dd5
--- /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'
+  gem 'puppet-lint-empty_string-check'
+  gem 'puppet-lint-leading_zero-check'
+  gem 'puppet-lint-variable_contains_upcase'
+  gem 'puppet-lint-numericvariable'
+  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 0ab5143..39c8bdc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -15,10 +15,10 @@
 # == Define: bugdaystats
 #
 define bugdaystats::site(
+  $configfile,
+  $httproot,
   $git_url = 'https://git.openstack.org/openstack-infra/bugdaystats',
-  $configfile = '',
-  $httproot = '',
-  $serveradmin = ''
+  $serveradmin = undef
 ) {
   file { $configfile:
     mode    => '0444',