Merge branch '2.x-backport_gemfile' into 2.x

This commit is contained in:
Adrien Thebo 2013-04-08 10:04:43 -07:00
commit af7bed2bc8
3 changed files with 29 additions and 0 deletions

3
.gitignore vendored
View file

@ -2,3 +2,6 @@ pkg/
.DS_Store
metadata.json
coverage/
Gemfile.lock
.bundle/
vendor/bundle/

18
.travis.yml Normal file
View file

@ -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

8
Gemfile Normal file
View file

@ -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'