(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

diff --git a/.gitignore b/.gitignore
index 481fc81b141baa57c31b104ae057917cf21edd43..416889c8919bf2bd227b4dcc23244ca521233518 100644 (file)
--- 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 (file)
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 (file)
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'