Skip to content

Commit bd6c1b3

Browse files
committed
Merge pull request #116 from anodelman/master
(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
2 parents a4f3677 + 4fe496c commit bd6c1b3

File tree

1 file changed

+20
-1
lines changed

1 file changed

+20
-1
lines changed

Gemfile

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
source ENV['GEM_SOURCE'] || "https://rubygems.org"
22

3+
def location_for(place, fake_version = nil)
4+
if place =~ /^(git:[^#]*)#(.*)/
5+
[fake_version, { :git => $1, :branch => $2, :require => false }].compact
6+
elsif place =~ /^file:\/\/(.*)/
7+
['>= 0', { :path => File.expand_path($1), :require => false }]
8+
else
9+
[place, { :require => false }]
10+
end
11+
end
12+
313
group :development, :unit_tests do
414
gem 'rspec-core', '3.1.7', :require => false
515
gem 'puppetlabs_spec_helper', :require => false
@@ -8,8 +18,17 @@ group :development, :unit_tests do
818
gem 'json', :require => false
919
end
1020

21+
beaker_version = ENV['BEAKER_VERSION']
22+
beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
1123
group :system_tests do
12-
gem 'beaker-rspec', :require => false
24+
if beaker_version
25+
gem 'beaker', *location_for(beaker_version)
26+
end
27+
if beaker_rspec_version
28+
gem 'beaker-rspec', *location_for(beaker_rspec_version)
29+
else
30+
gem 'beaker-rspec', :require => false
31+
end
1332
gem 'serverspec', :require => false
1433
end
1534

0 commit comments

Comments
 (0)