Print better error during install when you need to relock

Closes #272
rubygems · Apr 12, 2010 · ef6a00f · ef6a00f
1 parent be5796e
commit ef6a00f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/lib/bundler.rb b/lib/bundler.rb
@@ -38,6 +38,7 @@ class GemfileNotFound  < BundlerError; status_code(10) ; end
   class GemNotFound      < BundlerError; status_code(7)  ; end
   class VersionConflict  < BundlerError; status_code(6)  ; end
   class GemfileError     < BundlerError; status_code(4)  ; end
+  class GemfileChanged   < GemfileError; status_code(4)  ; end
   class PathError        < BundlerError; status_code(13) ; end
   class GitError         < BundlerError; status_code(11) ; end
   class DeprecatedMethod < BundlerError; status_code(12) ; end

diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb
@@ -85,7 +85,11 @@ def install(path = nil)
 
       remove_lockfiles if options[:relock]
 
-      Installer.install(Bundler.root, Bundler.definition, opts)
+      begin
+        Installer.install(Bundler.root, Bundler.definition, opts)
+      rescue GemfileChanged
+        raise GemfileChanged, "You changed your Gemfile after locking. Please run `bundle install --relock`."
+      end
 
       lock if options[:relock]
       cache if Bundler.root.join("vendor/cache").exist?

diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
@@ -17,7 +17,7 @@ def self.from_lock(lockfile)
 
       hash = Digest::SHA1.hexdigest(File.read("#{Bundler.root}/Gemfile"))
       unless locked_definition.hash == hash
-        raise GemfileError, "You changed your Gemfile after locking. Please relock using `bundle lock`"
+        raise GemfileChanged, "You changed your Gemfile after locking. Please relock using `bundle lock`"
       end
 
       locked_definition