Detect changes in path specs by comparing locked specs to source specs

Previously, we'd wrongly conclude there are no path changes when there are
changes. We'd parse the Gemfile.lock and compare the source.specs, the
gemspecs currently in the path, to what's in the Gemfile.lock's locked.specs.
Unfortunately, locked.specs for Path sources creates an Index with the specs
from the filesystem and NOT what we already parsed from the Gemfile.lock!  In
other words, we compare the filesystems specs for a path to itself and always
conclude "No changes detected!"

Instead, we build an index with specs for the source we want from the
already parsed Gemfile.lock.  We use this index to compare to the current
source.specs index from the filesystem.

Ironically, this issue was masked by the bug from our prior fix, namely that
dependencies_for_source_changed? always would conclude that there were changes.
Because of that bug, it would short circuit out of the nothing_changed? method
and force a re-resolve with path gems, which would properly build the
Gemfile.lock from the prior parsed one.

Undo some test changes needed to get the first fix to pass.

1 files changed, 107 insertions, 6 deletions

diff --git a/spec/bundler/definition_spec.rb b/spec/bundler/definition_spec.rb
index 6e347dbd..02049b55 100644
--- a/spec/bundler/definition_spec.rb
+++ b/spec/bundler/definition_spec.rb
@@ -3,13 +3,12 @@ require "spec_helper"
 require "bundler/definition"
 
 describe Bundler::Definition do
-  before do
-    allow(Bundler).to receive(:settings) { Bundler::Settings.new(".") }
-    allow(Bundler).to receive(:default_gemfile) { Pathname.new("Gemfile") }
-    allow(Bundler).to receive(:ui) { double("UI", :info => "", :debug => "") }
-  end
-
   describe "#lock" do
+    before do
+      allow(Bundler).to receive(:settings) { Bundler::Settings.new(".") }
+      allow(Bundler).to receive(:default_gemfile) { Pathname.new("Gemfile") }
+      allow(Bundler).to receive(:ui) { double("UI", :info => "", :debug => "") }
+    end
     context "when it's not possible to write to the file" do
       subject { Bundler::Definition.new(nil, [], Bundler::SourceList.new, []) }
 
@@ -31,4 +30,106 @@ describe Bundler::Definition do
       end
     end
   end
+
+  describe "detects changes" do
+    it "for a path gem with changes" do
+      build_lib "foo", "1.0", :path => lib_path("foo")
+
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "foo", :path => "#{lib_path("foo")}"
+      G
+
+      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+        s.add_dependency "rack", "1.0"
+      end
+
+      bundle :install, :env => { "DEBUG" => 1 }
+
+      expect(out).to match(/re-resolving dependencies/)
+      lockfile_should_be <<-G
+        PATH
+          remote: #{lib_path("foo")}
+          specs:
+            foo (1.0)
+              rack (= 1.0)
+
+        GEM
+          remote: file:#{gem_repo1}/
+          specs:
+            rack (1.0.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          foo!
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      G
+    end
+
+    it "for a path gem with deps and no changes" do
+      build_lib "foo", "1.0", :path => lib_path("foo") do |s|
+        s.add_dependency "rack", "1.0"
+      end
+
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "foo", :path => "#{lib_path("foo")}"
+      G
+
+      bundle :check, :env => { "DEBUG" => 1 }
+
+      expect(out).to match(/using resolution from the lockfile/)
+      lockfile_should_be <<-G
+        PATH
+          remote: #{lib_path("foo")}
+          specs:
+            foo (1.0)
+              rack (= 1.0)
+
+        GEM
+          remote: file:#{gem_repo1}/
+          specs:
+            rack (1.0.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          foo!
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      G
+    end
+
+    it "for a rubygems gem" do
+      install_gemfile <<-G
+        source "file://#{gem_repo1}"
+        gem "foo"
+      G
+
+      bundle :check, :env => { "DEBUG" => 1 }
+
+      expect(out).to match(/using resolution from the lockfile/)
+      lockfile_should_be <<-G
+        GEM
+          remote: file:#{gem_repo1}/
+          specs:
+            foo (1.0)
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+          foo
+
+        BUNDLED WITH
+           #{Bundler::VERSION}
+      G
+    end
+  end
 end