Skip to content

Commit

Permalink
fix travis ruby 1.8.7 runs
Browse files Browse the repository at this point in the history
By excluding beaker related gems that pull in deps now incompatible with
1.8.7.
  • Loading branch information
Joshua Hoblitt committed Jan 12, 2015
1 parent 6310705 commit 6b8949f
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 14 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: ruby
bundler_args: --without beaker
rvm:
- 1.8.7
- 1.9.3
Expand Down
33 changes: 19 additions & 14 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,22 @@ else
gem 'puppet', :require => false
end

gem 'rake', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'puppet-syntax', :require => false
gem 'rspec-puppet',
:git => 'https://github.com/rodjek/rspec-puppet.git',
:ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
:require => false
# rspec 3 spews warnings with rspec-puppet 1.0.1
# gem 'rspec-core', '~> 2.0', :require => false
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
gem 'pry', :require => false
group :development do
gem 'rake', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', :require => false
gem 'puppet-syntax', :require => false
gem 'rspec-puppet',
:git => 'https://github.com/rodjek/rspec-puppet.git',
:ref => '6ac97993fa972a15851a73d55fe3d1c0a85172b5',
:require => false
# rspec 3 spews warnings with rspec-puppet 1.0.1
# gem 'rspec-core', '~> 2.0', :require => false
gem 'pry', :require => false
end

group :beaker do
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'serverspec', :require => false
end

0 comments on commit 6b8949f

Please sign in to comment.