Update travis and gemfile to be like stdlib travis files

diff --git a/.travis.yml b/.travis.yml
index 49d71fa12c95609188a74a771f72ac672ba06317..dd3394d8d2a1d1066d394fcf1841a24249bbddf2 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,25 @@
----
 language: ruby
-script: rake spec
-notifications:
-  email: false
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 rvm:
   - 1.8.7
   - 1.9.3
+  - ruby-head
 env:
-  # Latest 3.0.x & Facter 1.6.x
-  - BUILD_PUPPET_VER=3.0.2 BUILD_FACTER_VER=1.6.17
-  # Latest 2.7.x & Facter 1.6.x
-  - BUILD_PUPPET_VER=2.7.20 BUILD_FACTER_VER=1.6.17
-  # Latest 2.6.x & Facter 1.6.x
-  - BUILD_PUPPET_VER=2.6.17 BUILD_FACTER_VER=1.6.17
-
-  # Ubuntu 12.04
-  - BUILD_PUPPET_VER=2.7.11 BUILD_FACTER_VER=1.6.5
-  # Ubuntu 11.10
-  - BUILD_PUPPET_VER=2.7.1 BUILD_FACTER_VER=1.5.9
-
-  # RHEL 5/6 EPEL
-  - BUILD_PUPPET_VER=2.6.16 BUILD_FACTER_VER=1.6.6
-  # Ubuntu 11.04
-  - BUILD_PUPPET_VER=2.6.4 BUILD_FACTER_VER=1.5.8
-  # Debian 6 Main
-  - BUILD_PUPPET_VER=2.6.2 BUILD_FACTER_VER=1.5.7
+  - PUPPET_GEM_VERSION="~> 2.6"
+  - PUPPET_GEM_VERSION="~> 2.7"
+  - PUPPET_GEM_VERSION="~> 3.0"
 matrix:
+  allow_failures:
+    - rvm: ruby-head
   exclude:
-    # Puppet 2.6.x is not compatible with Ruby 1.9.x
-    - rvm: 1.9.3
-      env: BUILD_PUPPET_VER=2.6.17 BUILD_FACTER_VER=1.6.17
-    - rvm: 1.9.3
-      env: BUILD_PUPPET_VER=2.6.16 BUILD_FACTER_VER=1.6.6
     - rvm: 1.9.3
-      env: BUILD_PUPPET_VER=2.6.8 BUILD_FACTER_VER=1.5.8
+      env: PUPPET_GEM_VERSION="~> 2.7"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 2.7"
     - rvm: 1.9.3
-      env: BUILD_PUPPET_VER=2.6.4 BUILD_FACTER_VER=1.5.8
-    - rvm: 1.9.3
-      env: BUILD_PUPPET_VER=2.6.2 BUILD_FACTER_VER=1.5.7
+      env: PUPPET_GEM_VERSION="~> 2.6"
+    - rvm: ruby-head
+      env: PUPPET_GEM_VERSION="~> 2.6"
+notifications:
+  email: false

diff --git a/Gemfile b/Gemfile
index 3b09bd84d03ae9448163d083c550be11c073f047..8e5e04d744ce24eb8f62dc1d1390e62805fe790d 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,22 +1,13 @@
 source :rubygems
 
-gem 'rake', '~> 10.0.3'
-
-group :test do
-  gem 'rspec', '~> 2.12.0'
-  gem 'mocha', '~> 0.13.1', :require => 'mocha/api'
-  gem 'puppetlabs_spec_helper', '~> 0.4.0',
-    :require => 'puppetlabs_spec_helper/module_spec_helper'
-
-  if puppetversion = ENV['BUILD_PUPPET_VER']
-    gem 'puppet', puppetversion
-  else
-    gem 'puppet'
-  end
+group :development, :test do
+  gem 'puppetlabs_spec_helper', :require => false
+end
 
-  if facterversion = ENV['BUILD_FACTER_VER']
-    gem 'facter', facterversion
-  else
-    gem 'facter'
-  end
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
 end
+
+# vim:ft=ruby