From 7013f9dee3ea3e05e0fd51ee6ef0f19e5656176a Mon Sep 17 00:00:00 2001 From: ilovezfs Date: Thu, 29 Jun 2017 08:14:58 -0700 Subject: [PATCH] formula_desc_cop: allow formula name in desc except at the very beginning, as the audit originally intended. See https://github.com/Homebrew/legacy-homebrew/pull/45493. --- Library/Homebrew/rubocops/formula_desc_cop.rb | 6 +++--- Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Library/Homebrew/rubocops/formula_desc_cop.rb b/Library/Homebrew/rubocops/formula_desc_cop.rb index 3414439b03..619a0cda4b 100644 --- a/Library/Homebrew/rubocops/formula_desc_cop.rb +++ b/Library/Homebrew/rubocops/formula_desc_cop.rb @@ -72,9 +72,9 @@ module RuboCop problem "Description should start with a capital letter" end - # Check if formula's name is used in formula's desc - return unless regex_match_group(desc, /(^|[^a-z])#{@formula_name}([^a-z]|$)/i) - problem "Description shouldn't include the formula name" + # Check if formula's desc starts with formula's name + return unless regex_match_group(desc, /^#{@formula_name} /i) + problem "Description shouldn't start with the formula name" end private diff --git a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb index 4e684be46a..74ce478fb1 100644 --- a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb @@ -146,11 +146,11 @@ describe RuboCop::Cop::FormulaAuditStrict::Desc do source = <<-EOS.undent class Foo < Formula url 'http://example.com/foo-1.0.tgz' - desc 'Foo: foobar' + desc 'Foo is a foobar' end EOS - expected_offenses = [{ message: "Description shouldn't include the formula name", + expected_offenses = [{ message: "Description shouldn't start with the formula name", severity: :convention, line: 3, column: 8,