(maint) Add Ruby 2.0.0 to Travis build matrix

Without this patch we're not testing against Ruby 2.0.0 which has recently been
released.  This is a problem because we'd like a way to be notified if a change
set breaks compatibility with future supported versions of Ruby.

This patch should not be taken as an indication that we fully support Ruby 2.0,
just as an indication that we plan to in the future.

This patch also tightens up the specifications of the build matrix.  In
addition to testing against the specific Puppet dependency versions, we're also
testing against the latest 2.7.x release and the latest release.

diff --git a/.gemfile b/.gemfile
deleted file mode 100644 (file)
index 9aad840..0000000
--- a/.gemfile
+++ /dev/null
@@ -1,5 +0,0 @@
-source :rubygems
-
-puppetversion = ENV.key?('PUPPET_VERSION') ? "= #{ENV['PUPPET_VERSION']}" : ['>= 2.7']
-gem 'puppet', puppetversion
-gem 'puppetlabs_spec_helper', '>= 0.1.0'

diff --git a/.gitignore b/.gitignore
index 481fc81b141baa57c31b104ae057917cf21edd43..416889c8919bf2bd227b4dcc23244ca521233518 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@ pkg/
 .DS_Store
 metadata.json
 coverage/
+Gemfile.lock
+.bundle/
+vendor/bundle/

diff --git a/.travis.yml b/.travis.yml
index 0ec5a08732b5d5d469c0dcd0d194344513f32f81..7e40b3ffe710e700707d08de5c691d81862691ef 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,27 @@
 language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'"
 rvm:
   - 1.8.7
-before_script:
-after_script:
-script: "rake spec_full"
-branches:
-  only:
-    - master
 env:
+  - PUPPET_VERSION=">= 3.0.0"
+  - PUPPET_VERSION="~> 2.7.0"
   - PUPPET_VERSION=2.7.13
   - PUPPET_VERSION=2.7.6
   - PUPPET_VERSION=2.6.9
+matrix:
+  allow_failures:
+    - rvm: 2.0.0
+  include:
+    - rvm: 2.0.0
+      env: PUPPET_VERSION=">= 3.0.0"
+    - rvm: 1.9.3
+      env: PUPPET_VERSION=">= 3.0.0"
 notifications:
   email: false
-gemfile: .gemfile
+  webhooks:
+    urls:
+      - https://puppet-dev-community.herokuapp.com/event/travis-ci/
+    on_success: always
+    on_failure: always
+    on_start: yes

diff --git a/Gemfile b/Gemfile
new file mode 100644 (file)
index 0000000..3ddc07e
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,8 @@
+source "https://rubygems.org"
+
+if puppetversion = ENV['PUPPET_VERSION']
+  gem 'puppet', puppetversion
+else
+  gem 'puppet'
+end
+gem 'puppetlabs_spec_helper', '>= 0.1.0'