Auto merge of #4022 - jasonkarns:rake-clobber, r=segiddins

include 'pkg/' in rake/clean's CLOBBER array

closes #3676

2 files changed, 10 insertions, 0 deletions

diff --git a/lib/bundler/gem_tasks.rb b/lib/bundler/gem_tasks.rb
index 4c8f28c9d6..0ff383bf8b 100644
--- a/lib/bundler/gem_tasks.rb
+++ b/lib/bundler/gem_tasks.rb
@@ -1,2 +1,5 @@
+require "rake/clean"
+CLOBBER.include "pkg"
+
 require "bundler/gem_helper"
 Bundler::GemHelper.install_tasks
diff --git a/spec/runtime/gem_tasks_spec.rb b/spec/runtime/gem_tasks_spec.rb
index c7641cfe22..1cbc35f7bb 100644
--- a/spec/runtime/gem_tasks_spec.rb
+++ b/spec/runtime/gem_tasks_spec.rb
@@ -25,6 +25,8 @@ describe "require 'bundler/gem_tasks'" do
     expect(err).to eq("")
     expected_tasks = [
       "rake build",
+      "rake clean",
+      "rake clobber",
       "rake install",
       "rake release[remote]",
     ]
@@ -32,4 +34,9 @@ describe "require 'bundler/gem_tasks'" do
     expect(tasks & expected_tasks).to eq(expected_tasks)
     expect(exitstatus).to eq(0) if exitstatus
   end
+
+  it "adds 'pkg' to rake/clean's CLOBBER" do
+    require "bundler/gem_tasks"
+    expect(CLOBBER).to include("pkg")
+  end
 end