diff options
| -rw-r--r-- | lib/bundler/runtime.rb | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb index e349901df4..bd626ccbd7 100644 --- a/lib/bundler/runtime.rb +++ b/lib/bundler/runtime.rb @@ -61,17 +61,13 @@ module Bundler file = dep.name if file == true required_file = file begin - Kernel.require file + Kernel.require required_file rescue LoadError => e raise if dep.autorequire || e.path != required_file - if dep.autorequire.nil? && dep.name.include?("-") - begin - namespaced_file = dep.name.tr("-", "/") - Kernel.require namespaced_file - rescue LoadError => e - raise if e.path != namespaced_file - end + if dep.autorequire.nil? && required_file.include?("-") + required_file = required_file.tr("-", "/") + retry end rescue RuntimeError => e raise Bundler::GemRequireError.new e, |