diff options
| -rw-r--r-- | lib/bundled_gems.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/bundled_gems.rb b/lib/bundled_gems.rb index 771f2325cf..761e98a531 100644 --- a/lib/bundled_gems.rb +++ b/lib/bundled_gems.rb @@ -191,15 +191,18 @@ module Gem::BUNDLED_GEMS # :nodoc: end def self.force_activate(gem) + require "bundler" Bundler.reset! builder = Bundler::Dsl.new - if Bundler.definition.gemfiles.empty? # bundler/inline - Bundler.definition.locked_gems.specs.each{|spec| builder.gem spec.name, spec.version.to_s } - else - Bundler.definition.gemfiles.each{|gemfile| builder.eval_gemfile(gemfile) } + if Bundler::SharedHelpers.in_bundle? + if Bundler.definition.gemfiles.empty? + Bundler.locked_gems.specs.each{|spec| builder.gem spec.name, spec.version.to_s } + else + Bundler.definition.gemfiles.each{|gemfile| builder.eval_gemfile(gemfile) } + end + builder.gem gem end - builder.gem gem definition = builder.to_definition(nil, true) definition.validate_runtime! |