Improve clean semantics

nebhale · nebhale · commit c2e3dba80d43 · 2014-04-09T11:43:49.000+01:00
The difference between clean and clobber in rake is quite subtle and
difficult for most users to grok.  This change makes all created
artifacts (regardless of whether are a scratch artifacts or
deliverables) part of CLEAN.  This means that a user will be able to
run either `rake clean` or `rake clobber` and get the same effect.

[#69170656]
diff --git a/Rakefile b/Rakefile
@@ -18,15 +18,14 @@ require 'rake/clean'
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new
-CLOBBER << 'coverage'
+CLEAN.include 'coverage'
 
 require 'rubocop/rake_task'
 Rubocop::RakeTask.new
 
 require 'yard'
 YARD::Rake::YardocTask.new
-CLEAN << '.yardoc'
-CLOBBER << 'doc'
+CLEAN.include '.yardoc', 'doc'
 
 desc 'Check that all APIs have been documented'
 task :check_api_doc do
diff --git a/rakelib/package_task.rb b/rakelib/package_task.rb
@@ -25,12 +25,11 @@ class PackageTask < Rake::TaskLib
     include Package
 
     def initialize
-      CLOBBER << BUILD_DIR
       directory BUILD_DIR
-
-      CLEAN << STAGING_DIR
       directory STAGING_DIR
 
+      CLEAN.include BUILD_DIR, STAGING_DIR
+
       desc 'Create packaged buildpack'
       task package: [PACKAGE_NAME]
 
