From 142ab38132713fb8af0b188c8d78f9f8040a160c Mon Sep 17 00:00:00 2001
From: nick <nicholas.markowski@onyxpoint.com>
Date: Fri, 14 Sep 2018 11:48:45 -0400
Subject: [PATCH 1/4] Added support for Puppet 5

- Added travis check for ruby 2.4.4 and puppet 5.X
- Removed gem puppet-lint-appends-check and puppet-lint-usascii_format-check
  from the Gemfile, due to their dependency on puppet-lint 1.0.  The latest
  puppetlabs spec helper requires puppet-lint 2.0.
- Added inifile fixture
---
 .fixtures.yml |  1 +
 .travis.yml   |  2 ++
 Gemfile       | 10 ++++------
 metadata.json |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.fixtures.yml b/.fixtures.yml
index d8db45e..82beccd 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,6 +1,7 @@
 fixtures:
   repositories:
     stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
+    inifile: "git://github.com/puppetlabs/puppetlabs-inifile.git"
   symlinks:
     journald: "#{source_dir}"
 
diff --git a/.travis.yml b/.travis.yml
index f566efe..0b82b7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,6 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+  - rvm: 2.4.4
+    env: PUPPET_GEM_VERSION="~> 5.0" STRICT_VARIABLES="yes"
 sudo: false
diff --git a/Gemfile b/Gemfile
index fdacba8..0271768 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,14 +3,13 @@ source 'https://rubygems.org'
 gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 2.7'
 
 gem 'rake'
-gem 'rspec', '~> 3.0'
-gem 'rspec-puppet', '~> 2.3'
-gem 'rspec-puppet-facts', '>= 1.7'
-gem 'puppetlabs_spec_helper', '>= 0.8.0'
+gem 'rspec'
+gem 'rspec-puppet'
+gem 'rspec-puppet-facts'
+gem 'puppetlabs_spec_helper'
 gem 'puppet-lint'
 gem 'puppet-lint-absolute_classname-check'
 gem 'puppet-lint-absolute_template_path'
-gem 'puppet-lint-appends-check'
 gem 'puppet-lint-classes_and_types_beginning_with_digits-check'
 gem 'puppet-lint-empty_string-check'
 gem 'puppet-lint-file_ensure-check'
@@ -23,7 +22,6 @@ gem 'puppet-lint-strict_indent-check'
 gem 'puppet-lint-trailing_comma-check'
 gem 'puppet-lint-undef_in_function-check'
 gem 'puppet-lint-unquoted_string-check'
-gem 'puppet-lint-usascii_format-check'
 gem 'puppet-lint-variable_contains_upcase'
 gem 'puppet-lint-version_comparison-check'
 gem 'simplecov'
diff --git a/metadata.json b/metadata.json
index 35086cc..4258cbf 100644
--- a/metadata.json
+++ b/metadata.json
@@ -1,7 +1,7 @@
 {
 	"name": "cristifalcas-journald",
 	"author": "Cristian Falcas",
-	"version": "0.6.0",
+	"version": "0.6.1",
 	"source": "git@github.com:cristifalcas/puppet-journald.git",
 	"project_page": "https://github.com/cristifalcas/puppet-journald",
 	"issues_url": "https://github.com/cristifalcas/puppet-journald/issues",

From 53ad84d84d1c1ec9a3f92bfb741a6b2ebe9e3e3b Mon Sep 17 00:00:00 2001
From: nick <nicholas.markowski@onyxpoint.com>
Date: Fri, 14 Sep 2018 12:02:03 -0400
Subject: [PATCH 2/4] Linting fix

---
 manifests/init.pp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/manifests/init.pp b/manifests/init.pp
index 47a3e6e..72eb842 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,7 +22,6 @@
   contain ::journald::config
   contain ::journald::service
 
-  Class['journald::config'] ~>
-  Class['journald::service']
+  Class['journald::config'] ~> Class['journald::service']
 
 }

From 1f7a9cbc9e20a54c0330aae084b239d6e4763e21 Mon Sep 17 00:00:00 2001
From: nick <nicholas.markowski@onyxpoint.com>
Date: Fri, 14 Sep 2018 12:07:16 -0400
Subject: [PATCH 3/4] Matched travis.yml vars with Gemfile logic

---
 .travis.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0b82b7d..361fb37 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,11 +6,11 @@ matrix:
   fast_finish: true
   include:
   - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0"
+    env: PUPPET_VERSION="~> 3.0"
   - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
+    env: PUPPET_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.6
-    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    env: PUPPET_VERSION="~> 4.0" STRICT_VARIABLES="yes"
   - rvm: 2.4.4
-    env: PUPPET_GEM_VERSION="~> 5.0" STRICT_VARIABLES="yes"
+    env: PUPPET_VERSION="~> 5.0" STRICT_VARIABLES="yes"
 sudo: false

From 10c4b23b7bf3e12b50d9ed2c1108bce0e87a1841 Mon Sep 17 00:00:00 2001
From: nick <nicholas.markowski@onyxpoint.com>
Date: Fri, 14 Sep 2018 12:16:58 -0400
Subject: [PATCH 4/4] Take 2

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 0271768..cadbc32 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'puppet', ENV.key?('PUPPET_VERSION') ? "~> #{ENV['PUPPET_VERSION']}" : '>= 2.7'
+gem 'puppet', ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : '>= 2.7'
 
 gem 'rake'
 gem 'rspec'