bundler 0.9.1 → 0.9.2

data/README.markdown

@@ -63,13 +63,13 @@ such as testing or deployment.
 
 You can specify groups of gems in the Gemfile using the following syntax:
 
-   gem "nokogiri", :group => :test
+    gem "nokogiri", :group => :test
 
-   # or
+    # or
 
-   group :test do
+    group :test do
      gem "webrat"
-   end
+    end
 
 Note that Bundler adds all the gems without an explicit group name to the
 `:default` group.
@@ -235,15 +235,15 @@ The following Bundler 0.8 APIs are no longer supported:
    explicitly. So `Bundler.require_env(:test)` becomes
    `Bundler.require(:default, :test)`
 
-2. `require 'vendor/gems/environment.rb`: In unlocked
+2. `require 'vendor/gems/environment'`: In unlocked
    mode, where using system gems, this becomes
    `Bundler.setup(:multiple, groups)`. If you don't
    specify any groups, this puts all groups on the load
-   path. In locked, mode, it becomes `require .bundle/environment`
+   path. In locked, mode, it becomes `require '.bundle/environment'`
 
 ## Reporting bugs
 
 Please report all bugs on the github issue tracker for the project located
 at:
 
-    http://github.com/wycats/bundler/issues/
+    http://github.com/carlhuda/bundler/issues/

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems'
 
 module Bundler
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'

data/lib/bundler/cli.rb

@@ -63,6 +63,10 @@ module Bundler
 
       environment = Bundler.load
       environment.lock
+    rescue GemNotFound, VersionConflict => e
+      Bundler.ui.error(e.message)
+      Bundler.ui.info "Run `bundle install` to install missing gems"
+      exit 128
     end
 
     desc "unlock", "Unlock the bundle. This allows gem versions to be changed"

data/lib/bundler/definition.rb

@@ -1,3 +1,5 @@
+require "digest/sha1"
+
 module Bundler
   class Definition
     def self.from_gemfile(gemfile)
@@ -13,7 +15,13 @@ module Bundler
     def self.from_lock(lockfile)
       # gemfile_definition = from_gemfile(nil)
       locked_definition = Locked.new(YAML.load_file(lockfile))
-      # raise GemfileError unless gemfile_definition.equivalent?(locked_definition)
+
+      # TODO: Switch to using equivalent?
+      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 `gem lock`"
+      end
+
       locked_definition
     end
 
@@ -55,6 +63,10 @@ module Bundler
         @details = details
       end
 
+      def hash
+        @details["hash"]
+      end
+
       def sources
         @sources ||= @details["sources"].map do |args|
           name, options = args.to_a.flatten

data/lib/bundler/runtime.rb

@@ -1,3 +1,5 @@
+require "digest/md5"
+
 module Bundler
   class Runtime < Environment
     def setup(*groups)
@@ -159,6 +161,7 @@ module Bundler
 
     def details
       details = {}
+      details["hash"] = Digest::SHA1.hexdigest(File.read("#{root}/Gemfile"))
       details["sources"] = sources.map { |s| { s.class.name.split("::").last => s.options} }
 
       details["specs"] = specs.map do |s|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Carl Lerche