From 0e00b2e64496a874cf3768b01d22bb69c760f16a Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Tue, 4 Aug 2015 15:49:35 -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. Also fix lint
errors caught by the puppet-lint-absolute_classname-check gem.

Change-Id: I362a59e1bb7fd57baf4714c6155db530eef652ea
---
 .gitignore                |  2 ++
 Gemfile                   | 30 ++++++++++++++++++++++++++++++
 manifests/image_scaler.pp |  2 +-
 manifests/init.pp         | 10 +++++-----
 4 files changed, 38 insertions(+), 6 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..96912da
--- /dev/null
+++ b/Gemfile
@@ -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
diff --git a/manifests/image_scaler.pp b/manifests/image_scaler.pp
index 6b0d18e..5a0c44b 100644
--- a/manifests/image_scaler.pp
+++ b/manifests/image_scaler.pp
@@ -56,5 +56,5 @@ class mediawiki::image_scaler {
     'xfonts-scalable']:
     ensure => present,
   }
-  include tmpreaper
+  include ::tmpreaper
 }
diff --git a/manifests/init.pp b/manifests/init.pp
index 8ed75e7..b1e6259 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -21,8 +21,8 @@ class mediawiki(
     }
 
     include ::httpd
-    include mediawiki::php
-    include mediawiki::app
+    include ::mediawiki::php
+    include ::mediawiki::app
 
     package { ['libapache2-mod-php5',
       'lua5.2']:
@@ -76,9 +76,9 @@ class mediawiki(
     }
   }
   if ($role == 'image-scaler' or $role == 'all') {
-    include mediawiki::image_scaler
-    include mediawiki::php
-    include mediawiki::app
+    include ::mediawiki::image_scaler
+    include ::mediawiki::php
+    include ::mediawiki::app
   }
 }