Merge tag 'v1.7.15' into 1-8-stable

Version 1.7.15

3 files changed, 5 insertions, 3 deletions

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 70e2efda..86dbfba2 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -521,7 +521,7 @@ module Bundler
       converged = []
       @locked_specs.each do |s|
         # Replace the locked dependency's source with the equivalent source from the Gemfile
-        dep = @dependencies.find { |d| s.satisfies?(d) }
+        dep = @dependencies.find { |dep| s.satisfies?(dep) }
         s.source = (dep && dep.source) || sources.get(s.source)
 
         # Don't add a spec to the list if its source is expired. For example,
diff --git a/lib/bundler/source/path/installer.rb b/lib/bundler/source/path/installer.rb
index 28e69875..6f264489 100644
--- a/lib/bundler/source/path/installer.rb
+++ b/lib/bundler/source/path/installer.rb
@@ -3,6 +3,8 @@ module Bundler
     class Path
 
       class Installer < Bundler::GemInstaller
+        attr_reader :spec
+
         def initialize(spec, options = {})
           @spec              = spec
           @tmp_bin_dir       = "#{Bundler.tmp(spec.full_name)}/bin"
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index efcbf187..0053688f 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -208,6 +208,8 @@ module Bundler
         remotes.map(&method(:suppress_configured_credentials))
       end
 
+    private
+
       def source_uris_for_spec(spec)
         specs.search_all(spec.name).inject([]) do |uris, s|
           uris << s.source_uri.without_credentials if s.source_uri
@@ -215,8 +217,6 @@ module Bundler
         end
       end
 
-    private
-
       def loaded_from(spec)
         "#{Bundler.rubygems.gem_dir}/specifications/#{spec.full_name}.gemspec"
       end