github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 14:47:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

verify Rubygems versions before monkeypatching

Browse source 
Fixes #2684
This commit is contained in:
Colin Surprenant 2015-02-24 18:45:21 -05:00 • committed by Jordan Sissel
parent 5e9644b7a5
commit d805cc76aa
1 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

40
lib/logstash/environment.rb
View file

@ -11,27 +11,31 @@ require 'logstash/version'
# see https://github.com/elasticsearch/logstash/issues/2556 and https://github.com/rubygems/rubygems/issues/1070
#
# this code is from Rubygems v2.1.9 in JRuby 1.7.17. Per tickets this issue should be solved at JRuby >= 1.7.20.
class Gem::Specification
def self.reset
@@dirs = nil
Gem.pre_reset_hooks.each { |hook| hook.call }
@@all = nil
@@stubs = nil
_clear_load_cache
unresolved = unresolved_deps
unless unresolved.empty?
unless (unresolved.size == 1 && unresolved["ffi"])
w = "W" + "ARN"
warn "#{w}: Unresolved specs during Gem::Specification.reset:"
unresolved.values.each do |dep|
warn " #{dep}"
# this method implementation works for Rubygems version 2.1.0 and up, verified up to 2.4.6
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new("2.1.0") && Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.5.0")
class Gem::Specification
def self.reset
@@dirs = nil
Gem.pre_reset_hooks.each { |hook| hook.call }
@@all = nil
@@stubs = nil
_clear_load_cache
unresolved = unresolved_deps
unless unresolved.empty?
unless (unresolved.size == 1 && unresolved["ffi"])
w = "W" + "ARN"
warn "#{w}: Unresolved specs during Gem::Specification.reset:"
unresolved.values.each do |dep|
warn " #{dep}"
end
warn "#{w}: Clearing out unresolved specs."
warn "Please report a bug if this causes problems."
end
warn "#{w}: Clearing out unresolved specs."
warn "Please report a bug if this causes problems."
unresolved.clear
end
unresolved.clear
Gem.post_reset_hooks.each { |hook| hook.call }
end
Gem.post_reset_hooks.each { |hook| hook.call }
end
end