bundler 0.9.19 → 0.9.20

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.9.20 (April 15, 2010)
+
+Features:
+
+  - load YAML format gemspecs
+  - no backtraces when calling Bundler.setup if gems are missing
+  - no backtraces when trying to exec a file without the executable bit
+
+Bugfixes:
+
+  - fix infinite recursion in Bundler.setup after loading a bundled Bundler gem
+  - request install instead of lock when env.rb is out of sync with Gemfile.lock
+
 ## 0.9.19 (April 12, 2010)
 
 Features:

data/lib/bundler.rb

@@ -66,25 +66,33 @@ module Bundler
       end
     end
 
-    def setup(*groups)
+    def gem_setup(*groups)
       return @setup if @setup
 
-      if groups.empty?
-        # Load all groups, but only once
-        @setup = load.setup
-      else
-        # Figure out which groups haven't been loaded yet
-        unloaded = groups - (@completed_groups || [])
-        # Record groups that are now loaded
-        @completed_groups = groups | (@completed_groups || [])
-        # Load any groups that are not yet loaded
-        unloaded.any? ? load.setup(*unloaded) : load
+      begin
+        if groups.empty?
+          # Load all groups, but only once
+          @setup = load.setup
+        else
+          # Figure out which groups haven't been loaded yet
+          unloaded = groups - (@completed_groups || [])
+          # Record groups that are now loaded
+          @completed_groups = groups | (@completed_groups || [])
+          # Load any groups that are not yet loaded
+          unloaded.any? ? load.setup(*unloaded) : load
+        end
+      rescue Bundler::GemNotFound => e
+        STDERR.puts e.message
+        STDERR.puts "Try running `bundle install`."
+        exit!
       end
     end
+    alias setup gem_setup unless Bundler.respond_to?(:setup)
 
-    def require(*groups)
+    def gem_require(*groups)
       setup(*groups).require(*groups)
     end
+    alias require gem_require unless Bundler.respond_to?(:require)
 
     def load
       @load ||= begin

data/lib/bundler/cli.rb

@@ -176,6 +176,8 @@ module Bundler
       begin
         # Run
         Kernel.exec *ARGV
+      rescue Errno::EACCES
+        Bundler.ui.error "bundler: not executable: #{ARGV.first}"
       rescue Errno::ENOENT
         Bundler.ui.error "bundler: command not found: #{ARGV.first}"
         Bundler.ui.warn  "Install missing gem binaries with `bundle install`"

data/lib/bundler/runtime.rb

@@ -23,7 +23,7 @@ module Bundler
       # Activate the specs
       specs.each do |spec|
         unless spec.loaded_from
-          raise GemNotFound, "#{spec.full_name} is not installed. Try running `bundle install`."
+          raise GemNotFound, "#{spec.full_name} is cached, but not installed."
         end
 
         Gem.loaded_specs[spec.name] = spec

data/lib/bundler/source.rb

@@ -193,7 +193,21 @@ module Bundler
           Dir["#{path}/#{@glob}"].each do |file|
             file = Pathname.new(file)
             # Eval the gemspec from its parent directory
-            if spec = Dir.chdir(file.dirname) { eval(File.read(file.basename), binding, file.expand_path.to_s) }
+            spec = Dir.chdir(file.dirname) do
+              begin
+                Gem::Specification.from_yaml(file.basename)
+                # Raises ArgumentError if the file is not valid YAML
+              rescue ArgumentError, Gem::EndOfYAMLException, Gem::Exception
+                begin
+                  eval(File.read(file.basename), TOPLEVEL_BINDING, file.expand_path.to_s)
+                rescue LoadError
+                  raise GemspecError, "There was a LoadError while evaluating #{file.basename}.\n" +
+                    "Does it try to require a relative path? That doesn't work in Ruby 1.9."
+                end
+              end
+            end
+
+            if spec
               spec = Specification.from_gemspec(spec)
               spec.loaded_from = file.to_s
               spec.source = self

data/lib/bundler/templates/environment.erb

@@ -2,6 +2,7 @@
 # Generated by Bundler <%= Bundler::VERSION %>
 
 require 'digest/sha1'
+require 'yaml'
 <%= shared_helpers %>
 
 module Bundler
@@ -41,10 +42,18 @@ module Bundler
   end
 
   def self.match_fingerprint
-    print = Digest::SHA1.hexdigest(File.read(File.expand_path('../../Gemfile', __FILE__)))
-    unless print == FINGERPRINT
+    lockfile = File.expand_path('../../Gemfile.lock', __FILE__)
+    lock_print = YAML.load(File.read(lockfile))["hash"] if File.exist?(lockfile)
+    gem_print = Digest::SHA1.hexdigest(File.read(File.expand_path('../../Gemfile', __FILE__)))
+
+    unless gem_print == lock_print
+      raise "omg wtf"
       abort 'Gemfile changed since you last locked. Please `bundle lock` to relock.'
     end
+
+    unless gem_print == FINGERPRINT
+      abort 'Your bundled environment is out of date. Run `bundle install` to regenerate it.'
+    end
   end
 
   def self.setup(*groups)

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.19"
+  VERSION = "0.9.20"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 19
-  version: 0.9.19
+  - 20
+  version: 0.9.20
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,11 +16,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -07:00
+date: 2010-04-15 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
@@ -29,7 +30,6 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id001
 description: Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably
 email: