bundler 1.0.21 → 1.1.rc

data/.travis.yml

@@ -7,6 +7,7 @@ script: rake spec:travis
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
 
 env:
   - RGV=v1.3.6
@@ -26,6 +27,12 @@ matrix:
       env: RGV=v1.3.7
     - rvm: 1.9.2
       env: RGV=v1.4.2
+    - rvm: 1.9.3
+      env: RGV=v1.3.6
+    - rvm: 1.9.3
+      env: RGV=v1.3.7
+    - rvm: 1.9.3
+      env: RGV=v1.4.2
 
 notifications:
   email:

data/CHANGELOG.md

@@ -1,3 +1,155 @@
+## 1.1.rc (Oct 3, 2011)
+
+Features:
+
+  - add `--shebang` option to bundle install (@bensie, #1467)
+  - build passes on ruby 1.9.3rc1 (#1458, #1469)
+  - hide basic auth credentials for custom sources (#1440, #1463)
+
+Bugfixes:
+
+  - fix index search result caching (#1446, #1466)
+  - fix fetcher prints multiple times during install (#1445, #1462)
+  - don't mention API errors from non-rubygems.org sources
+  - fix autoclean so it doesn't remove bins that are used (#1459, #1460)
+
+Documentation:
+
+  - add :require => [...] to the gemfile(5) manpage (@nono, #1468)
+
+## 1.1.pre.10 (Sep 27, 2011)
+
+Features:
+
+  - `config system_bindir foo` added, works like "-n foo" in your .gemrc file
+
+## 1.1.pre.9 (Sep 18, 2011)
+
+Features:
+
+  - `clean` will now clean up all old .gem and .gemspec files, cleaning up older pres
+  - `clean` will be automatically run after bundle install and update when using `--path` (#1420, #1425)
+  - `clean` now takes a `--force` option (#1247, #1426)
+  - `clean` will clean up cached git dirs in bundle clean (#1390)
+  - remove deprecations from DSL (#1119)
+  - autorequire tries directories for gems with dashed names (#1205)
+  - adds a `--paths` flag to `bundle show` to list all the paths of bundled gems (@tiegz, #1360)
+  - load rubygems plugins in the bundle binary (@tpope, #1364)
+  - make `--standalone` respect `--path` (@cowboyd, #1361)
+
+Bugfixes:
+
+  - Fix `clean` to handle nested gems in a git repo (#1329)
+  - Fix conflict from revert of benchmark tool (@boffbowsh, #1355)
+  - Fix fatal error when unable to connect to gem source (#1269)
+  - Fix `outdated` to find pre-release gems that are installed. (#1359)
+  - Fix color for ui. (#1374)
+  - Fix installing to user-owned system gems on OS X
+  - Fix caching issue in the resolver (#1353, #1421)
+  - Fix :github DSL option
+
+## 1.1.pre.8 (Aug 13, 2011)
+
+Bugfixes:
+
+  - Fix `bundle check` to not print fatal error message (@cldwalker, #1347)
+  - Fix require_sudo when Gem.bindir isn't writeable (#1352)
+  - Fix not asking Gemcutter API for dependency chain of git gems in --deployment (#1254)
+  - Fix `install --binstubs` when using --path (#1332)
+
+## 1.1.pre.7 (Aug 8, 2011)
+
+Bugfixes:
+
+  - Fixed invalid byte sequence error while installing gem on Ruby 1.9 (#1341)
+  - Fixed exception when sudo was needed to install gems (@spastorino)
+
+## 1.1.pre.6 (Aug 8, 2011)
+
+Bugfixes:
+
+  - Fix cross repository dependencies (#1138)
+  - Fix git dependency fetching from API endpoint (#1254)
+  - Fixes for bundle outdated (@joelmoss, #1238)
+  - Fix bundle standalone when using the endpoint (#1240)
+
+Features:
+
+  - Implement `to_ary` to avoid calls to method_missing (@tenderlove, #1274)
+  - bundle clean removes old .gem files (@cldwalker, #1293)
+  - Correcly identify missing child dependency in error message
+  - Run pre-install, post-build, and post-install gem hooks for git gems (@warhammerkid, #1120)
+  - create Gemfile.lock for empty Gemfile (#1218)
+
+## 1.1.pre.5 (June 11, 2011)
+
+Bugfixes:
+
+  - Fix LazySpecification on Ruby 1.9 (@dpiddy, #1232)
+  - Fix HTTP proxy support (@leobessa, #878)
+
+Features:
+
+  - Speed up `install --deployment` by using the API endpoint
+  - Support Basic HTTP Auth for the API endpoint (@dpiddy, #1229)
+  - Add `install --full-index` to disable the API endpoint, just in case
+  - Significantly speed up install by removing unneeded gemspec fetches
+  - `outdated` command shows outdated gems (@joelmoss, #1130)
+  - Print gem post install messages (@csquared, #1155)
+  - Reduce memory use by removing Specification.new inside method_missing (@tenderlove, #1222)
+  - Allow `check --path`
+
+## 1.1.pre.4 (May 5, 2011)
+
+Bugfixes:
+
+  - Fix bug that could prevent installing new gems
+
+## 1.1.pre.3 (May 4, 2011)
+
+Features:
+
+  - Add `bundle outdated` to show outdated gems (@joelmoss)
+  - Remove BUNDLE_* from `Bundler.with_clean_env` (@wuputah)
+  - Add Bundler.clean_system, and clean_exec (@wuputah)
+  - Use git config for gem author name and email (@krekoten)
+
+Bugfixes:
+
+  - Fix error calling Bundler.rubygems.gem_path
+  - Fix error when Gem.path returns Gem::FS instead of String
+
+## 1.1.pre.2 (April 28, 2011)
+
+Features:
+
+  - Add :github option to Gemfile DSL for easy git repos
+  - Merge all fixes from 1.0.12 and 1.0.13
+
+## 1.1.pre.1 (February 2, 2011)
+
+Bugfixes:
+
+  - Compatibility with changes made by Rubygems 1.5
+
+## 1.1.pre (January 21, 2011)
+
+Features:
+
+  - Add bundle clean. Removes unused gems from --path directory
+  - Initial Gemcutter Endpoint API work, BAI Fetching source index
+  - Added bundle install --standalone
+  - Ignore Gemfile.lock when buliding new gems
+  - Make it possible to override a .gemspec dependency's source in the
+    Gemfile
+
+Removed:
+
+  - Removed bundle lock
+  - Removed bundle install <path>
+  - Removed bundle install --production
+  - Removed bundle install --disable-shared-gems
+
 ## 1.0.21 (September 30, 2011)
 
   - No changes from RC
@@ -181,7 +333,7 @@ Bugfixes:
 
   - Fix a bug where Bundler.require could remove gems from the load
     path. In Rails apps with a default application.rb, this removed
-    all gems in groups other than :default and Rails.env.
+    all gems in groups other than :default and Rails.env
 
 ## 1.0.8 (January 18, 2011)
 

data/README.md

@@ -12,17 +12,17 @@ See [gembundler.com](http://gembundler.com) for up-to-date installation and usag
 
 ### Troubleshooting
 
-For help with common problems, see [ISSUES](http://github.com/carlhuda/bundler/blob/master/ISSUES.md).
+For help with common problems, see [ISSUES](https://github.com/carlhuda/bundler/blob/master/ISSUES.md).
 
 ### Development
 
-To see what has changed in recent versions of bundler, see the [CHANGELOG](http://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
+To see what has changed in recent versions of bundler, see the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
 
 The `master` branch contains our current progress towards version 1.1. Because of that, please submit bugfix pull requests against the `1-0-stable` branch.
 
 ### Upgrading from Bundler 0.8 to 0.9 and above
 
-See [UPGRADING](http://github.com/carlhuda/bundler/blob/master/UPGRADING.md).
+See [UPGRADING](https://github.com/carlhuda/bundler/blob/master/UPGRADING.md).
 
 ### Other questions
 

data/Rakefile

@@ -34,6 +34,13 @@ begin
       rm_rf 'tmp'
     end
 
+    desc "Run the real-world spec suite (reequires internet)"
+    task :realworld => ["set_realworld", "spec"]
+
+    task :set_realworld do
+      ENV['BUNDLER_REALWORLD_TESTS'] = '1'
+    end
+
     desc "Run the spec suite with the sudo tests"
     task :sudo => ["set_sudo", "spec", "clean_sudo"]
 
@@ -59,6 +66,7 @@ begin
         # Create tasks like spec:rubygems:v1.8.3:sudo to run the sudo specs
         namespace rg do
           task :sudo => ["set_sudo", rg, "clean_sudo"]
+          task :realworld => ["set_realworld", rg]
         end
 
         task "clone_rubygems_#{rg}" do
@@ -96,33 +104,8 @@ begin
       task "rubygems:all" => "co"
     end
 
-    namespace :ruby do
-      # Ruby 1.8.6, 1.8.7, and 1.9.2 specs
-      task "ensure_rvm" do
-        raise "RVM is not available" unless File.exist?(File.expand_path("~/.rvm/scripts/rvm"))
-      end
-
-      %w(1.8.6-p420 1.8.7-p334 1.9.2-p180).each do |ruby|
-        ruby_cmd = File.expand_path("~/.rvm/bin/ruby-#{ruby}")
-
-        desc "Run specs on Ruby #{ruby}"
-        RSpec::Core::RakeTask.new(ruby) do |t|
-          t.rspec_opts = %w(-fs --color)
-          t.ruby_opts  = %w(-w)
-        end
-
-        task "ensure_ruby_#{ruby}" do
-          raise "Could not find Ruby #{ruby} at #{ruby_cmd}" unless File.exist?(ruby_cmd)
-        end
-
-        task "ensure_ruby_#{ruby}" => "ensure_rvm"
-        task ruby => "ensure_ruby_#{ruby}"
-        task "ruby:all" => ruby
-      end
-    end
-
     desc "Run the tests on Travis CI against a rubygem version (using ENV['RGV'])"
-    task "travis" do
+    task :travis do
       rg = ENV['RGV'] || 'master'
 
       puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
@@ -133,7 +116,12 @@ begin
       puts "\n\e[1;33m[Travis CI] Running bundler sudo specs against rubygems #{rg}\e[m\n\n"
       sudos = safe_task { Rake::Task["spec:rubygems:#{rg}:sudo"].invoke }
 
-      unless specs && sudos
+      Rake::Task["spec:rubygems:#{rg}"].reenable
+
+      puts "\n\e[1;33m[Travis CI] Running bundler real world specs against rubygems #{rg}\e[m\n\n"
+      realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }
+
+      unless specs && sudos && realworld
         fail "Bundler tests failed, please review the log for more information"
       end
     end

data/bin/bundle

@@ -19,4 +19,11 @@ rescue Interrupt => e
   Bundler.ui.error "\nQuitting..."
   Bundler.ui.debug e.backtrace.join("\n")
   exit 1
+rescue SystemExit => e
+  exit e.status
+rescue Exception => e
+  Bundler.ui.error "Unfortunately, a fatal error has occurred. " +
+    "Please report this error to the Bundler issue tracker at " +
+    "https://github.com/carlhuda/bundler/issues so that we can fix it. Thanks!"
+  raise e
 end

data/bundler.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "bundler"
 
   s.add_development_dependency "ronn"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", "~> 2.0"
 
   # Man files are required because they are ignored by git
   man_files            = Dir.glob("lib/bundler/man/**/*")

data/lib/bundler/cli.rb

@@ -92,8 +92,12 @@ module Bundler
     D
     method_option "gemfile", :type => :string, :banner =>
       "Use the specified gemfile instead of Gemfile"
+    method_option "path", :type => :string, :banner =>
+      "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     def check
       ENV['BUNDLE_GEMFILE'] = File.expand_path(options[:gemfile]) if options[:gemfile]
+
+      Bundler.settings[:path] = File.expand_path(options[:path]) if options[:path]
       begin
         not_installed = Bundler.definition.missing_specs
       rescue GemNotFound, VersionConflict
@@ -126,8 +130,6 @@ module Bundler
     D
     method_option "without", :type => :array, :banner =>
       "Exclude gems that are part of the specified named group."
-    method_option "disable-shared-gems", :type => :boolean, :banner =>
-      "This option is deprecated. Please do not use it."
     method_option "gemfile", :type => :string, :banner =>
       "Use the specified gemfile instead of Gemfile"
     method_option "no-prune", :type => :boolean, :banner =>
@@ -140,6 +142,8 @@ module Bundler
       "Do not attempt to fetch gems remotely and use the gem cache instead"
     method_option "binstubs", :type => :string, :lazy_default => "bin", :banner =>
       "Generate bin stubs for bundled gems to ./bin"
+    method_option "shebang", :type => :string, :banner =>
+      "Specify a different shebang executable name than the default (usually 'ruby')"
     method_option "path", :type => :string, :banner =>
       "Specify a different path than the system default ($BUNDLE_PATH or $GEM_HOME). Bundler will remember this value for future installs on this machine"
     method_option "system", :type => :boolean, :banner =>
@@ -148,7 +152,13 @@ module Bundler
       "Do not allow the Gemfile.lock to be updated after this install"
     method_option "deployment", :type => :boolean, :banner =>
       "Install using defaults tuned for deployment environments"
-    def install(path = nil)
+    method_option "standalone", :type => :array, :lazy_default => [], :banner =>
+      "Make a bundle that can work without the Bundler runtime"
+    method_option "full-index", :tpye => :boolean, :banner =>
+      "Use the rubygems modern index instead of the API endpoint"
+    method_option "clean", :type => :boolean, :default => true, :banner =>
+      "Run bundle clean automatically after clean"
+    def install
       opts = options.dup
       if opts[:without]
         opts[:without].map!{|g| g.split(" ") }
@@ -163,28 +173,12 @@ module Bundler
       # Just disable color in deployment mode
       Bundler.ui.shell = Thor::Shell::Basic.new if opts[:deployment]
 
-      if (path || opts[:path] || opts[:deployment]) && opts[:system]
+      if (opts[:path] || opts[:deployment]) && opts[:system]
         Bundler.ui.error "You have specified both a path to install your gems to, \n" \
                          "as well as --system. Please choose."
         exit 1
       end
 
-      if path && opts[:path]
-        Bundler.ui.error "You have specified a path via `bundle install #{path}` as well as\n" \
-                         "by `bundle install --path #{options[:path]}`. These options are\n" \
-                         "equivalent, so please use one or the other."
-        exit 1
-      end
-
-      if opts["disable-shared-gems"]
-        Bundler.ui.error "The disable-shared-gem option is no longer available.\n\n" \
-                         "Instead, use `bundle install` to install to your system,\n" \
-                         "or `bundle install --path path/to/gems` to install to an isolated\n" \
-                         "location. Bundler will resolve relative paths relative to\n" \
-                         "your `Gemfile`."
-        exit 1
-      end
-
       if opts[:deployment] || opts[:frozen]
         unless Bundler.default_lockfile.exist?
           flag = opts[:deployment] ? '--deployment' : '--frozen'
@@ -206,16 +200,22 @@ module Bundler
         opts[:system] = true
       end
 
-      Bundler.settings[:path] = nil if opts[:system]
-      Bundler.settings[:path] = "vendor/bundle" if opts[:deployment]
-      Bundler.settings[:path] = path if path
-      Bundler.settings[:path] = opts[:path] if opts[:path]
-      Bundler.settings[:bin] = opts["binstubs"] if opts[:binstubs]
+      # Can't use Bundler.settings for this because settings needs gemfile.dirname
+      Bundler.settings[:path]   = nil if opts[:system]
+      Bundler.settings[:path]   = "vendor/bundle" if opts[:deployment]
+      Bundler.settings[:path]   = opts[:path] if opts[:path]
+      Bundler.settings[:path] ||= "bundle" if opts[:standalone]
+      Bundler.settings[:bin]    = opts["binstubs"] if opts[:binstubs]
+      Bundler.settings[:shebang] = opts["shebang"] if opts[:shebang]
       Bundler.settings[:no_prune] = true if opts["no-prune"]
       Bundler.settings[:disable_shared_gems] = Bundler.settings[:path] ? '1' : nil
       Bundler.settings.without = opts[:without]
       Bundler.ui.be_quiet! if opts[:quiet]
 
+      Bundler::Fetcher.disable_endpoint = opts["full-index"]
+      # rubygems plugins sometimes hook into the gem install process
+      Gem.load_plugins if Gem.respond_to?(:load_plugins)
+
       Installer.install(Bundler.root, Bundler.definition, opts)
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
 
@@ -228,12 +228,11 @@ module Bundler
         Bundler.ui.confirm "Your bundle is complete! " +
           "Use `bundle show [gemname]` to see where a bundled gem is installed."
       end
-
-      if path
-        Bundler.ui.warn "The path argument to `bundle install` is deprecated. " +
-          "It will be removed in version 1.1. " +
-          "Please use `bundle install --path #{path}` instead."
+      Installer.post_install_messages.to_a.each do |name, msg|
+        Bundler.ui.confirm "Post-install message from #{name}:\n#{msg}"
       end
+
+      clean if opts["clean"] && Bundler.settings[:path]
     rescue GemNotFound => e
       if opts[:local] && Bundler.app_cache.exist?
         Bundler.ui.warn "Some gems seem to be missing from your vendor/cache directory."
@@ -254,6 +253,8 @@ module Bundler
     method_option "source", :type => :array, :banner => "Update a specific source (and all gems associated with it)"
     method_option "local", :type => :boolean, :banner =>
       "Do not attempt to fetch gems remotely and use the gem cache instead"
+    method_option "clean", :type => :boolean, :default => true, :banner =>
+      "Run bundle clean automatically after clean"
     def update(*gems)
       sources = Array(options[:source])
 
@@ -265,32 +266,32 @@ module Bundler
       end
 
       opts = {"update" => true, "local" => options[:local]}
+      # rubygems plugins sometimes hook into the gem install process
+      Gem.load_plugins if Gem.respond_to?(:load_plugins)
+
       Installer.install Bundler.root, Bundler.definition, opts
       Bundler.load.cache if Bundler.root.join("vendor/cache").exist?
+      clean if options["clean"] && Bundler.settings[:path]
       Bundler.ui.confirm "Your bundle is updated! " +
         "Use `bundle show [gemname]` to see where a bundled gem is installed."
     end
 
-    desc "lock", "Locks the bundle to the current set of dependencies, including all child dependencies."
-    def lock
-      Bundler.ui.warn "Lock is deprecated. Your bundle is now locked whenever you run `bundle install`."
-    end
-
-    desc "unlock", "Unlock the bundle. This allows gem versions to be changed."
-    def unlock
-      Bundler.ui.warn "Unlock is deprecated. To update to newer gem versions, use `bundle update`."
-    end
-
     desc "show [GEM]", "Shows all gems that are part of the bundle, or the path to a given gem"
     long_desc <<-D
       Show lists the names and versions of all gems that are required by your Gemfile.
       Calling show with [GEM] will list the exact location of that gem on your machine.
     D
+    method_option "paths", :type => :boolean,
+      :banner => "List the paths of all gems that are required by your Gemfile."
     def show(gem_name = nil)
       Bundler.load.lock
 
       if gem_name
         Bundler.ui.info locate_gem(gem_name)
+      elsif options[:paths]
+        Bundler.load.specs.sort_by { |s| s.name }.each do |s|
+          Bundler.ui.info locate_gem(s.name)
+        end
       else
         Bundler.ui.info "Gems included by the bundle:"
         Bundler.load.specs.sort_by { |s| s.name }.each do |s|
@@ -300,6 +301,71 @@ module Bundler
     end
     map %w(list) => "show"
 
+    desc "outdated [GEM]", "list installed gems with newer versions available"
+    long_desc <<-D
+      Outdated lists the names and versions of gems that have a newer version available
+      in the given source. Calling outdated with [GEM [GEM]] will only check for newer
+      versions of the given gems. By default, available prerelease gems will be ignored.
+    D
+    method_option "pre", :type => :boolean, :banner => "Check for newer pre-release gems"
+    method_option "source", :type => :array, :banner => "Check against a specific source"
+    method_option "local", :type => :boolean, :banner =>
+      "Do not attempt to fetch gems remotely and use the gem cache instead"
+    def outdated(*gems)
+      sources = Array(options[:source])
+      current_specs = Bundler.load.specs
+
+      if gems.empty? && sources.empty?
+        # We're doing a full update
+        definition = Bundler.definition(true)
+      else
+        definition = Bundler.definition(:gems => gems, :sources => sources)
+      end
+      options["local"] ? definition.resolve_with_cache! : definition.resolve_remotely!
+
+      Bundler.ui.info ""
+      if options["pre"]
+        Bundler.ui.info "Outdated gems included in the bundle (including pre-releases):"
+      else
+        Bundler.ui.info "Outdated gems included in the bundle:"
+      end
+
+      out_count = 0
+      definition.specs.each do |spec|
+        next if !gems.empty? && !gems.include?(spec.name)
+
+        spec.source.fetch(spec) if spec.source.respond_to?(:fetch)
+
+        if spec.source.is_a?(Bundler::Source::Git)
+          current = current_specs.find{|s| spec.name == s.name }
+          next if current.nil?
+        else
+          current = spec
+          spec = definition.index[current.name].sort_by{|b| b.version }
+
+          if !current.version.prerelease? && !options[:pre] && spec.size > 1
+            spec = spec.delete_if{|b| b.respond_to?(:version) && b.version.prerelease? }
+          end
+
+          spec = spec.last
+          next if spec.nil?
+        end
+
+        gem_outdated = Gem::Version.new(spec.version) > Gem::Version.new(current.version)
+        git_outdated = current.git_version != spec.git_version
+        if gem_outdated || git_outdated
+          spec_version    = "#{spec.version}#{spec.git_version}"
+          current_version = "#{current.version}#{current.git_version}"
+          Bundler.ui.info "  * #{spec.name} (#{spec_version} > #{current_version})"
+          out_count += 1
+        end
+        Bundler.ui.debug "from #{spec.loaded_from}"
+      end
+
+      Bundler.ui.info "  Your bundle is up to date!" if out_count < 1
+      Bundler.ui.info ""
+    end
+
     desc "cache", "Cache all the gems to vendor/cache", :hide => true
     method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     def cache
@@ -478,12 +544,16 @@ module Bundler
       constant_name = name.split('_').map{|p| p[0..0].upcase + p[1..-1] }.join
       constant_name = constant_name.split('-').map{|q| q[0..0].upcase + q[1..-1] }.join('::') if constant_name =~ /-/
       constant_array = constant_name.split('::')
-      git_author_name = `git config user.name`.chomp
-      git_author_email = `git config user.email`.chomp
-      author_name = git_author_name.empty? ? "TODO: Write your name" : git_author_name
-      author_email = git_author_email.empty? ? "TODO: Write your email address" : git_author_email
       FileUtils.mkdir_p(File.join(target, 'lib', name))
-      opts = {:name => name, :constant_name => constant_name, :constant_array => constant_array, :author_name => author_name, :author_email => author_email}
+      git_user_name = `git config user.name`.chomp
+      git_user_email = `git config user.email`.chomp
+      opts = {
+        :name           => name,
+        :constant_name  => constant_name,
+        :constant_array => constant_array,
+        :author         => git_user_name.empty? ? "TODO: Write your name" : git_user_name,
+        :email          => git_user_email.empty? ? "TODO: Write your email address" : git_user_email
+      }
       template(File.join("newgem/Gemfile.tt"),               File.join(target, "Gemfile"),                opts)
       template(File.join("newgem/Rakefile.tt"),              File.join(target, "Rakefile"),               opts)
       template(File.join("newgem/gitignore.tt"),             File.join(target, ".gitignore"),             opts)
@@ -501,6 +571,17 @@ module Bundler
       File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
     end
 
+    desc "clean", "Cleans up unused gems in your bundler directory"
+    method_option "force", :type => :boolean, :default => false, :banner =>
+      "forces clean even if --path is set"
+    def clean
+      if Bundler.settings[:path] || options[:force]
+        Bundler.load.clean
+      else
+        Bundler.ui.error "Can only use bundle clean when --path is set or --force is set"
+      end
+    end
+
   private
 
     def have_groff?

data/lib/bundler/definition.rb

@@ -141,6 +141,10 @@ module Bundler
           @locked_specs
         else
           last_resolve = converge_locked_specs
+
+          # Record the specs available in each gem's source, so that those
+          # specs will be available later when the resolver knows where to
+          # look for that gemspec (or its dependencies)
           source_requirements = {}
           dependencies.each do |dep|
             next unless dep.source
@@ -155,17 +159,30 @@ module Bundler
 
     def index
       @index ||= Index.build do |idx|
-        @sources.each do |s|
-          idx.use s.specs
+        other_sources = @sources.find_all{|s| !s.is_a?(Bundler::Source::Rubygems) }
+        rubygems_sources = @sources.find_all{|s| s.is_a?(Bundler::Source::Rubygems) }
+
+        dependency_names = @dependencies.dup || []
+        dependency_names.map! {|d| d.name }
+        other_sources.each do |s|
+          source_index = s.specs
+          dependency_names += source_index.unmet_dependency_names
+          idx.add_source source_index
+        end
+
+        rubygems_sources.each do |s|
+          s.dependency_names = dependency_names.uniq if s.is_a?(Bundler::Source::Rubygems)
+          idx.add_source s.specs
         end
       end
     end
 
+    # used when frozen is enabled so we can find the bundler
+    # spec, even if (say) a git gem is not checked out.
     def rubygems_index
       @rubygems_index ||= Index.build do |idx|
-        @sources.find_all{|s| s.is_a?(Source::Rubygems) }.each do |s|
-          idx.use s.specs
-        end
+        rubygems = @sources.find{|s| s.is_a?(Source::Rubygems) }
+        idx.add_source rubygems.specs
       end
     end
 

data/lib/bundler/dep_proxy.rb

@@ -0,0 +1,35 @@
+module Bundler
+  class DepProxy
+
+    attr_reader :required_by, :__platform, :dep
+
+    def initialize(dep, platform)
+      @dep, @__platform, @required_by = dep, platform, []
+    end
+
+    def hash
+      @hash ||= dep.hash
+    end
+
+    def ==(o)
+      dep == o.dep && __platform == o.__platform
+    end
+
+    alias eql? ==
+
+    def type
+      @dep.type
+    end
+
+    def to_s
+      "#{name} (#{requirement}) #{__platform}"
+    end
+
+  private
+
+    def method_missing(*args)
+      @dep.send(*args)
+    end
+
+  end
+end