From e0cf7c4d0bc4d4dab7eefe4863c410dd3ba5f734 Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Thu, 13 Aug 2015 17:53:57 -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 arrow
alignment errors caught by the bundle-installed puppet-lint.

Change-Id: I060c65c6ca9292216620a851d402359c33ca9927
---
 .gitignore        |  2 ++
 Gemfile           | 30 ++++++++++++++++++++++++++++++
 manifests/site.pp | 10 +++++-----
 3 files changed, 37 insertions(+), 5 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/site.pp b/manifests/site.pp
index 95d3c15..6d9283e 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -90,11 +90,11 @@ define reviewday::site(
   }
 
   file { '/var/lib/reviewday/.ssh/config':
-    ensure   => present,
-    content  => template('reviewday/ssh_config.erb'),
-    owner    => 'reviewday',
-    group    => 'reviewday',
-    mode     => '0644',
+    ensure  => present,
+    content => template('reviewday/ssh_config.erb'),
+    owner   => 'reviewday',
+    group   => 'reviewday',
+    mode    => '0644',
   }
 
   cron { 'update reviewday':