diff options
| author | Homu <homu@barosl.com> | 2016-03-07 17:59:19 +0900 |
|---|---|---|
| committer | Homu <homu@barosl.com> | 2016-03-07 17:59:19 +0900 |
| commit | 4db97066bec04badf58544a18e615ba7d3f54f3b (patch) | |
| tree | 17097ab35721906ddb47ca004c492546331b8e44 | |
| parent | 1cd4ed88b75e309aceb43ddb7c702e002456a547 (diff) | |
| parent | ce0914c7d853ef18205341cea31c96d168cca2af (diff) | |
| download | bundler-4db97066bec04badf58544a18e615ba7d3f54f3b.tar.gz | |
Auto merge of #4331 - asutoshpalai:master, r=segiddins
Corrected docs for package --all-platforms
This fixes the doc package --all-platforms mentioning that only the platforms present in the lock files are cached. #4330
| -rw-r--r-- | lib/bundler/cli.rb | 4 | ||||
| -rw-r--r-- | man/bundle-package.ronn | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/bundler/cli.rb b/lib/bundler/cli.rb index e652bfd6e1..82ca1cdb26 100644 --- a/lib/bundler/cli.rb +++ b/lib/bundler/cli.rb @@ -259,7 +259,7 @@ module Bundler desc "cache [OPTIONS]", "Cache all the gems to vendor/cache", :hide => true method_option "all", :type => :boolean, :banner => "Include all sources (including path and git)." - method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms, not just the current one" + method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not just the current one" method_option "no-prune", :type => :boolean, :banner => "Don't remove stale gems from the cache." def cache require "bundler/cli/cache" @@ -268,7 +268,7 @@ module Bundler desc "package [OPTIONS]", "Locks and then caches all of the gems into vendor/cache" method_option "all", :type => :boolean, :banner => "Include all sources (including path and git)." - method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms, not just the current one" + method_option "all-platforms", :type => :boolean, :banner => "Include gems for all platforms present in the lockfile, not just the current one" method_option "cache-path", :type => :string, :banner => "Specify a different cache path than the default (vendor/cache)." method_option "gemfile", :type => :string, :banner => "Use the specified gemfile instead of Gemfile" diff --git a/man/bundle-package.ronn b/man/bundle-package.ronn index 8a6b439cd5..efdfc125d6 100644 --- a/man/bundle-package.ronn +++ b/man/bundle-package.ronn @@ -20,9 +20,10 @@ via the `--all` option. Once used, the `--all` option will be remembered. ## SUPPORT FOR MULTIPLE PLATFORMS When using gems that have different packages for different platforms, Bundler -1.8 and newer support caching of gems for other platforms in `vendor/cache`. -This needs to be enabled via the `--all-platforms` option. This setting will be -remembered in your local bundler configuration. +1.8 and newer support caching of gems for other platforms where the Gemfile +has been resolved (i.e. present in the lockfile) in `vendor/cache`. This needs +to be enabled via the `--all-platforms` option. This setting will be remembered +in your local bundler configuration. ## REMOTE FETCHING |