Auto merge of #5277 - bundler:Paxa-master, r=segiddins

Don't include dev deps in Index#dependency_names

See #5256

4 files changed, 21 insertions, 11 deletions

diff --git a/lib/bundler/index.rb b/lib/bundler/index.rb
index 5bdb102d37..4fe1418773 100644
--- a/lib/bundler/index.rb
+++ b/lib/bundler/index.rb
@@ -109,14 +109,19 @@ module Bundler
 
     # returns a list of the dependencies
     def unmet_dependency_names
-      names = dependency_names
-      names.delete_if {|n| n == "bundler" }
-      names.select {|n| search(n).empty? }
+      dependency_names.select do |name|
+        name != "bundler" && search(name).empty?
+      end
     end
 
     def dependency_names
       names = []
-      each {|s| names.concat(s.dependencies.map(&:name)) }
+      each do |spec|
+        spec.dependencies.each do |dep|
+          next if dep.type == :development
+          names << dep.name
+        end
+      end
       names.uniq
     end
 
diff --git a/spec/bundler/index_spec.rb b/spec/bundler/index_spec.rb
index da8e5731ca..1ff592ca81 100644
--- a/spec/bundler/index_spec.rb
+++ b/spec/bundler/index_spec.rb
@@ -26,4 +26,12 @@ describe Bundler::Index do
       end
     end
   end
+
+  context "with specs that include development dependencies" do
+    let(:specs) { [*build_spec("a", "1.0.0") {|s| s.development("b", "~> 1.0") }] }
+
+    it "does not include b in #dependency_names" do
+      expect(subject.dependency_names).not_to include("b")
+    end
+  end
 end
diff --git a/spec/runtime/load_spec.rb b/spec/runtime/load_spec.rb
index c010f8f8e9..93c8073180 100644
--- a/spec/runtime/load_spec.rb
+++ b/spec/runtime/load_spec.rb
@@ -4,13 +4,6 @@ require "spec_helper"
 describe "Bundler.load" do
   before :each do
     system_gems "rack-1.0.0"
-    # clear memoized method results
-    # TODO: Don't reset internal ivars
-    Bundler.instance_eval do
-      @load = nil
-      @runtime = nil
-      @definition = nil
-    end
   end
 
   describe "with a gemfile" do
diff --git a/spec/support/builders.rb b/spec/support/builders.rb
index 16ced2b920..0b660f12f5 100644
--- a/spec/support/builders.rb
+++ b/spec/support/builders.rb
@@ -505,6 +505,10 @@ module Spec
         @spec.add_runtime_dependency(name, requirements)
       end
 
+      def development(name, requirements)
+        @spec.add_development_dependency(name, requirements)
+      end
+
       def required_ruby_version=(*reqs)
         @spec.required_ruby_version = *reqs
       end