From 3d118a66c55b223b7c585bfe7a5d2bf869d8422b Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 7 Apr 2017 10:15:21 -0400 Subject: [PATCH 1/5] Continue supporting old ruby versions --- Gemfile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 57f5d738..65ffa5d1 100644 --- a/Gemfile +++ b/Gemfile @@ -6,9 +6,8 @@ else gem 'puppet', :require => false end -gem 'puppetlabs_spec_helper', '>= 1.2.0' gem 'facter', '>= 1.7.0' -gem 'rspec-puppet' +gem 'rspec-puppet', '~> 2.0' gem 'puppet-lint', '~> 2.0' gem 'puppet-lint-absolute_classname-check' gem 'puppet-lint-alias-check' @@ -22,9 +21,13 @@ gem 'puppet-lint-undef_in_function-check' gem 'puppet-lint-unquoted_string-check' gem 'puppet-lint-variable_contains_upcase' -gem 'rspec', '~> 2.0' if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9' -gem 'rake', '~> 10.0' if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9' -gem 'json', '<= 1.8' if RUBY_VERSION < '2.0.0' -gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0' +gem 'rspec', '~> 2.0' if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' +gem 'rake', '~> 10.0' if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9' +gem 'json', '<= 1.8' if RUBY_VERSION < '2.0.0' +gem 'json_pure', '<= 2.0.1' if RUBY_VERSION < '2.0.0' gem 'metadata-json-lint', '0.0.11' if RUBY_VERSION < '1.9' gem 'metadata-json-lint' if RUBY_VERSION >= '1.9' + +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' From 3c34be9dc970f5437c377bbf076e3624791204a9 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 7 Apr 2017 10:20:56 -0400 Subject: [PATCH 2/5] Bump license for 2017 --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index bb5ebbd7..d1211db8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2010-2016 Garrett Honeycutt +Copyright (C) 2010-2017 Garrett Honeycutt Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. From 0f4aeb6becaa21d29fbc93727deebe0f870fecb5 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 7 Apr 2017 10:21:05 -0400 Subject: [PATCH 3/5] Support Puppet v4.10 and use ruby 2.1.9 instead of 2.1.0 Ruby 2.1.9 is the actual ruby version being shipped with puppet-agent, so we test against that. --- .travis.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 53546cdf..d7b3f573 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ rvm: - 1.8.7 - 1.9.3 - 2.0.0 - - 2.1.0 + - 2.1.9 - 2.3.1 env: @@ -29,6 +29,7 @@ env: - PUPPET_GEM_VERSION="~> 4.7.0" - PUPPET_GEM_VERSION="~> 4.8.0" - PUPPET_GEM_VERSION="~> 4.9.0" + - PUPPET_GEM_VERSION="~> 4.10.0" - PUPPET_GEM_VERSION="~> 4" sudo: false @@ -40,13 +41,13 @@ matrix: exclude: - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.1.0" - - rvm: 2.1.0 + - rvm: 2.1.9 env: PUPPET_GEM_VERSION="~> 3.1.0" - - rvm: 2.1.0 + - rvm: 2.1.9 env: PUPPET_GEM_VERSION="~> 3.2.0" - - rvm: 2.1.0 + - rvm: 2.1.9 env: PUPPET_GEM_VERSION="~> 3.3.0" - - rvm: 2.1.0 + - rvm: 2.1.9 env: PUPPET_GEM_VERSION="~> 3.4.0" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 4.0.0" @@ -68,10 +69,16 @@ matrix: env: PUPPET_GEM_VERSION="~> 4.8.0" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 4.9.0" + - rvm: 1.8.7 + env: PUPPET_GEM_VERSION="~> 4.10.0" - rvm: 1.9.3 env: PUPPET_GEM_VERSION="~> 4.9.0" + - rvm: 1.9.3 + env: PUPPET_GEM_VERSION="~> 4.10.0" - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 4.9.0" + - rvm: 2.0.0 + env: PUPPET_GEM_VERSION="~> 4.10.0" - rvm: 1.8.7 env: PUPPET_GEM_VERSION="~> 4" - rvm: 1.9.3 From 2a627e798006132eb8fa87b27e1416ec6ad36fe6 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 7 Apr 2017 10:21:57 -0400 Subject: [PATCH 4/5] Allow failures with ruby 2.3.1 since it is not yet supported --- .travis.yml | 2 ++ README.md | 7 ++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d7b3f573..4e6eef15 100644 --- a/.travis.yml +++ b/.travis.yml @@ -103,6 +103,8 @@ matrix: env: PUPPET_GEM_VERSION="~> 3.8.0" - rvm: 2.3.1 env: PUPPET_GEM_VERSION="~> 3" FUTURE_PARSER="yes" + allow_failures: + - rvm: 2.3.1 notifications: email: false diff --git a/README.md b/README.md index 441f01fc..5fb87631 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,10 @@ This module manages PAM including accesslogin and limits.conf with functionality # Compatibility -This module has been tested to work on the following systems with Puppet v3 -(with and without the future parser) and v4 with Ruby versions 1.8.7 (Puppet v3 -only), 1.9.3, 2.0.0, 2.1.0 and 2.3.1 (Puppet v4 only). +This module has been tested to work on the following systems with Puppet +v3 (with and without the future parser) and v4 with Ruby versions 1.8.7, +1.9.3, 2.0.0 and 2.1.9. Please see .travis.yml for a full matrix of +versions. * EL 5 * EL 6 From 2c35561fd757b2a3fe304a557366ee4e58d57f05 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 7 Apr 2017 10:23:15 -0400 Subject: [PATCH 5/5] Remove unused field from metadata --- metadata.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/metadata.json b/metadata.json index 400b514a..e5c89df8 100644 --- a/metadata.json +++ b/metadata.json @@ -9,10 +9,6 @@ "project_page": "https://github.com/ghoneycutt/puppet-module-pam", "issues_url": "https://github.com/ghoneycutt/puppet-module-pam/issues", "requirements": [ - { - "name": "pe", - "version_requirement": ">= 3.2.0 < 5.0.0" - }, { "name": "puppet", "version_requirement": ">= 3.0.0 < 5.0.0"