mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 01:58:41 -05:00
(maint) Pin nokogiri and redis due to old ruby versions
Nokogiri and Redis gems have had recent releases which are not compatible with older ruby versions. This commit modifies the Gemfile to get the latest of each of these gems on modern ruby versions and pin to the older gem versions for older ruby engines.
This commit is contained in:
parent
f209c2b830
commit
0840e11e71
1 changed files with 23 additions and 4 deletions
27
Gemfile
27
Gemfile
|
|
@ -12,15 +12,34 @@ gem 'puma', '>= 3.6.0'
|
|||
gem 'rack', '~> 1.6'
|
||||
gem 'rake', '>= 10.4'
|
||||
gem 'rbvmomi', '>= 1.8'
|
||||
if RUBY_VERSION =~ /^1\.9\./
|
||||
gem 'nokogiri', '< 1.7.0'
|
||||
end
|
||||
gem 'redis', '>= 3.2'
|
||||
gem 'sinatra', '>= 1.4'
|
||||
gem 'net-ldap', '<= 0.12.1' # keep compatibility w/ jruby & mri-1.9.3
|
||||
gem 'statsd-ruby', '>= 1.3.0', :require => 'statsd'
|
||||
gem 'connection_pool', '>= 2.2.1'
|
||||
|
||||
# Pin gems against Ruby version
|
||||
# Note we can't use platform restrictions easily so use
|
||||
# lowest version range any platform
|
||||
# ----
|
||||
# nokogiri
|
||||
# redis
|
||||
if RUBY_VERSION =~ /^1\.9\./
|
||||
gem 'nokogiri', '~> 1.6.0'
|
||||
gem 'redis', '~> 3.0'
|
||||
elsif RUBY_VERSION =~ /^2\.[0]/
|
||||
gem 'nokogiri', '~> 1.6.0'
|
||||
gem 'redis', '~> 3.0'
|
||||
elsif RUBY_VERSION =~ /^2\.[1]/
|
||||
gem 'nokogiri', '~> 1.7.0'
|
||||
gem 'redis', '~> 3.0'
|
||||
elsif RUBY_VERSION =~ /^2\.2\.[01]/
|
||||
gem 'nokogiri', "~> 1.7"
|
||||
gem 'redis', '~> 3.0'
|
||||
else
|
||||
gem 'nokogiri', "~> 1.7"
|
||||
gem 'redis', '>= 3.2'
|
||||
end
|
||||
|
||||
# Test deps
|
||||
group :test do
|
||||
gem 'mock_redis', '>= 0.17.0'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue