From 9c269790a6c03784177b1c5559fee600580742e4 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Mon, 24 Jul 2017 14:02:14 -0400 Subject: [PATCH] Support Puppet 5 --- .fixtures.yml | 2 +- .travis.yml | 6 ++++-- Gemfile | 4 ++++ README.md | 7 ++++--- metadata.json | 4 ++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index dd0851a..d0ec0d9 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -8,6 +8,6 @@ fixtures: ref: 'v1.4.1' firewall: repo: 'https://github.com/puppetlabs/puppetlabs-firewall.git' - ref: '0.2.1' + ref: '1.9.0' symlinks: ssh: "#{source_dir}" diff --git a/.travis.yml b/.travis.yml index b44dd70..1551752 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,6 @@ --- language: ruby -bundler_args: --without system_tests development - cache: bundler before_install: @@ -48,6 +46,10 @@ matrix: env: PUPPET_GEM_VERSION="~> 4.10.0" - rvm: 2.1.9 env: PUPPET_GEM_VERSION="~> 4" + - rvm: 2.4.1 + env: PUPPET_GEM_VERSION="~> 5.0.0" + - rvm: 2.4.1 + env: PUPPET_GEM_VERSION="~> 5" notifications: email: false diff --git a/Gemfile b/Gemfile index ca6cc29..2ae20fb 100644 --- a/Gemfile +++ b/Gemfile @@ -32,3 +32,7 @@ gem 'metadata-json-lint' if RUBY_VERSION >= '2.0' gem 'puppetlabs_spec_helper', '2.0.2', :require => false if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' gem 'puppetlabs_spec_helper', '>= 2.0.0', :require => false if RUBY_VERSION >= '1.9' gem 'parallel_tests', '<= 2.9.0', :require => false if RUBY_VERSION < '2.0.0' + +if puppetversion < '5.0' + gem 'semantic_puppet', :require => false +end diff --git a/README.md b/README.md index 1acc511..35a7a02 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,10 @@ This module may be used with a simple `include ::ssh` # Compatibility -This module has been tested to work on the following systems with Puppet -versions v3, v3 with future parser, and v4 with Ruby versions 1.8.7 (Puppet v3 -only), 1.9.3, 2.0.0 and 2.1.9. See .travis.yml for the exact matrix. +This module has been tested to work on the following systems with the +latest Puppet v3, v3 with future parser, last few releases of v4 and +Puppet v5. See .travis.yml for the exact matrix of supported Puppet and +ruby versions. * Debian 7 * EL 5 diff --git a/metadata.json b/metadata.json index e1d8adb..d999865 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "requirements": [ { "name": "puppet", - "version_requirement": ">= 3.0.0 < 5.0.0" + "version_requirement": ">= 3.0.0 < 6.0.0" } ], "operatingsystem_support": [ @@ -89,6 +89,6 @@ "dependencies": [ {"name":"puppetlabs/stdlib","version_requirement":">= 4.6.0 < 6.0.0"}, {"name":"ghoneycutt/common","version_requirement":">= 1.4.1 < 2.0.0"}, - {"name":"puppetlabs/firewall","version_requirement":">= 0.2.1 < 2.0.0"} + {"name":"puppetlabs/firewall","version_requirement":">= 1.9.0 < 2.0.0"} ] }