From ca37e9646946240826ecfbb7333582e96f964c57 Mon Sep 17 00:00:00 2001 From: Raza Hussain Date: Sat, 25 Mar 2017 16:20:51 -0400 Subject: [PATCH 1/4] updating the exception for "kibana" for the "@" naming scheme of its formula --- Library/Homebrew/dev-cmd/audit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 9f296ca665..292382234f 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -1176,7 +1176,7 @@ class FormulaAuditor problem "Use `assert_match` instead of `assert ...include?`" end - if line.include?('system "npm", "install"') && !line.include?("Language::Node") && formula.name !~ /^kibana(\d{2})?$/ + if line.include?('system "npm", "install"') && !line.include?("Language::Node") && formula.name !~ /^kibana(\@\d{1,2}(\.\d{1,2})?)?$/ problem "Use Language::Node for npm install args" end From 94769652e03e6333432bbc5578a74601f47e7c61 Mon Sep 17 00:00:00 2001 From: Raza Hussain Date: Sun, 26 Mar 2017 12:43:09 -0400 Subject: [PATCH 2/4] simplify the regex and make a line max 80 char long --- Library/Homebrew/dev-cmd/audit.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index 9f296ca665..c2e2e2f7ae 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -1176,7 +1176,8 @@ class FormulaAuditor problem "Use `assert_match` instead of `assert ...include?`" end - if line.include?('system "npm", "install"') && !line.include?("Language::Node") && formula.name !~ /^kibana(\d{2})?$/ + if line.include?('system "npm", "install"') && !line.include?("Language::Node")\ + && formula.name !~ /^kibana(\@\d+(\.\d+)?)?$/ problem "Use Language::Node for npm install args" end From 86cf8873b6063e1c09451fc9253dc1aedb8150e7 Mon Sep 17 00:00:00 2001 From: Raza Hussain Date: Sun, 26 Mar 2017 12:54:25 -0400 Subject: [PATCH 3/4] changing if condition --- 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 c2e2e2f7ae..af7109f0ca 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -1176,8 +1176,8 @@ class FormulaAuditor problem "Use `assert_match` instead of `assert ...include?`" end - if line.include?('system "npm", "install"') && !line.include?("Language::Node")\ - && formula.name !~ /^kibana(\@\d+(\.\d+)?)?$/ + if line.include?('system "npm", "install"') && !line.include?("Language::Node") && + formula.name !~ /^kibana(\@\d+(\.\d+)?)?$/ problem "Use Language::Node for npm install args" end From 543529c054ffcae090b491dd0f64306177d3224b Mon Sep 17 00:00:00 2001 From: Raza Hussain Date: Sun, 26 Mar 2017 14:29:38 -0400 Subject: [PATCH 4/4] indenting --- Library/Homebrew/dev-cmd/audit.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Library/Homebrew/dev-cmd/audit.rb b/Library/Homebrew/dev-cmd/audit.rb index af7109f0ca..442c83f59e 100644 --- a/Library/Homebrew/dev-cmd/audit.rb +++ b/Library/Homebrew/dev-cmd/audit.rb @@ -1177,7 +1177,7 @@ class FormulaAuditor end if line.include?('system "npm", "install"') && !line.include?("Language::Node") && - formula.name !~ /^kibana(\@\d+(\.\d+)?)?$/ + formula.name !~ /^kibana(\@\d+(\.\d+)?)?$/ problem "Use Language::Node for npm install args" end