diff options
author | Samuel Giddins <segiddins@segiddins.me> | 2017-07-21 14:21:56 -0500 |
---|---|---|
committer | Samuel Giddins <segiddins@segiddins.me> | 2017-07-23 12:51:36 -0500 |
commit | dcd9963876f1405a19671a6bd34d42a6add9e16a (patch) | |
tree | 1cfee962063fdf074972211b6f0fe99ae329bf7b /lib/bundler/cli | |
parent | 07fedc3f9ee972d5da43f8a77a162bf2c9ca4b1b (diff) | |
download | bundler-dcd9963876f1405a19671a6bd34d42a6add9e16a.tar.gz |
Update the specs for the default bundle path being ./.bundle
Diffstat (limited to 'lib/bundler/cli')
-rw-r--r-- | lib/bundler/cli/clean.rb | 9 | ||||
-rw-r--r-- | lib/bundler/cli/install.rb | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/bundler/cli/clean.rb b/lib/bundler/cli/clean.rb index 71b2969192..4a407fbae7 100644 --- a/lib/bundler/cli/clean.rb +++ b/lib/bundler/cli/clean.rb @@ -16,11 +16,10 @@ module Bundler protected def require_path_or_force - if Bundler.use_system_gems? && !options[:force] - raise InvalidOption, "Cleaning all the gems on your system is dangerous! " \ - "If you're sure you want to remove every system gem not in this " \ - "bundle, run `bundle clean --force`." - end + return unless Bundler.use_system_gems? && !options[:force] + raise InvalidOption, "Cleaning all the gems on your system is dangerous! " \ + "If you're sure you want to remove every system gem not in this " \ + "bundle, run `bundle clean --force`." end end end diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb index 53db0026f8..771ff6f5dc 100644 --- a/lib/bundler/cli/install.rb +++ b/lib/bundler/cli/install.rb @@ -196,6 +196,8 @@ module Bundler Bundler.settings.set_command_option :without, options[:without] - options[:with] Bundler.settings.set_command_option :with, options[:with] end + + options[:force] = options[:redownload] end def warn_ambiguous_gems |