From b406ffcdd617491dd3f37a4c6793230b22b09fa0 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Wed, 8 Jul 2015 16:15:28 -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 fixes lint errors caught by the
puppet-lint-absolute_classname-check gem.

Change-Id: Ia6fdc921b4c4a8ec2d5f6a6dfe9669704eafc67b
---
 .gitignore        |  2 ++
 Gemfile           | 31 +++++++++++++++++++++++++++++++
 manifests/init.pp |  4 ++--
 3 files changed, 35 insertions(+), 2 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/init.pp b/manifests/init.pp
index 89223d1..3be94b6 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -24,9 +24,9 @@ class apps_site (
     ]
   }
 
-  include apache
+  include ::apache
 
-  apache::vhost { $vhost_name:
+  ::apache::vhost { $vhost_name:
     port       => 80,
     docroot    => "${root_dir}/openstack_catalog/web",
     priority   => '50',