Merge pull request #1426 from hone/1247_bundle_force

add --force to bundle clean

lib/bundler/cli.rb

@@ -568,11 +568,13 @@ def self.source_root
     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] == nil
-        Bundler.ui.error "Can only use bundle clean when --path is set"
-      else
+      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
 

spec/other/clean_spec.rb

@@ -241,7 +241,7 @@ def should_not_have_gems(*gems)
 
     bundle :clean
 
-    out.should == "Can only use bundle clean when --path is set"
+    out.should == "Can only use bundle clean when --path is set or --force is set"
   end
 
   # handling bundle clean upgrade path from the pre's
@@ -371,4 +371,27 @@ def should_not_have_gems(*gems)
     sys_exec "gem list"
     out.should include("foo (1.0.1, 1.0)")
   end
+
+  it "cleans system gems when --force is used" do
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "foo"
+      gem "rack"
+    G
+    bundle :install
+
+    gemfile <<-G
+      source "file://#{gem_repo1}"
+
+      gem "rack"
+    G
+    bundle :install
+    bundle "clean --force"
+
+    out.should eq("Removing foo (1.0)")
+    sys_exec "gem list"
+    out.should_not include("foo (1.0)")
+    out.should include("rack (1.0.0)")
+  end
 end