From 45050541d5bebc3ac4e3fe2660d55957c1b050d8 Mon Sep 17 00:00:00 2001 From: Alice Nodelman Date: Tue, 24 Mar 2015 15:00:38 -0700 Subject: [PATCH] (BKR-147) add Gemfile setting for BEAKER_VERSION for puppet... puppetdb, etc - support for BEAKER_VERSION and BEAKER_RSPEC_VERSION in gemfile --- Gemfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 11cb0be0..d128becb 100644 --- a/Gemfile +++ b/Gemfile @@ -14,6 +14,7 @@ gem "puppet", *location_for(ENV['PUPPET_LOCATION'] || '~> 3.4.0') gem "facter", *location_for(ENV['FACTER_LOCATION'] || '~> 1.6') gem "hiera", *location_for(ENV['HIERA_LOCATION'] || '~> 1.0') +beaker_version = ENV['BEAKER_VERSION'] beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION'] || '~> 4.0' group :development, :test do gem 'rspec' @@ -23,7 +24,14 @@ group :development, :test do gem 'puppetlabs_spec_helper', :require => false gem 'puppet-lint', :require => false gem 'simplecov', :require => false - gem 'beaker-rspec', *location_for(beaker_rspec_version) + if beaker_version + gem 'beaker', *location_for(beaker_version) + end + if beaker_rspec_version + gem 'beaker-rspec', *location_for(beaker_rspec_version) + else + gem 'beaker-rspec', :require => false + end end # see http://projects.puppetlabs.com/issues/21698