From a0f48619341c2cf6f1980a019bcd4005cf066e21 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Mon, 9 Oct 2017 16:46:01 +0100 Subject: [PATCH 1/2] audit: broaden refute_predicate nudge --- Library/Homebrew/dev-cmd/audit.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 200b2597f3..4d9000fed7 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -974,8 +974,8 @@ class FormulaAuditor problem "Use `assert_predicate , :exist?` instead of `#{Regexp.last_match(1)}`" end - if line =~ /assert !File\.exist\?/ - problem "Use `refute_predicate , :exist?` instead of `assert !File.exist?`" + if line =~ /(assert !File\.exist\?|assert !\(.*\)\.exist\?)/ + problem "Use `refute_predicate , :exist?` instead of `#{Regexp.last_match(1)}`" end return unless @strict From 0865ab0d1b25c9f6809c07fe6f4c02e71c2f0d27 Mon Sep 17 00:00:00 2001 From: Dominyk Tiller Date: Mon, 9 Oct 2017 16:48:01 +0100 Subject: [PATCH 2/2] audit: nudge to use predicate for 'executable?' as well --- Library/Homebrew/dev-cmd/audit.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 4d9000fed7..a9d27afa98 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -978,6 +978,10 @@ class FormulaAuditor problem "Use `refute_predicate , :exist?` instead of `#{Regexp.last_match(1)}`" end + if line =~ /(assert File\.executable\?|assert \(.*\)\.executable\?)/ + problem "Use `assert_predicate , :executable?` instead of `#{Regexp.last_match(1)}`" + end + return unless @strict problem "`#{Regexp.last_match(1)}` in formulae is deprecated" if line =~ /(env :(std|userpaths))/