From c8bf03c398f6d6f7e724137b16e896758e03866a Mon Sep 17 00:00:00 2001
From: Colleen Murphy <colleen@gazlene.net>
Date: Fri, 7 Aug 2015 13:03:53 -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-absolute_classname-check
gem.

Change-Id: Ideaba35b73a03025c3144fceaf5e7836a985ba11
---
 .gitignore                 |  2 ++
 Gemfile                    | 31 +++++++++++++++++++++++++++++++
 manifests/backup.pp        |  2 +-
 manifests/backup_remote.pp |  2 +-
 4 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..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/backup.pp b/manifests/backup.pp
index 585621d..ac63222 100644
--- a/manifests/backup.pp
+++ b/manifests/backup.pp
@@ -41,7 +41,7 @@ define mysql_backup::backup (
     require => File[$dest_dir],
   }
 
-  include logrotate
+  include ::logrotate
   logrotate::file { "${name}-rotate":
     log     => "${dest_dir}/${name}.sql.gz",
     options => [
diff --git a/manifests/backup_remote.pp b/manifests/backup_remote.pp
index 257c363..1098039 100644
--- a/manifests/backup_remote.pp
+++ b/manifests/backup_remote.pp
@@ -54,7 +54,7 @@ define mysql_backup::backup_remote (
     ],
   }
 
-  include logrotate
+  include ::logrotate
   logrotate::file { "${name}-rotate":
     log     => "${dest_dir}/${name}.sql.gz",
     options => [