From 79f8210fffae24fd3de9cfa2eb3ccd1b9355477e Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 11 Mar 2016 10:04:36 -0800 Subject: [PATCH] 'jekyll clean': also remove .sass-cache --- lib/jekyll/commands/clean.rb | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/lib/jekyll/commands/clean.rb b/lib/jekyll/commands/clean.rb index 371b7043..ca19d9b5 100644 --- a/lib/jekyll/commands/clean.rb +++ b/lib/jekyll/commands/clean.rb @@ -19,21 +19,19 @@ module Jekyll options = configuration_from_options(options) destination = options['destination'] metadata_file = File.join(options['source'], '.jekyll-metadata') + sass_cache = File.join(options['source'], '.sass-cache') - if File.directory? destination - Jekyll.logger.info "Cleaning #{destination}..." - FileUtils.rm_rf(destination) - Jekyll.logger.info "", "done." - else - Jekyll.logger.info "Nothing to do for #{destination}." - end + remove(destination, checker_func: :directory?) + remove(metadata_file, checker_func: :file?) + remove(sass_cache, checker_func: :directory?) + end - if File.file? metadata_file - Jekyll.logger.info "Removing #{metadata_file}..." - FileUtils.rm_rf(metadata_file) - Jekyll.logger.info "", "done." + def remove(filename, checker_func: :file?) + if File.public_send(checker_func, filename) + Jekyll.logger.info "Cleaner:", "Removing #{filename}..." + FileUtils.rm_rf(filename) else - Jekyll.logger.info "Nothing to do for #{metadata_file}." + Jekyll.logger.info "Cleaner:", "Nothing to do for #{filename}." end end end