summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrien Thebo <git@somethingsinistral.net>2013-02-25 14:00:20 -0800
committerAdrien Thebo <git@somethingsinistral.net>2013-04-08 10:04:35 -0700
commit6647d1c69d1feb20d0d51a9cbd8734259bac4ef3 (patch)
treedde7c30f17fa9935f74179d3d0b41cd560ab4555
parent755d3d2de505d098faa323fa751497d7f4a3dad1 (diff)
downloadpuppet-stdlib-6647d1c69d1feb20d0d51a9cbd8734259bac4ef3.tar.gz
puppet-stdlib-6647d1c69d1feb20d0d51a9cbd8734259bac4ef3.tar.bz2
(maint) Backport Gemfile and .travis.yml to 2.x
This is a partial backport and update of 03c5c4a434c2290c021034dbfed82cb0f97e0e87 to add travis-ci support and a Gemfile to 2.x. Right now we're not testing 2.x in travis-ci and we're experiencing spec failures because we have to install rspec-puppet from git. The best resolution for this is to consistently use a Gemfile for running tests. This commit also rewrites the .travis.yml for 2.x to only test 2.x versions against ruby 1.8.7 and Puppet < 3.0 Conflicts: .travis.yml
-rw-r--r--.gitignore3
-rw-r--r--.travis.yml18
-rw-r--r--Gemfile8
3 files changed, 29 insertions, 0 deletions
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
new file mode 100644
index 0000000..266e55a
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,18 @@
+language: ruby
+bundler_args: --without development
+script: "bundle exec rake spec SPEC_OPTS='--color --format documentation'"
+rvm:
+ - 1.8.7
+env:
+ - PUPPET_VERSION="~> 2.7.0"
+ - PUPPET_VERSION=2.7.13
+ - PUPPET_VERSION=2.7.6
+ - PUPPET_VERSION=2.6.9
+notifications:
+ email: false
+ 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'