bundler 1.3.6 → 1.4.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7304a63f3f93180bfc448131ffa016885410d872
-  data.tar.gz: 24ef788f45ff1f976584b293fc207b413d82548e
+  metadata.gz: 1fb14de795ee1e2465028243460a3fb96dfdbcaa
+  data.tar.gz: 12561bb2d356025acecf0256224ae8e6ded869d5
 SHA512:
-  metadata.gz: c823ec338057eeda5c740b53a0981c7db020cbde644ec656c8aa55a75be5ff65a9a1c352450a3ecb4c3ea930e830021426f593860fa1c9c057d8e5f6b2f32836
-  data.tar.gz: 059bacb8d560f78ec5fa123dc806c5d458e96260b64993912b888f666bc8b4d2e03afba9cea68640146a3b6206eea571bfa664976845f8e9f4063211ee73385a
+  metadata.gz: 1a4e14da992b28d578950b11b3cd2fedbbb79f33300106c979a365a205be106f8922ef272566eb44145b8ff131a0def5646dd6929ea90a8a95642413cbc3bffb
+  data.tar.gz: 51d99c4f9383fbb0685d72f120b2ae8117e9b0d084f88517fa8429c7084c604e1458394c72ec4de911a17944f7d020e3ac87437b46fe3a8113b0e11d6710a8c5

data/.travis.yml

@@ -33,14 +33,12 @@ env:
   # we need to know if changes to rubygems will break bundler on release
   - RGV=master
   # test the latest rubygems release with all of our supported rubies
-  - RGV=v2.0.6
-  - RGV=2.0
+  - RGV=v2.0.3
 matrix:
   allow_failures:
     # we want to know how we're doing with head, but not fail the build
     - rvm: ruby-head
     - env: RGV=master
-    - env: RGV=2.0
     # 1.9.2 is simply too slow. it sometimes exceeds the 25m hard limit.
     - rvm: 1.9.2
   include:

data/CHANGELOG.md

@@ -1,22 +1,35 @@
+## 1.4.0.pre.1 (2013-08-04)
+
+Features:
+
+  - retry network requests while installing gems (#2561, @ascherger)
+  - faster installs using gemspecs from the local system cache (#2497, @mipearson)
+  - add `bundle install -jN` for N parallel gem installations (#2481, @eagletmt)
+  - add `ENV['DEBUG_RESOLVER_TREE']` outputs resolver tree (@dblock)
+  - set $MANPATH so `bundle exec man name` works (#1624, @sunaku)
+  - use `man` instead of `groff` (#2579, @ixti, @simi)
+  - add Gemfile dependency info to bundle outdated output (#2487, @rahearn)
+  - allow `require: true` as an alias for `require: <name>` (#2538, @ndbroadbent)
+  - rescue and report Thor errors (#2478, @pjvds)
+  - detect cyclic dependencies (#2564, @gnufied)
+  - support multiple gems in `binstubs` (#2576, @lucasmazza)
+  - use https instead of git for :github gems (#2569, @fuadsaud)
+  - add quiet option to `bundle package` (#2573, @shtirlic)
+  - use RUBYLIB instead of RUBYOPT for better Windows support (#2536, @equinux)
+
+Bugfixes:
+
+  - reduce stack size while resolving to fix JRuby overflow (#2510, @headius)
+  - display GitErrors while loading specs in --verbose mode (#2461)
+  - allow the same options hash to be passed to multiple gems (#2447)
+  - handle missing binaries without an exception (#2019, @luismreis)
+
 ## 1.3.6
 
 Bugfixes:
 
+  - set --no-cache when bundle install --local is called (@TimMoore)
   - make gemspec path option preserve relative paths in lock file (@bwillis)
-  - use umask when creating binstubs (#1618, @v-yarotsky)
-  - warn if graphviz is not installed (#2435, @Agis-)
-  - show git errors while loading gemspecs
-  - don't mutate gem method options hash (#2447)
-  - print Thor errors (#2478, @pjvds)
-  - print Rubygems system exit errors (James Cook)
-  - more Pathnames into Strings for MacRuby (@kml)
-  - preserve original gemspec path (@bwillis)
-  - remove warning about deps with :git (#1651, @ixti)
-  - split git files on null (#2634, @jasonmp85)
-  - handle cross-host redirects without SSL (#2686, @grddev)
-  - handle Rubygems 2 security exception (@zzak)
-  - reinstall gems if they are missing with spec present
-  - set binstub permissions using umask (#1618, @v-yarotsky)
 
 ## 1.3.5 (3 April 2013)
 

data/CONTRIBUTING.md

@@ -1,6 +1,6 @@
 # Creating Issues
 
-If you're having a problem, please see [ISSUES](https://github.com/carlhuda/bundler/blob/master/ISSUES.md) for troubleshooting steps and a guide for how to submit a ticket that will help us solve the problem you are having as quickly as possible.
+If you're having a problem, please see [ISSUES](https://github.com/bundler/bundler/blob/master/ISSUES.md) for troubleshooting steps and a guide for how to submit a ticket that will help us solve the problem you are having as quickly as possible.
 
 # Discussing Bundler
 
@@ -8,6 +8,6 @@ If you'd like to discuss features, ask questions, or just engage in general Bund
 
 # Helping Out
 
-If you'd like to help make Bundler better, you totally rock! Please check out the [CONTRIBUTE](https://github.com/carlhuda/bundler/blob/master/CONTRIBUTE.md) file for an introduction to the project, guidelines for contributing, and suggestions for things anyone can do that would be helpful.
+If you'd like to help make Bundler better, you totally rock! Please check out the [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md) file for an introduction to the project, guidelines for contributing, and suggestions for things anyone can do that would be helpful.
 
 Thanks for helping us make Bundler better.

data/{CONTRIBUTE.md → DEVELOPMENT.md}

@@ -1,6 +1,6 @@
-Great to have you here! Here are a few ways you can help out with [Bundler](http://github.com/carlhuda/bundler).
+Great to have you here! Here are a few ways you can help out with [Bundler](http://github.com/bundler/bundler).
 
-# Learn & listen
+# Where should I start?
 
 You can start learning about Bundler by reading [the documentation](http://gembundler.com). If you want, you can also read a (lengthy) explanation of [why Bundler exists and what it does](http://gembundler.com/v1.2/rationale.html). You can also check out discussions about Bundler on the [Bundler mailing list](https://groups.google.com/group/ruby-bundler) and in the [Bundler IRC channel](irc://irc.freenode.net/#bundler), which is #bundler on Freenode.
 
@@ -8,14 +8,33 @@ You can start learning about Bundler by reading [the documentation](http://gembu
 
 The Bundler core team consists of André Arko ([@indirect](http://github.com/indirect)), Terence Lee ([@hone](http://github.com/hone)), and Jessica Lynn Suttles ([@jlsuttles](http://github.com/jlsuttles)), with support and advice from original Bundler author Yehuda Katz ([@wycats](http://github.com/wycats)).
 
+# Development setup
+
+Bundler doesn't use a Gemfile to list development dependencies, because when we tried it we couldn't tell if we were awake or it was just another level of dreams. To work on Bundler, you'll probably want to do a couple of things.
+
+  1. Install Bundler's development dependencies
+
+        $ rake spec:deps
+
+  2. Run the test suite, to make sure things are working
+
+        $ rake spec
+
+  3. Set up a shell alias to run Bundler from your clone, e.g. a Bash alias:
+
+        $ alias dbundle='ruby -I /path/to/bundler/lib /path/to/bundler/bin/bundle'
+
+     With that set up, you can test changes you've made to Bundler by running `dbundle`, without interfering with the regular `bundle` command.
+
+
 # Adding new features
 
-When adding a new feature to Bundler, please follow these steps:
+If you would like to add a new feature to Bundler, please follow these steps:
 
-  1. [Create an issue](https://github.com/carlhuda/bundler/issues/new) to discuss your feature.
+  1. [Create an issue](https://github.com/bundler/bundler/issues/new) to discuss your feature.
   2. Base your commits on the master branch, since we follow [SemVer](http://semver.org) and don't add new features to old releases.
   3. Commit the code and at least one test covering your changes to a feature branch in your fork.
-  4. Put a line in the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the "Features" heading.
+  4. Put a line in the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the "Features" heading.
   5. Send us a [pull request](https://help.github.com/articles/using-pull-requests) from your feature branch.
 
 If you don't hear back immediately, don’t get discouraged! We all have day jobs, but we respond to most tickets within a day or two.
@@ -24,9 +43,9 @@ If you don't hear back immediately, don’t get discouraged! We all have day job
 
 Triage is the work of processing tickets that have been opened into actionable issues, feature requests, or bug reports. That includes verifying bugs, categorizing the ticket, and ensuring there's enough information to reproduce the bug for anyone who wants to try to fix it.
 
-We've created an [issues guide](https://github.com/carlhuda/bundler/blob/master/ISSUES.md) to walk Bundler users through the process of troubleshooting issues and reporting bugs.
+We've created an [issues guide](https://github.com/bundler/bundler/blob/master/ISSUES.md) to walk Bundler users through the process of troubleshooting issues and reporting bugs.
 
-If you'd like to help, awesome! You can [report a new bug](https://github.com/carlhuda/bundler/issues/new) or browse our [existing open tickets](https://github.com/carlhuda/bundler/issues).
+If you'd like to help, awesome! You can [report a new bug](https://github.com/bundler/bundler/issues/new) or browse our [existing open tickets](https://github.com/bundler/bundler/issues).
 
 Not every ticket will point to a bug in Bundler's code, but open tickets usually mean that there is something we could improve to help that user. Sometimes that means writing additional documentation, sometimes that means making error messages clearer, and sometimes that means explaining to a user that they need to install git to use git gems.
 
@@ -45,7 +64,7 @@ If you can reproduce an issue, you're well on your way to fixing it. :) Fixing i
   1. Discuss the fix on the existing issue. Coordinating with everyone else saves duplicate work and serves as a great way to get suggestions and ideas if you need any.
   2. Base your commits on the correct branch. Bugfixes for 1.x versions of Bundler should be based on the matching 1-x-stable branch.
   3. Commit the code and at least one test covering your changes to a named branch in your fork.
-  4. Put a line in the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the “Bugfixes” heading.
+  4. Put a line in the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md) summarizing your changes under the next release under the “Bugfixes” heading.
   5. Send us a [pull request](https://help.github.com/articles/using-pull-requests) from your bugfix branch.
 
 Finally, the ticket may be a duplicate of another older ticket. If you notice a ticket is a duplicate, simply comment on the ticket noting the original ticket’s number. For example, you could say “This is a duplicate of issue #42, and can be closed”.
@@ -71,16 +90,16 @@ Bundler has two main sources of documentation: the built-in help (including usag
 
 If you’d like to submit a patch to the man pages, follow the steps for adding a feature above. All of the man pages are located in the `man` directory. Just use the “Documentation” heading when you describe what you did in the changelog.
 
-If you have a suggestion or proposed change for [gembundler.com](http://gembundler.com), please open an issue or send a pull request to the [bundler-site-middleman](https://github.com/bundler/bundler-site-middleman) repository.
+If you have a suggestion or proposed change for [gembundler.com](http://gembundler.com), please open an issue or send a pull request to the [bundler-site](https://github.com/bundler/bundler-site) repository.
 
 
 # Community
 
 Community is an important part of all we do. If you’d like to be part of the Bundler community, you can jump right in and start helping make Bundler better for everyone who uses it.
 
-It would be tremendously helpful to have more people answering questions about Bundler (and often simply about Rubygems or Ruby itself) in our [issue tracker](https://github.com/carlhuda/bundler/issues) or on [Stack Overflow](http://stackoverflow.com/questions/tagged/bundler).
+It would be tremendously helpful to have more people answering questions about Bundler (and often simply about Rubygems or Ruby itself) in our [issue tracker](https://github.com/bundler/bundler/issues) or on [Stack Overflow](http://stackoverflow.com/questions/tagged/bundler).
 
-Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [gembundler.com](http://www.gembundler.com), we would absolutely love it if you opened an issue or pull request on the [bundler-site-middleman](https://github.com/bundler/bundler-site-middleman) repository.
+Additional documentation and explanation is always helpful, too. If you have any suggestions for the Bundler website [gembundler.com](http://www.gembundler.com), we would absolutely love it if you opened an issue or pull request on the [bundler-site](https://github.com/bundler/bundler-site) repository.
 
 Finally, sharing your experiences and discoveries by writing them up is a valuable way to help others who have similar problems or experiences in the future. You can write a blog post, create an example and commit it to Github, take screenshots, or make videos.
 
@@ -89,7 +108,7 @@ Examples of how Bundler is used help everyone, and we’ve discovered that peopl
 If you let someone on the core team know you wrote about Bundler, we will add your post to the list of Bundler resources on the Github project wiki.
 
 
-# Your first bugfix
+# Your first commits
 
 If you’re interested in contributing to Bundler, that’s awesome! We’d love your help.
 

data/ISSUES.md

@@ -78,6 +78,6 @@ If you are using Rails 2.3, please also include:
 
 If you have either `rubygems-bundler` or `open_gem` installed, please try removing them and then following the troubleshooting steps above before opening a new ticket.
 
-[Create a gist](https://gist.github.com) containing all of that information, then visit the [Bundler issue tracker](https://github.com/carlhuda/bundler/issues) and [create a ticket](https://github.com/carlhuda/bundler/issues/new) describing your problem and linking to your gist.
+[Create a gist](https://gist.github.com) containing all of that information, then visit the [Bundler issue tracker](https://github.com/bundler/bundler/issues) and [create a ticket](https://github.com/bundler/bundler/issues/new) describing your problem and linking to your gist.
 
 Thanks for reporting issues and helping make Bundler better!

data/README.md

@@ -1,5 +1,7 @@
-# Bundler: a gem to bundle gems [![Build Status](https://secure.travis-ci.org/carlhuda/bundler.png?branch=1-3-stable)](http://travis-ci.org/carlhuda/bundler)
+[![Code Climate](https://codeclimate.com/github/bundler/bundler.png)](https://codeclimate.com/github/bundler/bundler)
+[![Build Status](https://secure.travis-ci.org/bundler/bundler.png?branch=1-3-stable)](http://travis-ci.org/bundler/bundler)
 
+# Bundler: a gem to bundle gems
 Bundler keeps ruby applications running the same code on every machine.
 
 It does this by managing the gems that the application depends on. Given a list of gems, it can automatically download and install those gems, as well as any other gems needed by the gems that are listed. Before installing gems, it checks the versions of every gem to make sure that they are compatible, and can all be loaded at the same time. After the gems have been installed, Bundler can help you update some or all of them when new versions become available. Finally, it records the exact versions that have been installed, so that others can install the exact same gems.
@@ -18,15 +20,15 @@ See [gembundler.com](http://gembundler.com) for the full documentation.
 
 ### Troubleshooting
 
-For help with common problems, see [ISSUES](https://github.com/carlhuda/bundler/blob/master/ISSUES.md).
+For help with common problems, see [ISSUES](https://github.com/bundler/bundler/blob/master/ISSUES.md).
 
 ### Contributing
 
-If you'd like to contribute to Bundler, that's awesome, and we <3 you. There's a guide to contributing to Bundler (both code and general help) over in [CONTRIBUTE](https://github.com/carlhuda/bundler/blob/master/CONTRIBUTE.md)
+If you'd like to contribute to Bundler, that's awesome, and we <3 you. There's a guide to contributing to Bundler (both code and general help) over in [DEVELOPMENT](https://github.com/bundler/bundler/blob/master/DEVELOPMENT.md)
 
 ### Development
 
-To see what has changed in recent versions of Bundler, see the [CHANGELOG](https://github.com/carlhuda/bundler/blob/master/CHANGELOG.md).
+To see what has changed in recent versions of Bundler, see the [CHANGELOG](https://github.com/bundler/bundler/blob/master/CHANGELOG.md).
 
 The `master` branch contains our current progress towards version 1.3. Versions 1.0 to 1.2 each have their own stable branches. Please submit bugfixes as pull requests to the stable branch for the version you would like to fix.
 

data/Rakefile

@@ -89,7 +89,7 @@ begin
     namespace :rubygems do
       rubyopt = ENV["RUBYOPT"]
       # When editing this list, also edit .travis.yml!
-      %w(master 2.0 v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.6).each do |rg|
+      %w(master v1.3.6 v1.3.7 v1.4.2 v1.5.3 v1.6.2 v1.7.2 v1.8.25 v2.0.3).each do |rg|
         desc "Run specs with Rubygems #{rg}"
         RSpec::Core::RakeTask.new(rg) do |t|
           t.rspec_opts = %w(-fs --color)
@@ -220,18 +220,4 @@ end
 task :build => ["man:clean", "man:build"]
 task :release => ["man:clean", "man:build"]
 
-namespace :vendor do
-  desc "Build the vendor dir"
-  task :build => :clean do
-    sh "git clone git://github.com/wycats/thor.git lib/bundler/vendor/tmp"
-    sh "mv lib/bundler/vendor/tmp/lib/* lib/bundler/vendor/"
-    rm_rf "lib/bundler/vendor/tmp"
-  end
-
-  desc "Clean the vendor dir"
-  task :clean do
-    rm_rf "lib/bundler/vendor"
-  end
-end
-
 task :default => :spec

data/bin/bundle

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
-# Trap interrupts to quit cleanly. See
-# https://twitter.com/mitchellh/status/283014103189053442
+# Exit cleanly from an early interrupt
 Signal.trap("INT") { exit 1 }
 
 require 'bundler'
@@ -16,10 +15,8 @@ $:.each do |path|
 end
 
 require 'bundler/cli'
+# Force Thor to raise exceptions so we can exit non-zero.
+ENV["THOR_DEBUG"] = "1"
+
 require 'bundler/friendly_errors'
-Bundler.with_friendly_errors {
-    # Set debug flag so we can rescue Thor::error's
-    # and set the correct exit code.
-    ENV["THOR_DEBUG"] = "1"
-    Bundler::CLI.start
-}
+Bundler.with_friendly_errors { Bundler::CLI.start }

data/bundler.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'ronn', '~> 0.7.3'
   spec.add_development_dependency 'rspec', '~> 2.11'
 
-  spec.files       = `git ls-files -z`.split("\x0")
+  spec.files       = `git ls-files`.split($/)
   spec.files      += Dir.glob('lib/bundler/man/**/*') # man/ is ignored by git
   spec.test_files  = spec.files.grep(%r{^spec/})
 

data/lib/bundler.rb

@@ -5,6 +5,8 @@ require 'bundler/gem_path_manipulation'
 require 'bundler/rubygems_ext'
 require 'bundler/rubygems_integration'
 require 'bundler/version'
+require 'bundler/constants'
+require 'bundler/current_ruby'
 
 module Bundler
   preserve_gem_path
@@ -48,25 +50,22 @@ module Bundler
     end
   end
 
-  class GemfileNotFound     < BundlerError; status_code(10) ; end
-  class GemNotFound         < BundlerError; status_code(7)  ; end
-  class GemfileError        < BundlerError; status_code(4)  ; end
-  class InstallError        < BundlerError; status_code(5)  ; end
-  class InstallHookError    < BundlerError; status_code(6)  ; end
-  class PathError           < BundlerError; status_code(13) ; end
-  class GitError            < BundlerError; status_code(11) ; end
-  class DeprecatedError     < BundlerError; status_code(12) ; end
-  class GemspecError        < BundlerError; status_code(14) ; end
-  class InvalidOption       < BundlerError; status_code(15) ; end
-  class ProductionError     < BundlerError; status_code(16) ; end
-  class HTTPError           < BundlerError; status_code(17) ; end
-  class RubyVersionMismatch < BundlerError; status_code(18) ; end
-  class SecurityError       < BundlerError; status_code(19) ; end
-  class LockfileError       < BundlerError; status_code(20) ; end
-
-  WINDOWS = RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!
-  FREEBSD = RbConfig::CONFIG["host_os"] =~ /bsd/
-  NULL    = WINDOWS ? "NUL" : "/dev/null"
+  class GemfileNotFound       < BundlerError; status_code(10) ; end
+  class GemNotFound           < BundlerError; status_code(7)  ; end
+  class GemfileError          < BundlerError; status_code(4)  ; end
+  class InstallError          < BundlerError; status_code(5)  ; end
+  class InstallHookError      < BundlerError; status_code(6)  ; end
+  class PathError             < BundlerError; status_code(13) ; end
+  class GitError              < BundlerError; status_code(11) ; end
+  class DeprecatedError       < BundlerError; status_code(12) ; end
+  class GemspecError          < BundlerError; status_code(14) ; end
+  class InvalidOption         < BundlerError; status_code(15) ; end
+  class ProductionError       < BundlerError; status_code(16) ; end
+  class HTTPError             < BundlerError; status_code(17) ; end
+  class RubyVersionMismatch   < BundlerError; status_code(18) ; end
+  class SecurityError         < BundlerError; status_code(19) ; end
+  class LockfileError         < BundlerError; status_code(20) ; end
+  class CyclicDependencyError < BundlerError; status_code(21) ; end
 
   # Internal errors, should be rescued
   class VersionConflict  < BundlerError
@@ -139,6 +138,11 @@ module Bundler
       Bundler::Environment.new(root, definition)
     end
 
+    # Returns an instance of Bundler::Definition for given Gemfile and lockfile
+    #
+    # @param unlock [Hash, Boolean, nil] Gems that have been requested
+    #   to be updated or true if all gems should be updated
+    # @return [Bundler::Definition]
     def definition(unlock = nil)
       @definition = nil if unlock
       @definition ||= begin
@@ -289,7 +293,19 @@ module Bundler
     end
 
     def sudo(str)
-      `sudo -p 'Enter your password to install the bundled RubyGems to your system: ' #{str}`
+      prompt = "\n\n" + <<-PROMPT.gsub(/^ {6}/, '').strip + " "
+      Your user account isn't allowed to install to the system Rubygems.
+      You can cancel this installation and run:
+
+          bundle install --path vendor/bundle
+
+      to install the gems into ./vendor/bundle/, or you can enter your password
+      and install the bundled gems to Rubygems using sudo.
+
+      Password:
+      PROMPT
+
+      `sudo -p "#{prompt}" #{str}`
     end
 
     def read_file(file)
@@ -315,7 +331,7 @@ module Bundler
       path = Pathname.new(file)
       # Eval the gemspec from its parent directory, because some gemspecs
       # depend on "./" relative paths.
-      Dir.chdir(path.dirname.to_s) do
+      SharedHelpers.chdir(path.dirname.to_s) do
         contents = path.read
         if contents[0..2] == "---" # YAML header
           eval_yaml_gemspec(path, contents)

data/lib/bundler/cli.rb

@@ -12,6 +12,7 @@ module Bundler
     rescue UnknownArgumentError => e
       raise InvalidOption, e.message
     ensure
+      options ||= {}
       Bundler.ui = UI::Shell.new(options)
       Bundler.ui.level = "debug" if options["verbose"]
     end
@@ -43,11 +44,8 @@ module Bundler
       if manpages.include?(command)
         root = File.expand_path("../man", __FILE__)
 
-        if Bundler.which("groff") && root !~ %r{^file:/.+!/META-INF/jruby.home/.+}
-          groff = "groff -Wall -mtty-char -mandoc -Tascii"
-          pager = pager_system
-
-          Kernel.exec "#{groff} #{root}/#{command} | #{pager}"
+        if Bundler.which("man") && root !~ %r{^file:/.+!/META-INF/jruby.home/.+}
+          Kernel.exec "man #{root}/#{command}"
         else
           puts File.read("#{root}/#{command}.txt")
         end
@@ -173,6 +171,9 @@ module Bundler
       "Gem trust policy (like gem install -P). Must be one of " +
         Bundler.rubygems.security_policies.keys.join('|') unless
         Bundler.rubygems.security_policies.empty?
+    method_option "jobs", :aliases => "-j", :type => :numeric, :banner =>
+      "Specify the number of jobs to run in parallel"
+
     def install
       opts = options.dup
       if opts[:without]
@@ -224,6 +225,8 @@ module Bundler
         opts[:system] = true
       end
 
+      opts["no-cache"] ||= opts[:local]
+
       # 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]
@@ -245,7 +248,7 @@ module Bundler
       definition = Bundler.definition
       definition.validate_ruby!
       Installer.install(Bundler.root, definition, opts)
-      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !options["no-cache"]
+      Bundler.load.cache if Bundler.root.join("vendor/cache").exist? && !opts["no-cache"]
 
       if Bundler.settings[:path]
         absolute_path = File.expand_path(Bundler.settings[:path])
@@ -373,18 +376,26 @@ module Bundler
       "binstub destination directory (default bin)"
     method_option "force", :type => :boolean, :default => false, :banner =>
       "overwrite existing binstubs if they exist"
-    def binstubs(gem_name)
+    def binstubs(*gems)
       Bundler.definition.validate_ruby!
       Bundler.settings[:bin] = options["path"] if options["path"]
       Bundler.settings[:bin] = nil if options["path"] && options["path"].empty?
       installer = Installer.new(Bundler.root, Bundler.definition)
-      spec      = installer.specs.find{|s| s.name == gem_name }
-      raise GemNotFound, not_found_message(gem_name, Bundler.definition.specs) unless spec
 
-      if spec.name == "bundler"
-        Bundler.ui.warn "Sorry, Bundler can only be run via Rubygems."
-      else
-        installer.generate_bundler_executable_stubs(spec, :force => options[:force], :binstubs_cmd => true)
+      if gems.empty?
+        Bundler.ui.error "`bundle binstubs` needs at least one gem to run."
+        exit 1
+      end
+
+      gems.each do |gem_name|
+        spec = installer.specs.find{|s| s.name == gem_name }
+        raise GemNotFound, not_found_message(gem_name, Bundler.definition.specs) unless spec
+
+        if spec.name == "bundler"
+          Bundler.ui.warn "Sorry, Bundler can only be run via Rubygems."
+        else
+          installer.generate_bundler_executable_stubs(spec, :force => options[:force], :binstubs_cmd => true)
+        end
       end
     end
 
@@ -404,6 +415,8 @@ module Bundler
       Bundler.definition.validate_ruby!
 
       current_specs = Bundler.ui.silence { Bundler.load.specs }
+      current_dependencies = {}
+      Bundler.ui.silence { Bundler.load.dependencies.each { |dep| current_dependencies[dep.name] = dep } }
 
       if gems.empty? && sources.empty?
         # We're doing a full update
@@ -417,7 +430,8 @@ module Bundler
 
       out_count = 0
       # Loop through the current specs
-      current_specs.sort_by { |s| s.name }.each do |current_spec|
+      gemfile_specs, dependency_specs = current_specs.partition { |spec| current_dependencies.has_key? spec.name }
+      [gemfile_specs.sort_by(&:name), dependency_specs.sort_by(&:name)].flatten.each do |current_spec|
         next if !gems.empty? && !gems.include?(current_spec.name)
 
         active_spec = definition.index[current_spec.name].sort_by { |b| b.version }
@@ -442,7 +456,9 @@ module Bundler
 
           spec_version    = "#{active_spec.version}#{active_spec.git_version}"
           current_version = "#{current_spec.version}#{current_spec.git_version}"
-          Bundler.ui.info "  * #{active_spec.name} (#{spec_version} > #{current_version})"
+          dependency = current_dependencies[current_spec.name]
+          dependency_version = %|Gemfile specifies "#{dependency.requirement}"| if dependency && dependency.specific?
+          Bundler.ui.info "  * #{active_spec.name} (#{spec_version} > #{current_version}) #{dependency_version}".rstrip
           out_count += 1
         end
         Bundler.ui.debug "from #{active_spec.loaded_from}"
@@ -474,6 +490,7 @@ module Bundler
     desc "package", "Locks and then caches all of the gems into vendor/cache"
     method_option "no-prune",  :type => :boolean, :banner => "Don't remove stale gems from the cache."
     method_option "all",  :type => :boolean, :banner => "Include all sources (including path and git)."
+    method_option "quiet", :type => :boolean, :banner => "Only output warnings and errors."
     long_desc <<-D
       The package command will copy the .gem files for every gem in the bundle into the
       directory ./vendor/cache. If you then check that directory into your source
@@ -481,6 +498,7 @@ module Bundler
       bundle without having to download any additional gems.
     D
     def package
+      Bundler.ui.level = "warn" if options[:quiet]
       setup_cache_all
       install
       # TODO: move cache contents here now that all bundles are locked
@@ -855,12 +873,6 @@ module Bundler
       message
     end
 
-    def pager_system
-      pager = ENV['PAGER'] || ENV['MANPAGER']
-      pager ||= 'less -R' if Bundler.which("less")
-      pager ||= 'more' if Bundler.which("more")
-      pager ||= 'cat'
-    end
 
     def without_groups_message
       groups = Bundler.settings.without