diff options
| author | Stefan Lance <stefan@lances.net> | 2015-06-21 11:22:52 -0500 |
|---|---|---|
| committer | Samuel E. Giddins <segiddins@segiddins.me> | 2015-07-16 16:51:11 -0700 |
| commit | 21ccce158a89ad55320b04810e6e0ca1d30a3c13 (patch) | |
| tree | 569dd5deb551a7a2d5f610303f7368356e5561e5 | |
| parent | 37d10e0acd46efee9df47eb6a50a356ef0d1f4e1 (diff) | |
| download | bundler-21ccce158a89ad55320b04810e6e0ca1d30a3c13.tar.gz | |
Edit manpages and UPGRADING.md
| -rw-r--r-- | UPGRADING.md | 6 | ||||
| -rw-r--r-- | lib/bundler/cli.rb | 2 | ||||
| -rw-r--r-- | man/bundle-install.ronn | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/UPGRADING.md b/UPGRADING.md index 9300e9d347..0162742988 100644 --- a/UPGRADING.md +++ b/UPGRADING.md @@ -16,4 +16,8 @@ This change is not expected to impact production deployment scripts, because tho #### Removed: Deployment helpers -The `bundler/capistrano` and `bundler/vlad` deployment helper files have been removed. Capistrano 3 has built-in Bundler integration in the form of the `capistrano-bundler` gem, and everyone using Capistrano 3 should be using that instead. If for some reason, you are still using Capistrano 2, feel free to copy the Capistrano tasks out of the Bundler 1 file `bundler/deployment.rb` and put them into your app.
\ No newline at end of file +The `bundler/capistrano` and `bundler/vlad` deployment helper files have been removed. Capistrano 3 has built-in Bundler integration in the form of the `capistrano-bundler` gem, and everyone using Capistrano 3 should be using that instead. If for some reason, you are still using Capistrano 2, feel free to copy the Capistrano tasks out of the Bundler 1 file `bundler/deployment.rb` and put them into your app. + +#### Removed: `bundle install --binstubs` + +The `--binstubs` option has been removed from `bundle install` and replaced with the `bundle binstubs` command.
\ No newline at end of file diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index a6de0fb34d..6a1172efcd 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -117,8 +117,6 @@ module Bundler If the bundle has already been installed, bundler will tell you so and then exit. D - method_option "binstubs", :type => :string, :lazy_default => "bin", :banner => - "Generate bin stubs for bundled gems to ./bin" method_option "clean", :type => :boolean, :banner => "Run bundle clean automatically after install" method_option "deployment", :type => :boolean, :banner => diff --git a/man/bundle-install.ronn b/man/bundle-install.ronn index ce3fa37a34..79b5b67799 100644 --- a/man/bundle-install.ronn +++ b/man/bundle-install.ronn @@ -106,9 +106,9 @@ time `bundle install` is run, use `bundle config` (see bundle-config(1)). * `--shebang=<ruby-executable>`: Uses the specified ruby executable (usually `ruby`) to execute the scripts - created with `--binstubs`. In addition, if you use `--binstubs` together with - `--shebang jruby` these executables will be changed to execute `jruby` - instead. + created with `bundle binstubs`. In addition, if you use `bundle binstubs` + and then `bundle install --shebang jruby` these executables will be changed + to execute `jruby` instead. * `--standalone[=<list>]`: Makes a bundle that can work without depending on Rubygems or Bundler at |