Merge pull request #2639 from joyicecloud/show-version-of-gem-updated

Displays the previous version of the gem when run bundle update

Conflicts:
	lib/bundler/source.rb
	lib/bundler/source/git/git_proxy.rb
	lib/bundler/source/rubygems.rb

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/bundler.rb b/lib/bundler.rb
index 50fed969..de450871 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -154,9 +154,12 @@ module Bundler
     end
 
     def locked_gems
-      @locked_gems ||= begin
+      return @locked_gems if defined?(@locked_gems)
+      if Bundler.default_lockfile.exist?
         lock = Bundler.read_file(Bundler.default_lockfile)
-        LockfileParser.new(lock)
+        @lock_gems = LockfileParser.new(lock)
+      else
+        @locked_gems = nil
       end
     end