Skip to content

Commit c7da1c8

Browse files
committed
Merge pull request #49 from anodelman/master
(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
2 parents 8b69a66 + 4505054 commit c7da1c8

File tree

1 file changed

+9
-1
lines changed

1 file changed

+9
-1
lines changed

Gemfile

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ gem "puppet", *location_for(ENV['PUPPET_LOCATION'] || '~> 3.4.0')
1414
gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6')
1515
gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0')
1616

17+
beaker_version = ENV['BEAKER_VERSION']
1718
beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'] || '~> 4.0'
1819
group :development, :test do
1920
gem 'rspec'
@@ -23,7 +24,14 @@ group :development, :test do
2324
gem 'puppetlabs_spec_helper', :require => false
2425
gem 'puppet-lint', :require => false
2526
gem 'simplecov', :require => false
26-
gem 'beaker-rspec', *location_for(beaker_rspec_version)
27+
if beaker_version
28+
gem 'beaker', *location_for(beaker_version)
29+
end
30+
if beaker_rspec_version
31+
gem 'beaker-rspec', *location_for(beaker_rspec_version)
32+
else
33+
gem 'beaker-rspec', :require => false
34+
end
2735
end
2836

2937
# see http://projects.puppetlabs.com/issues/21698

0 commit comments

Comments
 (0)