From b9da4c4cea9a04b1d97e3a82fc4211b8f8b62260 Mon Sep 17 00:00:00 2001
From: Ashley Penney <ashley.penney@puppetlabs.com>
Date: Tue, 1 Oct 2013 12:51:13 -0400
Subject: Modifications to .travis.yml to test appropriately.

---
 .travis.yml | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

(limited to '.travis.yml')

diff --git a/.travis.yml b/.travis.yml
index 5e3f744..1c5e71b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,20 @@
----
 branches:
   only:
-  - master
-notifications:
-  email: false
+    - master
 language: ruby
-script:
-- 'bundle exec gem list'
-- 'bundle exec rake spec'
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 after_success:
-- git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-releng
-- .forge-releng/publish
+  - git clone -q git://github.com/puppetlabs/ghpublisher.git .forge-release
+  - .forge-release/publish
 rvm:
-- 1.8.7
-- 1.9.3
-- 2.0.0
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
 env:
   matrix:
-  - PUPPET_VERSION=2.6.18
-  - PUPPET_VERSION=2.7.22
-  - PUPPET_VERSION=3.2.1
+    - PUPPET_GEM_VERSION="~> 2.7.0"
+    - PUPPET_GEM_VERSION="~> 3.3.0"
   global:
   - PUBLISHER_LOGIN=puppetlabs
   - secure: |-
@@ -28,7 +23,9 @@ env:
       IJBDl1MADKA4i1+jAZPpz4mTvTtKS4pWKErgCSmhSfsY1hs7n6c=
 matrix:
   exclude:
-  - rvm: 1.9.3
-    env: PUPPET_VERSION=2.6.18
-  - rvm: 2.0.0
-    env: PUPPET_VERSION=2.6.18
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+    - rvm: 2.0.0
+      env: PUPPET_GEM_VERSION="~> 2.7.0"
+notifications:
+  email: false
-- 
cgit v1.2.3