Skip to content

Commit

Permalink
Update min bundler version for installed_specs?
Browse files Browse the repository at this point in the history
The Bundler::RubygemsIntegration.installed_specs method was added in
version 2.5.12.
  • Loading branch information
kaylareopelle committed Sep 18, 2024
1 parent 01b8140 commit 701c5fc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion lib/new_relic/agent/instrumentation/grape.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
depends_on do
begin
if defined?(Bundler) &&
((Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.0.0') && Bundler.rubygems.installed_specs.map(&:name).include?('newrelic-grape')) ||
((Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.5.12') && Bundler.rubygems.installed_specs.map(&:name).include?('newrelic-grape')) ||
Bundler.rubygems.all_specs.map(&:name).include?('newrelic-grape'))
NewRelic::Agent.logger.info('Not installing New Relic supported Grape instrumentation because the third party newrelic-grape gem is present')
false
Expand Down
2 changes: 1 addition & 1 deletion lib/new_relic/control/frameworks/rails4.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class Control
module Frameworks
class Rails4 < NewRelic::Control::Frameworks::Rails3
def rails_gem_list
if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.0.0')
if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.5.12')
Bundler.rubygems.installed_specs.map { |gem| "#{gem.name} (#{gem.version})" }
else
Bundler.rubygems.all_specs.map { |gem| "#{gem.name} (#{gem.version})" }
Expand Down
2 changes: 1 addition & 1 deletion lib/new_relic/environment_report.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def self.registered_reporters=(logic)
####################################
report_on('Gems') do
begin
if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.0.0')
if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.5.12')
Bundler.rubygems.installed_specs.map { |gem| "#{gem.name}(#{gem.version})" }
else
Bundler.rubygems.all_specs.map { |gem| "#{gem.name}(#{gem.version})" }
Expand Down
2 changes: 1 addition & 1 deletion lib/new_relic/language_support.rb
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ def snakeize(string)
def bundled_gem?(gem_name)
return false unless defined?(Bundler)

if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.0.0')
if Gem::Version.new(Bundler::VERSION) >= Gem::Version.new('2.5.12')
Bundler.rubygems.installed_specs.map(&:name).include?(gem_name)
else
Bundler.rubygems.all_specs.map(&:name).include?(gem_name)
Expand Down

0 comments on commit 701c5fc

Please sign in to comment.