Skip to content

Commit

Permalink
Merge pull request #16 from hunner/fix_specs
Browse files Browse the repository at this point in the history
Update specs for travis
  • Loading branch information
hunner committed Jul 30, 2013
2 parents d26f884 + 9d0dafb commit 71554b8
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 6 deletions.
5 changes: 0 additions & 5 deletions .gemfile

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,3 +2,4 @@ metadata.json
pkg/
.DS_Store
*.swp
Gemfile.lock
28 changes: 28 additions & 0 deletions .travis.yml
@@ -0,0 +1,28 @@
---
language: ruby
bundler_args: --without development
script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
rvm:
- 1.8.7
- 1.9.3
- 2.0.0
env:
matrix:
- PUPPET_GEM_VERSION="~> 2.7.0"
- PUPPET_GEM_VERSION="~> 3.0.0"
- PUPPET_GEM_VERSION="~> 3.1.0"
- PUPPET_GEM_VERSION="~> 3.2.0"
matrix:
exclude:
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 2.7.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.1.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.2.0"
notifications:
email: false
16 changes: 16 additions & 0 deletions Gemfile
@@ -0,0 +1,16 @@
source 'https://rubygems.org'

group :development, :test do
gem 'rake', :require => false
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
end

if puppetversion = ENV['PUPPET_GEM_VERSION']
gem 'puppet', puppetversion, :require => false
else
gem 'puppet', :require => false
end

# vim:ft=ruby
1 change: 0 additions & 1 deletion Rakefile
@@ -1,2 +1 @@
require 'rubygems'
require 'puppetlabs_spec_helper/rake_tasks'
Empty file removed spec/fixtures/manifests/site.pp
Empty file.

0 comments on commit 71554b8

Please sign in to comment.