Code Review
/
puppet-modules
/
puppetlabs-apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge pull request #527 from mhaskel/key_compatibility
[puppet-modules/puppetlabs-apt.git]
/
Gemfile
diff --git
a/Gemfile
b/Gemfile
index 0cd807811502edb7d02691905890425e35409707..b3facaaad1d05bec420dc71d4e8e9571c3fb9d52 100644
(file)
--- a/
Gemfile
+++ b/
Gemfile
@@
-11,23
+11,19
@@
def location_for(place, fake_version = nil)
end
group :development, :unit_tests do
end
group :development, :unit_tests do
- gem 'rake', :require => false
- gem 'rspec-core', '3.1.7', :require => false
gem 'rspec-puppet', '~> 2.1', :require => false
gem 'rspec-puppet', '~> 2.1', :require => false
+ gem 'rspec-core', '3.1.7', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'puppetlabs_spec_helper', :require => false
- gem 'puppet-lint', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
end
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
end
-beaker_version = ENV['BEAKER_VERSION']
-beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
group :system_tests do
group :system_tests do
- if beaker_version
+ if beaker_version
= ENV['BEAKER_VERSION']
gem 'beaker', *location_for(beaker_version)
end
gem 'beaker', *location_for(beaker_version)
end
- if beaker_rspec_version
+ if beaker_rspec_version
= ENV['BEAKER_RSPEC_VERSION']
gem 'beaker-rspec', *location_for(beaker_rspec_version)
else
gem 'beaker-rspec', :require => false
gem 'beaker-rspec', *location_for(beaker_rspec_version)
else
gem 'beaker-rspec', :require => false
@@
-35,6
+31,8
@@
group :system_tests do
gem 'serverspec', :require => false
end
gem 'serverspec', :require => false
end
+
+
if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else
if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else