Merge pull request #2687 from issyl0/fix_formula_description_regex

Match the "formula name in description" on word boundaries
Homebrew · May 29, 2017 · da39db0 · da39db0
2 parents 52b54aa + 279a4df
commit da39db0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Library/Homebrew/rubocops/formula_desc_cop.rb b/Library/Homebrew/rubocops/formula_desc_cop.rb
@@ -40,7 +40,7 @@ def audit_formula(_node, _class_node, _parent_class_node, body)
           end
 
           # Check if formula's name is used in formula's desc
-          problem "Description shouldn't include the formula name" if regex_match_group(desc, /^#{@formula_name}/i)
+          problem "Description shouldn't include the formula name" if regex_match_group(desc, /^#{@formula_name}\b/i)
         end
       end
     end

diff --git a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
@@ -120,7 +120,7 @@ class Foo < Formula
       source = <<-EOS.undent
         class Foo < Formula
           url 'http://example.com/foo-1.0.tgz'
-          desc 'Foo'
+          desc 'Foo: foobar'
         end
       EOS
-Original file line number
+Diff line change
@@ Expand Up @@
               end
               # Check if formula's name is used in formula's desc
-              problem "Description shouldn't include the formula name" if regex_match_group(desc, /^#{@formula_name}/i)
+              problem "Description shouldn't include the formula name" if regex_match_group(desc, /^#{@formula_name}\b/i)
             end
           end
         end
@@ Expand Down @@