Merge tag 'v1.7.1'

Version 1.7.1

Conflicts:
	CHANGELOG.md
	lib/bundler/dsl.rb
	lib/bundler/index.rb
	lib/bundler/lockfile_parser.rb
	lib/bundler/source/rubygems.rb
	man/gemfile.5.ronn

1 files changed, 9 insertions, 0 deletions

diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index bcf63759..d37a6046 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -15,6 +15,12 @@ module Bundler
       mirrors[normalized_key] || uri
     end
 
+    attr_accessor :dependency_names
+
+    def unmet_deps
+      specs.unmet_dependency_names
+    end
+
     def version_message(spec)
       locked_spec = Bundler.locked_gems.specs.find { |s| s.name == spec.name } if Bundler.locked_gems
       locked_spec_version = locked_spec.version if locked_spec
@@ -25,5 +31,8 @@ module Bundler
       message
     end
 
+    def can_lock?(spec)
+      spec.source == self
+    end
   end
 end