Merge branch '3.x' into 4.x

* 3.x:
  (maint) Add Ruby 2.0.0 to Travis build matrix

4 files changed, 29 insertions, 12 deletions

diff --git a/.gemfile b/.gemfile
deleted file mode 100644
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 481fc81..416889c 100644
--- 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 0ec5a08..7e40b3f 100644
--- 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
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'