bundler 0.9.8 → 0.9.9

data/README.markdown

@@ -118,7 +118,7 @@ The command `bundle lock` will lock the bundle to the current set of
 resolved gems. This ensures that, until the lock file is removed,
 `bundle install` and `Bundle.setup` will always activate the same gems.
 
-When you are distributing your application, you should add the Gemfile and 
+When you are distributing your application, you should add the Gemfile and
 Gemfile.lock files to your source control, so that the set of libraries your
 code will run against are fixed. Simply run  `bundle install` after checking
 out or deploying your code to ensure your libraries are present.

data/lib/bundler.rb

@@ -4,7 +4,7 @@ require 'yaml'
 require 'bundler/rubygems_ext'
 
 module Bundler
-  VERSION = "0.9.8"
+  VERSION = "0.9.9"
 
   autoload :Definition,          'bundler/definition'
   autoload :Dependency,          'bundler/dependency'
@@ -118,8 +118,8 @@ module Bundler
         ENV['GEM_HOME'] = File.expand_path(bundle_path, root)
         ENV['GEM_PATH'] = ''
       else
-        gem_home, gem_path = Gem.dir, Gem.path
-        ENV["GEM_PATH"] = [gem_home, gem_path].flatten.compact.join(File::PATH_SEPARATOR)
+        paths = [Gem.dir, Gem.path].flatten.compact.reject{|p| p.empty? }
+        ENV["GEM_PATH"] = paths.join(File::PATH_SEPARATOR)
         ENV["GEM_HOME"] = bundle_path.to_s
       end
 

data/lib/bundler/rubygems_ext.rb

@@ -17,13 +17,19 @@ module Gem
       @groups ||= []
     end
 
-    alias_method :old_dependencies, :dependencies
+    module ImplicitRakeDependency
+      def dependencies
+        original = super
+        original << Dependency.new("rake", ">= 0") if implicit_rake_dependency?
+        original
+      end
 
-    def dependencies
-      original = old_dependencies
-      original << Dependency.new("rake", ">= 0") if extensions.any? { |e| e =~ /rakefile|mkrf_conf/i }
-      original
+      private
+        def implicit_rake_dependency?
+          extensions.any? { |e| e =~ /rakefile|mkrf_conf/i }
+        end
     end
+    include ImplicitRakeDependency
   end
 
   class Dependency

data/lib/bundler/source.rb

@@ -78,7 +78,7 @@ module Bundler
         @specs ||= begin
           index = Index.new
 
-          Gem::SourceIndex.from_installed_gems.reverse_each do |name, spec|
+          Gem::SourceIndex.from_installed_gems.to_a.reverse.each do |name, spec|
             spec.source = self
             index << spec
           end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: bundler
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Carl Lerche
@@ -10,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 -08:00
-default_executable: bundle
+date: 2010-02-25 00:00:00 -08:00
+default_executable: 
 dependencies: []
 
 description: 
@@ -69,10 +74,9 @@ has_rdoc: true
 homepage: http://github.com/carlhuda/bundler
 licenses: []
 
-post_install_message: |
+post_install_message: |-
   Due to a rubygems bug, you must uninstall older versions of the bundler gem for 0.9 to work.
   If you still need bundler 0.8, install the 'bundler08' gem.
-
 rdoc_options: []
 
 require_paths: 
@@ -81,18 +85,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 5
       version: 1.3.5
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Bundles are fun