projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try if downgrading to 1.2.2 solves my problem
[mirror/dsa-puppet.git]
/
3rdparty
/
modules
/
concat
/
Gemfile
diff --git
a/3rdparty/modules/concat/Gemfile
b/3rdparty/modules/concat/Gemfile
index
5eb00e1
..
cc4048a
100644
(file)
--- a/
3rdparty/modules/concat/Gemfile
+++ b/
3rdparty/modules/concat/Gemfile
@@
-11,20
+11,23
@@
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-core', '3.1.7', :require => false
- gem 'rspec-puppet', '~>
2
.0', :require => false
+ gem 'rspec-puppet', '~>
1
.0', :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
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
- gem 'pry'
end
end
+beaker_version = ENV['BEAKER_VERSION']
+beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
group :system_tests do
group :system_tests do
- if beaker_version
= ENV['BEAKER_VERSION']
+ if beaker_version
gem 'beaker', *location_for(beaker_version)
end
gem 'beaker', *location_for(beaker_version)
end
- if beaker_rspec_version
= ENV['BEAKER_RSPEC_VERSION']
+ if 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
@@
-32,16
+35,14
@@
group :system_tests do
gem 'serverspec', :require => false
end
gem 'serverspec', :require => false
end
-
-
if facterversion = ENV['FACTER_GEM_VERSION']
if facterversion = ENV['FACTER_GEM_VERSION']
- gem 'facter',
facterversion, :require => false
+ gem 'facter',
*location_for(facterversion)
else
gem 'facter', :require => false
end
if puppetversion = ENV['PUPPET_GEM_VERSION']
else
gem 'facter', :require => false
end
if puppetversion = ENV['PUPPET_GEM_VERSION']
- gem 'puppet',
puppetversion, :require => false
+ gem 'puppet',
*location_for(puppetversion)
else
gem 'puppet', :require => false
end
else
gem 'puppet', :require => false
end