Refactor bundled condition

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/bundled_gems.rb b/lib/bundled_gems.rb
index 761e98a531..fab79f42a9 100644
--- a/lib/bundled_gems.rb
+++ b/lib/bundled_gems.rb
@@ -195,15 +195,17 @@ module Gem::BUNDLED_GEMS # :nodoc:
     Bundler.reset!
 
     builder = Bundler::Dsl.new
+
     if Bundler::SharedHelpers.in_bundle?
-      if Bundler.definition.gemfiles.empty?
+      if Bundler.locked_gems
         Bundler.locked_gems.specs.each{|spec| builder.gem spec.name, spec.version.to_s }
-      else
+      elsif Bundler.definition.gemfiles.size > 0
         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!