Because required files can sometimes themselves contain unrelated LoadErrors (e.g. during inter-gem development), run the regexps against the LoadError before the namespaced fallback check.

2 files changed, 25 insertions, 3 deletions

diff --git a/lib/bundler/runtime.rb b/lib/bundler/runtime.rb
index db6f21d698..d4a432454b 100644
--- a/lib/bundler/runtime.rb
+++ b/lib/bundler/runtime.rb
@@ -68,6 +68,9 @@ module Bundler
             Kernel.require file
           end
         rescue LoadError => e
+          REGEXPS.find { |r| r =~ e.message }
+          raise if dep.autorequire || $1 != required_file
+
           if dep.autorequire.nil? && dep.name.include?('-')
             begin
               namespaced_file = dep.name.gsub('-', '/')
@@ -78,9 +81,6 @@ module Bundler
               raise if dep.autorequire || (regex_name && regex_name.gsub('-', '/') != namespaced_file)
               raise e if regex_name.nil?
             end
-          else
-            REGEXPS.find { |r| r =~ e.message }
-            raise if dep.autorequire || $1 != required_file
           end
         end
       end
diff --git a/spec/runtime/require_spec.rb b/spec/runtime/require_spec.rb
index 349696606b..db72ff70f0 100644
--- a/spec/runtime/require_spec.rb
+++ b/spec/runtime/require_spec.rb
@@ -158,6 +158,28 @@ describe "Bundler.require" do
 
       expect(err).to eq("ZOMG LOAD ERROR")
     end
+
+    it "doesn't swallow the error when the library has an unrelated error" do
+      build_lib "load-fuuu", "1.0.0" do |s|
+        s.write "lib/load-fuuu.rb", "raise LoadError.new(\"cannot load such file -- load-bar\")"
+      end
+
+      gemfile <<-G
+        path "#{lib_path}"
+        gem "load-fuuu"
+      G
+
+      cmd = <<-RUBY
+        begin
+          Bundler.require
+        rescue LoadError => e
+          $stderr.puts "ZOMG LOAD ERROR: \#{e.message}"
+        end
+      RUBY
+      run(cmd, :expect_err => true)
+
+      expect(err).to eq("ZOMG LOAD ERROR: cannot load such file -- load-bar")
+    end
   end
 
   describe "using bundle exec" do