bundler 0.9.4 → 0.9.5

data/bin/bundle

@@ -1,3 +1,10 @@
+# Check if an older version of bundler is installed
+require 'bundler'
+$:.each do |path|
+  if path =~ %r'/bundler-0.(\d+)' && $1.to_i < 9
+    abort "Please remove older versions of bundler. This can by running `gem cleanup`."
+  end
+end
 require 'bundler/cli'
 
 begin

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems-ext'
 
 module Bundler
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
@@ -56,7 +56,7 @@ module Bundler
 
     def bundle_path
       @bundle_path ||= begin
-        path = settings[:path] || "#{Gem.user_home}/.bundle"
+        path = settings[:path] || "#{Gem.user_home}/.bundle/#{Gem.ruby_engine}/#{Gem::ConfigMap[:ruby_version]}"
         Pathname.new(path).expand_path(root)
       end
     end
@@ -96,7 +96,7 @@ module Bundler
     end
 
     def cache
-      home.join("cache")
+      bundle_path.join('cache/bundler')
     end
 
     def root
@@ -114,8 +114,8 @@ module Bundler
     end
 
     def configure_gem_home_and_path
-      if path = settings[:path]
-        ENV['GEM_HOME'] = File.expand_path(path, root)
+      if settings[:disable_shared_gems]
+        ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
         ENV['GEM_PATH'] = ''
       else
         gem_home, gem_path = Gem.dir, Gem.path

data/lib/bundler/cli.rb

@@ -1,6 +1,5 @@
 $:.unshift File.expand_path('../vendor', __FILE__)
 require 'thor'
-require 'bundler'
 require 'rubygems/config_file'
 
 # Work around a RubyGems bug
@@ -44,18 +43,23 @@ module Bundler
     end
 
     desc "install", "Install the current environment to the system"
-    method_option :without, :type => :array, :banner   => "Exclude gems that are part of the specified named group"
-    method_option :relock,  :type => :boolean, :banner => "Unlock, install the gems, and relock"
+    method_option "without", :type => :array,   :banner => "Exclude gems that are part of the specified named group."
+    method_option "relock",  :type => :boolean, :banner => "Unlock, install the gems, and relock."
+    method_option "disable-shared-gems", :type => :boolean, :banner => "Do not use any shared gems, such as the system gem repository."
     def install(path = nil)
-      remove_lockfiles if options[:relock]
-
       opts = options.dup
       opts[:without] ||= []
       opts[:without].map! { |g| g.to_sym }
 
       Bundler.settings[:path] = path if path
+      Bundler.settings[:disable_shared_gems] = '1' if options["disable-shared-gems"]
+
+      remove_lockfiles if options[:relock]
 
       Installer.install(Bundler.root, Bundler.definition, opts)
+      # Ensures that .bundle/environment.rb exists
+      # TODO: Figure out a less hackish way to do this
+      Bundler.load
 
       lock if options[:relock]
     end

data/lib/bundler/dependency.rb

@@ -8,10 +8,13 @@ module Bundler
     def initialize(name, version, options = {}, &blk)
       super(name, version)
 
-      @groups = Array(options["group"] || :default)
-      @source = options["source"]
-      @autorequire = options.include?("require") ? options['require'] || [] : [name]
-      @autorequire = [@autorequire] unless @autorequire.is_a?(Array)
+      @autorequire = nil
+      @groups      = Array(options["group"] || :default).map { |g| g.to_sym }
+      @source      = options["source"]
+
+      if options.key?('require')
+        @autorequire = Array(options['require'] || [])
+      end
     end
   end
 end

data/lib/bundler/runtime.rb

@@ -4,6 +4,13 @@ module Bundler
   class Runtime < Environment
     include SharedHelpers
 
+    def initialize(*)
+      super
+      if locked? # && !rb_lock_file.exist?
+        write_rb_lock
+      end
+    end
+
     def setup(*groups)
       # Has to happen first
       clean_load_path
@@ -21,11 +28,20 @@ module Bundler
     end
 
     def require(*groups)
+      groups.map! { |g| g.to_sym }
       groups = [:default] if groups.empty?
       autorequires = autorequires_for_groups(*groups)
+
       groups.each do |group|
-        (autorequires[group] || []).each do |path|
-          Kernel.require(path)
+        (autorequires[group] || [[]]).each do |path, explicit|
+          if explicit
+            Kernel.require(path)
+          else
+            begin
+              Kernel.require(path)
+            rescue LoadError
+            end
+          end
         end
       end
     end
@@ -60,6 +76,7 @@ module Bundler
     end
 
     def specs_for(*groups)
+      groups.map! { |g| g.to_sym }
       if groups.empty?
         specs
       else
@@ -75,7 +92,7 @@ module Bundler
           source_requirements[dep.name] = dep.source.local_specs
         end
 
-        Resolver.resolve(@definition.actual_dependencies, index, source_requirements)
+        group_specs(Resolver.resolve(@definition.actual_dependencies, index, source_requirements))
       end
     end
 
@@ -110,11 +127,15 @@ module Bundler
       specs.map { |s| s.load_paths }.flatten
     end
 
+    def rb_lock_file
+      root.join(".bundle/environment.rb")
+    end
+
     def write_rb_lock
       shared_helpers = File.read(File.expand_path("../shared_helpers.rb", __FILE__))
       template = File.read(File.expand_path("../templates/environment.erb", __FILE__))
       erb = ERB.new(template, nil, '-')
-      File.open("#{root}/.bundle/environment.rb", 'w') do |f|
+      File.open(rb_lock_file, 'w') do |f|
         f.puts erb.result(binding)
       end
     end
@@ -138,9 +159,9 @@ module Bundler
       end
 
       details["dependencies"] = @definition.dependencies.inject({}) do |h,d|
-        h.merge!({d.name => {"version" => d.version_requirements.to_s,
-                    "group"   => d.groups,
-                    "require" => d.autorequire}})
+        h.merge!({d.name => {"version" => d.version_requirements.to_s, "group"   => d.groups} })
+        h[d.name]['require'] = d.autorequire if d.autorequire
+        h
       end
       details
     end
@@ -149,11 +170,32 @@ module Bundler
       Digest::SHA1.hexdigest(File.read("#{root}/Gemfile"))
     end
 
+    def specs_for_lock_file
+      specs.map do |spec|
+        dep  = @definition.dependencies.find { |d| d.name == spec.name }
+        hash = {}
+        hash[:name]       = spec.name
+        hash[:version]    = spec.version.to_s
+        hash[:groups]     = spec.groups
+        hash[:load_paths] = spec.load_paths
+        hash
+      end
+    end
+
     def autorequires_for_groups(*groups)
+      groups.map! { |g| g.to_sym }
       autorequires = Hash.new { |h,k| h[k] = [] }
       @definition.dependencies.each do |dep|
         dep.groups.each do |group|
-          autorequires[group].concat dep.autorequire
+          # If there is no autorequire, then rescue from
+          # autorequiring the gems name
+          if dep.autorequire
+            dep.autorequire.each do |file|
+              autorequires[group] << [file, true]
+            end
+          else
+            autorequires[group] << [dep.name, false]
+          end
         end
       end
 
@@ -164,24 +206,13 @@ module Bundler
       end
     end
 
-    def clean_load_path
-      # handle 1.9 where system gems are always on the load path
-      if defined?(::Gem)
-        me = File.expand_path("../../", __FILE__)
-        $LOAD_PATH.reject! do |p|
-          p != File.dirname(__FILE__) &&
-            Gem.path.any? { |gp| p.include?(gp) }
-        end
-        $LOAD_PATH.unshift me
-        $LOAD_PATH.uniq!
-      end
-    end
-
     def cripple_rubygems(specs)
       reverse_rubygems_kernel_mixin
 
       executables = specs.map { |s| s.executables }.flatten
 
+      # TODO: This is duplicated a bit too much in environment.erb.
+      #       Let's figure out how to improve that.
       ::Kernel.send(:define_method, :gem) do |dep, *reqs|
         if executables.include? File.basename(caller.first.split(':').first)
           return

data/lib/bundler/shared_helpers.rb

@@ -2,8 +2,6 @@ module Bundler
   module SharedHelpers
 
     def reverse_rubygems_kernel_mixin
-      require "rubygems"
-
       # Disable rubygems' gem activation system
       ::Kernel.class_eval do
         if private_method_defined?(:gem_original_require)
@@ -40,6 +38,19 @@ module Bundler
       end
     end
 
+    def clean_load_path
+      # handle 1.9 where system gems are always on the load path
+      if defined?(::Gem)
+        me = File.expand_path("../../", __FILE__)
+        $LOAD_PATH.reject! do |p|
+          next if File.expand_path(p).include?(me)
+          p != File.dirname(__FILE__) &&
+            Gem.path.any? { |gp| p.include?(gp) }
+        end
+        $LOAD_PATH.uniq!
+      end
+    end
+
     extend self
   end
 end

data/lib/bundler/source.rb

@@ -160,9 +160,10 @@ module Bundler
           if File.directory?(path)
             Dir["#{path}/#{@glob}"].each do |file|
               file = Pathname.new(file)
+              relative_path = file.relative_path_from(Pathname.new(path))
               # Do it in the root of the repo in case they do
               # assume being in the root
-              if spec = Dir.chdir(path) { eval(File.read(file)) }
+              if spec = Dir.chdir(path) { eval(File.read(relative_path)) }
                 spec = Specification.from_gemspec(spec)
                 spec.loaded_from = file
                 spec.source      = self
@@ -313,11 +314,10 @@ module Bundler
       end
 
       def checkout
-        FileUtils.mkdir_p(path)
+        unless File.exist?("#{path}/.git")
+          %x(git clone --no-checkout #{cache_path} #{path})
+        end
         Dir.chdir(path) do
-          unless File.exist?(".git")
-            %x(git clone --no-checkout #{cache_path} #{path})
-          end
           git "fetch --quiet"
           git "reset --hard #{revision}"
         end

data/lib/bundler/templates/environment.erb

@@ -1,17 +1,26 @@
-require 'digest/sha1'
-
 # DO NOT MODIFY THIS FILE
 
+require 'digest/sha1'
+require "rubygems"
+
 <%= shared_helpers %>
 
 module Bundler
-  extend SharedHelpers
+  LOCKED_BY    = '<%= Bundler::VERSION %>'
+  FINGERPRINT  = <%= gemfile_fingerprint.inspect %>
+  SPECS        = [
+    <% specs_for_lock_file.each do |spec| -%>
+    <%= spec.inspect %>,
+    <% end -%>
+  ]
+  AUTOREQUIRES = <%= autorequires_for_groups.inspect %>
 
-  reverse_rubygems_kernel_mixin
+  extend SharedHelpers
 
-  FINGERPRINT = <%= gemfile_fingerprint.inspect %>
-  LOAD_PATHS = <%= load_paths.inspect %>
-  AUTOREQUIRES = <%= autorequires_for_groups.inspect %>
+  def self.cripple_ruby_gems
+    reverse_rubygems_kernel_mixin
+    patch_rubygems
+  end
 
   def self.match_fingerprint
     print = Digest::SHA1.hexdigest(File.read(File.expand_path('../../Gemfile', __FILE__)))
@@ -22,16 +31,46 @@ module Bundler
 
   def self.setup(*groups)
     match_fingerprint
-    LOAD_PATHS.each { |path| $LOAD_PATH.unshift path }
+    SPECS.each do |spec|
+      spec[:load_paths].each { |path| $LOAD_PATH.unshift path }
+    end
   end
 
   def self.require(*groups)
     groups = [:default] if groups.empty?
     groups.each do |group|
-      (AUTOREQUIRES[group] || []).each { |file| Kernel.require file }
+      (AUTOREQUIRES[group] || []).each do |file, explicit|
+        if explicit
+          Kernel.require file
+        else
+          begin
+            Kernel.require file
+          rescue LoadError
+          end
+        end
+      end
+    end
+  end
+
+  def self.patch_rubygems
+    specs = SPECS
+
+    ::Kernel.send(:define_method, :gem) do |dep, *reqs|
+      opts = reqs.last.is_a?(Hash) ? reqs.pop : {}
+
+      dep  = dep.name if dep.respond_to?(:name)
+      unless specs.any?  { |s| s[:name] == dep }
+        e = Gem::LoadError.new "#{dep} is not part of the bundle. Add it to Gemfile."
+        e.name = dep
+        e.version_requirement = reqs
+        raise e
+      end
+
+      true
     end
   end
 
   # Setup bundle when it's required.
+  cripple_ruby_gems
   setup
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-10 00:00:00 -08:00
+date: 2010-02-12 00:00:00 -08:00
 default_executable: 
 dependencies: []