(maint) Add Travis CI Support

Without this patch stdlib has Travis CI configuration files, but they
don't seem to completely specify the dependency versions and the build
matrix.  This patch addresses the problem by putting the dependency
information in the conventional Gemfile location.

This patch should coincide with enabling Travis CI support for pull
requests.  A build status image is also included in the project README.

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/.travis.yml b/.travis.yml
index 0ec5a08732b5d5d469c0dcd0d194344513f32f81..b6b408a2370bba4892c7b6a31f14b125f7d2f860 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,15 @@
 language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
+notifications:
+  email: false
 rvm:
+  - 1.9.3
   - 1.8.7
-before_script:
-after_script:
-script: "rake spec_full"
-branches:
-  only:
-    - master
 env:
-  - PUPPET_VERSION=2.7.13
-  - PUPPET_VERSION=2.7.6
-  - PUPPET_VERSION=2.6.9
-notifications:
-  email: false
-gemfile: .gemfile
+  - PUPPET_GEM_VERSION="~> 2.7.0"
+  - PUPPET_GEM_VERSION=">= 3.0.0"
+matrix:
+  exclude:
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7.0"

diff --git a/Gemfile b/Gemfile
new file mode 100644 (file)
index 0000000..791e7a5
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,21 @@
+source :rubygems
+
+group :development do
+  gem 'watchr'
+end
+
+group :development, :test do
+  gem 'rake'
+  gem 'rspec', "~> 2.11.0", :require => false
+  gem 'mocha', "~> 0.10.5", :require => false
+  gem 'puppetlabs_spec_helper', :require => false
+  gem 'rspec-puppet', :require => false
+end
+
+if puppetversion = ENV['PUPPET_GEM_VERSION']
+  gem 'puppet', puppetversion, :require => false
+else
+  gem 'puppet', :require => false
+end
+
+# vim:ft=ruby

diff --git a/README.markdown b/README.markdown
index a33add37acdaf616be9144b8eeb59339561b1c54..21f7e7f9a9a75e55798d2ec1abaae25889f69a8e 100644 (file)
--- a/README.markdown
+++ b/README.markdown
@@ -1,5 +1,7 @@
 # Puppet Labs Standard Library #
 
+[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-stdlib.png?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-stdlib)
+
 This module provides a "standard library" of resources for developing Puppet
 Modules.  This modules will include the following additions to Puppet