lib/pronto/runners.rb in pronto-0.7.1 vs lib/pronto/runners.rb in pronto-0.8.0

- old
+ new

@@ -4,32 +4,34 @@ @runners = runners @config = config end def run(patches) - patches = reject_excluded(patches) - return [] unless patches.any? + patches = reject_excluded(@config.excluded_files('all'), patches) + return [] if patches.none? result = [] @runners.each do |runner| next if exceeds_max?(result) @config.logger.log("Running #{runner}") - result += runner.new(patches, patches.commit).run.flatten.compact + runner_patches = reject_excluded( + @config.excluded_files(runner.title), patches + ) + next if runner_patches.none? + result += runner.new(runner_patches, patches.commit).run.flatten.compact end result = result.take(@config.max_warnings) if @config.max_warnings result end private - def reject_excluded(patches) - return patches unless @config.excluded_files.any? - patches.reject! { |patch| excluded?(patch) } - patches - end + def reject_excluded(excluded_files, patches) + return patches unless excluded_files.any? - def excluded?(patch) - @config.excluded_files.include?(patch.new_file_full_path.to_s) + patches.reject do |patch| + excluded_files.include?(patch.new_file_full_path.to_s) + end end def exceeds_max?(warnings) @config.max_warnings && warnings.count >= @config.max_warnings end