bundler 0.9.23 → 0.9.24

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.9.24 (April 22, 2010)
+
+Features:
+
+  - fetch submodules for git sources
+  - limit the bundled version of bundler to the same as the one installing
+  - force relative paths in git gemspecs to avoid raising Gem::NameTooLong
+  - serialize GemCache sources correctly, so locking works
+  - raise Bundler::GemNotFound instead of calling exit! inside library code
+  - Rubygems 1.3.5 compatibility for the adventurous, not supported by me :)
+
+Bugfixes:
+
+  - don't try to regenerate environment.rb if it is read-only
+  - prune outdated gems with the platform "ruby"
+  - prune cache without errors when there are directories or non-gem files
+  - don't re-write environment.rb if running after it has been loaded
+  - do not monkeypatch Specification#load_paths twice when inside a bundle
+
 ## 0.9.23 (April 20, 2010)
 
 Bugfixes:

data/lib/bundler.rb

@@ -5,8 +5,6 @@ require 'bundler/rubygems_ext'
 require 'bundler/version'
 
 module Bundler
-  ORIGINAL_ENV = ENV.to_hash
-
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
   autoload :Dsl,                 'bundler/dsl'
@@ -23,6 +21,9 @@ module Bundler
   autoload :Specification,       'bundler/shared_helpers'
   autoload :UI,                  'bundler/ui'
 
+  GEM_LOADED = true
+  ORIGINAL_ENV = ENV.to_hash
+
   class BundlerError < StandardError
     def self.status_code(code = nil)
       return @code unless code
@@ -70,22 +71,16 @@ module Bundler
     def gem_setup(*groups)
       return @setup if @setup
 
-      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!
+      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
     end
     alias setup gem_setup unless defined?(Bundler::ENV_LOADED)
@@ -97,8 +92,7 @@ module Bundler
 
     def load
       @load ||= begin
-        if current_env_file?
-          @gem_loaded = true
+        if !update_env_file?
           Kernel.require env_file
           Bundler
         else
@@ -176,8 +170,17 @@ module Bundler
       Gem.clear_paths
     end
 
-    def current_env_file?
-      env_file.exist? && (env_file.read(100) =~ /Bundler #{Bundler::VERSION}/)
+    def update_env_file?
+      if env_file.exist?
+        outdated = (env_file.read(100) !~ /Bundler #{Bundler::VERSION}/)
+        writable = env_file.writable?
+        if outdated && !writable
+          STDERR.puts "Cannot write to outdated .bundle/environment.rb to update it"
+        end
+        outdated && writable
+      else
+        true
+      end
     end
   end
 end

data/lib/bundler/dependency.rb

@@ -1,4 +1,5 @@
 require 'rubygems/dependency'
+require 'bundler/shared_helpers'
 
 module Bundler
   class Dependency < Gem::Dependency

data/lib/bundler/resolver.rb

@@ -98,8 +98,15 @@ module Bundler
       debug { "Requirements:\n" + reqs.map { |r| "  #{r.name} (#{r.requirement})"}.join("\n") }
 
       activated = activated.dup
-      # Pull off the first requirement so that we can resolve it
-      current   = reqs.shift
+
+      if reqs.first.name == "bundler" && !activated["bundler"]
+        # activate the current version of bundler before other versions
+        bundler_version = ENV["BUNDLER_VERSION"] || Bundler::VERSION
+        current = Gem::Dependency.new("bundler", bundler_version, reqs.first.type)
+      else
+        # Pull off the first requirement so that we can resolve it
+        current = reqs.shift
+      end
 
       debug { "Attempting:\n  #{current.name} (#{current.requirement})"}
 

data/lib/bundler/rubygems_ext.rb

@@ -10,7 +10,13 @@ module Gem
     attr_accessor :source, :location
 
     def load_paths
-      require_paths.map {|p| File.join(full_gem_path, p) }
+      require_paths.map do |require_path|
+        if require_path.include?(full_gem_path)
+          require_path
+        else
+          File.join(full_gem_path, require_path)
+        end
+      end
     end
 
     def groups

data/lib/bundler/runtime.rb

@@ -6,9 +6,7 @@ module Bundler
 
     def initialize(*)
       super
-      if locked?
-        write_rb_lock
-      end
+      write_rb_lock if locked? && !defined?(Bundler::ENV_LOADED)
     end
 
     def setup(*groups)
@@ -97,9 +95,9 @@ module Bundler
       FileUtils.mkdir_p(cache_path)
 
       Bundler.ui.info "Removing outdated .gem files from vendor/cache"
-      cache_path.children.each do |gem_path|
+      Pathname.glob(cache_path.join("*.gem")).each do |gem_path|
         cached_spec = Gem::Format.from_file_by_path(gem_path).spec
-        next unless cached_spec.platform =~ Gem::Platform.local
+        next unless Gem::Platform.match(cached_spec.platform)
         unless specs.any?{|s| s.full_name == cached_spec.full_name }
           Bundler.ui.info "  * #{File.basename(gem_path)}"
           gem_path.rmtree

data/lib/bundler/setup.rb

@@ -6,6 +6,7 @@ if Bundler::SharedHelpers.in_bundle?
   env_file = Bundler::SharedHelpers.env_file
   if env_file.exist?
     require env_file
+    Bundler.setup if defined?(Bundler::GEM_LOADED)
   else
     require 'bundler'
     begin

data/lib/bundler/source.rb

@@ -130,7 +130,10 @@ module Bundler
     end
 
     class GemCache
+      attr_reader :options
+
       def initialize(options)
+        @options = options
         @path = options["path"]
       end
 
@@ -251,7 +254,19 @@ module Bundler
     private
 
       def generate_bin(spec)
-        gem_dir  = spec.full_gem_path
+        gem_dir  = Pathname.new(spec.full_gem_path)
+
+        # Some gem authors put absolute paths in their gemspec
+        # and we have to save them from themselves
+        spec.files = spec.files.map do |p|
+          next if File.directory?(p)
+          begin
+            Pathname.new(p).relative_path_from(gem_dir).to_s
+          rescue ArgumentError
+            p
+          end
+        end.compact
+
         gem_file = Dir.chdir(gem_dir){ Gem::Builder.new(spec).build }
 
         installer = Gem::Installer.new File.join(gem_dir, gem_file),
@@ -380,6 +395,8 @@ module Bundler
         Dir.chdir(path) do
           git "fetch --force --quiet"
           git "reset --hard #{revision}"
+          git "submodule init"
+          git "submodule update"
         end
       end
 

data/lib/bundler/templates/environment.erb

@@ -87,5 +87,5 @@ module Bundler
   end
 
   # Set up load paths unless this file is being loaded after the Bundler gem
-  setup unless @gem_loaded
+  setup unless defined?(Bundler::GEM_LOADED)
 end

data/lib/bundler/version.rb

@@ -1,3 +1,3 @@
 module Bundler
-  VERSION = "0.9.23"
+  VERSION = "0.9.24"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 23
-  version: 0.9.23
+  - 24
+  version: 0.9.24
 platform: ruby
 authors: 
 - Carl Lerche
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -07:00
+date: 2010-04-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency