Skip to content

Commit 598b0e8

Browse files
committed
The current force_activate always fails without Gemfile
1 parent 3390b6a commit 598b0e8

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

lib/bundled_gems.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,15 +191,18 @@ def self.build_message(name, level)
191191
end
192192

193193
def self.force_activate(gem)
194+
require "bundler"
194195
Bundler.reset!
195196

196197
builder = Bundler::Dsl.new
197-
if Bundler.definition.gemfiles.empty? # bundler/inline
198-
Bundler.definition.locked_gems.specs.each{|spec| builder.gem spec.name, spec.version.to_s }
199-
else
200-
Bundler.definition.gemfiles.each{|gemfile| builder.eval_gemfile(gemfile) }
198+
if Bundler::SharedHelpers.in_bundle?
199+
if Bundler.definition.gemfiles.empty?
200+
Bundler.locked_gems.specs.each{|spec| builder.gem spec.name, spec.version.to_s }
201+
else
202+
Bundler.definition.gemfiles.each{|gemfile| builder.eval_gemfile(gemfile) }
203+
end
204+
builder.gem gem
201205
end
202-
builder.gem gem
203206

204207
definition = builder.to_definition(nil, true)
205208
definition.validate_runtime!

0 commit comments

Comments
 (0)