From df57c6ef74194a5cd3cdca1064a8db3a84c0f922 Mon Sep 17 00:00:00 2001 From: Garrett Honeycutt Date: Fri, 21 Aug 2015 10:06:51 -0400 Subject: [PATCH] Support Ruby versions 1.8.7 and 2.1.0 --- .travis.yml | 10 ++++++++++ Gemfile | 6 +++++- README.md | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f0a50813..517e59ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,8 +4,10 @@ language: ruby bundler_args: --without system_tests rvm: + - 1.8.7 - 1.9.3 - 2.0.0 + - 2.1.0 env: matrix: @@ -27,6 +29,14 @@ matrix: exclude: - rvm: 2.0.0 env: PUPPET_GEM_VERSION="~> 3.1.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.1.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.2.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.3.0" + - rvm: 2.1.0 + env: PUPPET_GEM_VERSION="~> 3.4.0" notifications: email: false diff --git a/Gemfile b/Gemfile index f6ca52f1..ee04692b 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,11 @@ group :development, :test do gem 'puppet-lint', :require => false gem 'pry', :require => false gem 'simplecov', :require => false - gem 'rspec', '~> 2.99' +end + +# rspec must be v2 for ruby 1.8.7 +if RUBY_VERSION >= '1.8.7' and RUBY_VERSION < '1.9' + gem 'rspec', '~> 2.0' end if facterversion = ENV['FACTER_GEM_VERSION'] diff --git a/README.md b/README.md index d42a820f..c4af53e2 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Puppet module for installing and managing python, pip, virtualenvs and Gunicorn # Compatibility # -Puppet v3 with Ruby versions 1.9.3 and 2.0.0. +Puppet v3 with Ruby versions 1.8.7, 1.9.3, 2.0.0 and 2.1.0. ## OS Distributions ##