Ensure that diff/lcs is loaded in the specsseg-load-path-gem-plugins

2 files changed, 7 insertions, 1 deletions

diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index b5d528d865..ae8055408f 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -174,7 +174,12 @@ module Bundler
 
       requested_path_gems = @definition.requested_specs.select {|s| s.source.is_a?(Source::Path) }
       path_plugin_files = requested_path_gems.map do |spec|
-        Bundler.rubygems.spec_matches_for_glob(spec, "rubygems_plugin#{Bundler.rubygems.suffix_pattern}")
+        begin
+          Bundler.rubygems.spec_matches_for_glob(spec, "rubygems_plugin#{Bundler.rubygems.suffix_pattern}")
+        rescue TypeError
+          error_message = "#{spec.name} #{spec.version} has an invalid gemspec"
+          raise Gem::InvalidSpecificationException, error_message
+        end
       end.flatten
       Bundler.rubygems.load_plugin_files(path_plugin_files)
     end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f9285463b5..f6700ca315 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,6 +13,7 @@ begin
   rspec = spec.dependencies.find {|d| d.name == "rspec" }
   gem "rspec", rspec.requirement.to_s
   require "rspec"
+  require "diff/lcs"
 rescue LoadError
   abort "Run rake spec:deps to install development dependencies"
 end