From 1d3ed256a06477bd688da7f908f7aaa14d24e896 Mon Sep 17 00:00:00 2001 From: commitay Date: Tue, 24 Apr 2018 18:27:37 +1000 Subject: [PATCH] components_order_cop: make non-strict --- Library/Homebrew/rubocops/components_order_cop.rb | 8 +++++++- .../Homebrew/test/rubocops/components_order_cop_spec.rb | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/rubocops/components_order_cop.rb b/Library/Homebrew/rubocops/components_order_cop.rb index a1a576177b..912f4d3804 100644 --- a/Library/Homebrew/rubocops/components_order_cop.rb +++ b/Library/Homebrew/rubocops/components_order_cop.rb @@ -2,7 +2,7 @@ require_relative "./extend/formula_cop" module RuboCop module Cop - module FormulaAuditStrict + module FormulaAudit # This cop checks for correct order of components in a Formula # # - component_precedence_list has component hierarchy in a nested list @@ -62,8 +62,14 @@ module RuboCop end end + # `aspell`: options and resources should be grouped by language + WHITELIST = %w[ + aspell + ].freeze + # Method to format message for reporting component precedence violations def component_problem(c1, c2) + return if WHITELIST.include?(@formula_name) problem "`#{format_component(c1)}` (line #{line_number(c1)}) should be put before `#{format_component(c2)}` (line #{line_number(c2)})" end diff --git a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb b/Library/Homebrew/test/rubocops/components_order_cop_spec.rb index cd7cc5893a..7466f2d6b6 100644 --- a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/components_order_cop_spec.rb @@ -1,6 +1,6 @@ require_relative "../../rubocops/components_order_cop" -describe RuboCop::Cop::FormulaAuditStrict::ComponentsOrder do +describe RuboCop::Cop::FormulaAudit::ComponentsOrder do subject(:cop) { described_class.new } context "When auditing formula components order" do