Added support for Puppet 5 and OEL (#26)

* Added support for Puppet 5 and OEL
* Exclude ruby 2.1.9 with Puppet 5.5 from travis matrix
* Fixed spelling error

Author: nick-markowski

.travis.yml

@@ -3,18 +3,24 @@ sudo: required
 rvm:
   - 2.1.9
   - 2.3.1
+  - 2.4.4
 
 notifications:
   email:
    - raphael.pinson@camptocamp.com
 env:
   # Most common LTS Puppet Version
   - PUPPET=4.7 RUBY_AUGEAS=0.5 FORGE_PUBLISH=true
-  # Current LTS Puppet Version
+  # Current Puppet 4 LTS Puppet Version
   - PUPPET=4.10 RUBY_AUGEAS=0.5
+  # Current Puppet 5 LTS Puppet Version
+  - PUPPET=5.5 RUBY_AUGEAS=0.5
 
 matrix:
   fast_finish: true
+  exclude:
+    - rvm: 2.1.9
+      env: PUPPET=5.5 RUBY_AUGEAS=0.5
 
 install:
   - "travis_retry ./.travis.sh"

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.2.1
+- Added support for Puppet 5 and OEL
+
 ## 2.2.0
 - Removed Travis tests for Puppet < 4.7 since that is the most common LTS
   release and Puppet 3 is well out of support

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "herculesteam-augeasproviders_sysctl",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "Dominic Cleal, Raphael Pinson, Trevor Vaughan",
   "summary": "Augeas-based sysctl type and provider for Puppet",
   "license": "Apache-2.0",
@@ -64,9 +64,16 @@
       "operatingsystemrelease": [
         "42.2"
       ]
+    },
+    {
+      "operatingsystem": "OracleLinux",
+      "operatingsystemrelease": [
+        "6",
+        "7"
+      ]
     }
   ],
   "requirements": [
-    { "name": "puppet", "version_requirement": ">= 2.7.0 < 5.0.0" }
+    { "name": "puppet", "version_requirement": ">= 2.7.0 < 6.0.0" }
   ]
 }

spec/acceptance/nodesets/default.yml

@@ -25,9 +25,24 @@ HOSTS:
     roles:
       - agent
       - client
-    platform: sles-12-x86_64
-    box: opensuse/openSUSE-42.2-x86_64
+    platform:   sles-12-x86_64
+    box:        opensuse/openSUSE-42.2-x86_64
     hypervisor: vagrant
+  oel7:
+    roles:
+      - agent
+      - client
+    platform:   el-7-x86_64
+    box:        elastic/oel-7-x86_64
+    hypervisor: vagrant
+  oel6:
+    roles:
+      - agent
+      - client
+    platform:   el-6-x86_64
+    box:        elastic/oel-6-x86_64
+    hypervisor: vagrant
+
 CONFIG:
   log_level: verbose
   type:      aio

spec/spec_helper.rb

@@ -34,7 +34,7 @@
 # ticket https://tickets.puppetlabs.com/browse/MODULES-823
 #
 ver = Gem::Version.new(Puppet.version.split('-').first)
-if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver || Gem::Requirement.new("~> 4.0") =~ ver
+if Gem::Requirement.new("~> 2.7.20") =~ ver || Gem::Requirement.new("~> 3.0.0") =~ ver || Gem::Requirement.new("~> 3.5") =~ ver || Gem::Requirement.new("~> 4.0") || Gem::Requirement.new("~> 5.0") =~ ver
   puts "augeasproviders: setting Puppet[:libdir] to work around broken type autoloading"
   # libdir is only a single dir, so it can only workaround loading of one external module
   Puppet[:libdir] = "#{Puppet[:modulepath]}/augeasproviders_core/lib"