diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb index e0a532363a..0644ed0272 100644 --- a/Library/Homebrew/rubocops.rb +++ b/Library/Homebrew/rubocops.rb @@ -1,14 +1,16 @@ -require_relative "./rubocops/formula_desc_cop" -require_relative "./rubocops/components_order_cop" -require_relative "./rubocops/components_redundancy_cop" -require_relative "./rubocops/dependency_order_cop" -require_relative "./rubocops/homepage_cop" -require_relative "./rubocops/text_cop" -require_relative "./rubocops/caveats_cop" -require_relative "./rubocops/checksum_cop" -require_relative "./rubocops/patches_cop" -require_relative "./rubocops/conflicts_cop" -require_relative "./rubocops/options_cop" -require_relative "./rubocops/urls_cop" -require_relative "./rubocops/lines_cop" -require_relative "./rubocops/class_cop" +require_relative "global" + +require "rubocops/formula_desc_cop" +require "rubocops/components_order_cop" +require "rubocops/components_redundancy_cop" +require "rubocops/dependency_order_cop" +require "rubocops/homepage_cop" +require "rubocops/text_cop" +require "rubocops/caveats_cop" +require "rubocops/checksum_cop" +require "rubocops/patches_cop" +require "rubocops/conflicts_cop" +require "rubocops/options_cop" +require "rubocops/urls_cop" +require "rubocops/lines_cop" +require "rubocops/class_cop" diff --git a/Library/Homebrew/rubocops/caveats_cop.rb b/Library/Homebrew/rubocops/caveats_cop.rb index 3935d56388..7ce22f22aa 100644 --- a/Library/Homebrew/rubocops/caveats_cop.rb +++ b/Library/Homebrew/rubocops/caveats_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/checksum_cop.rb b/Library/Homebrew/rubocops/checksum_cop.rb index 4dd8ad91c8..6eee16f2bf 100644 --- a/Library/Homebrew/rubocops/checksum_cop.rb +++ b/Library/Homebrew/rubocops/checksum_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/class_cop.rb b/Library/Homebrew/rubocops/class_cop.rb index cc24f5f595..89afda474a 100644 --- a/Library/Homebrew/rubocops/class_cop.rb +++ b/Library/Homebrew/rubocops/class_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/components_order_cop.rb b/Library/Homebrew/rubocops/components_order_cop.rb index 0c181f3ef9..454aed790b 100644 --- a/Library/Homebrew/rubocops/components_order_cop.rb +++ b/Library/Homebrew/rubocops/components_order_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/components_redundancy_cop.rb b/Library/Homebrew/rubocops/components_redundancy_cop.rb index b6986db609..553800337f 100644 --- a/Library/Homebrew/rubocops/components_redundancy_cop.rb +++ b/Library/Homebrew/rubocops/components_redundancy_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/conflicts_cop.rb b/Library/Homebrew/rubocops/conflicts_cop.rb index 826c986167..c7b37c51ef 100644 --- a/Library/Homebrew/rubocops/conflicts_cop.rb +++ b/Library/Homebrew/rubocops/conflicts_cop.rb @@ -1,5 +1,5 @@ -require_relative "./extend/formula_cop" -require_relative "../extend/string" +require "rubocops/extend/formula_cop" +require "extend/string" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/dependency_order_cop.rb b/Library/Homebrew/rubocops/dependency_order_cop.rb index 746ec5af39..0a57aaeb78 100644 --- a/Library/Homebrew/rubocops/dependency_order_cop.rb +++ b/Library/Homebrew/rubocops/dependency_order_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/extend/formula_cop.rb b/Library/Homebrew/rubocops/extend/formula_cop.rb index 362a5134c0..73d7c4ae09 100644 --- a/Library/Homebrew/rubocops/extend/formula_cop.rb +++ b/Library/Homebrew/rubocops/extend/formula_cop.rb @@ -7,7 +7,7 @@ ensure $VERBOSE = old_verbosity end -require_relative "../../extend/string" +require "extend/string" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/formula_desc_cop.rb b/Library/Homebrew/rubocops/formula_desc_cop.rb index abdaf869fe..5d3483f661 100644 --- a/Library/Homebrew/rubocops/formula_desc_cop.rb +++ b/Library/Homebrew/rubocops/formula_desc_cop.rb @@ -1,5 +1,5 @@ -require_relative "./extend/formula_cop" -require_relative "../extend/string" +require "rubocops/extend/formula_cop" +require "extend/string" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/homepage_cop.rb b/Library/Homebrew/rubocops/homepage_cop.rb index 0960074b0f..16cc4f056a 100644 --- a/Library/Homebrew/rubocops/homepage_cop.rb +++ b/Library/Homebrew/rubocops/homepage_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/lines_cop.rb b/Library/Homebrew/rubocops/lines_cop.rb index d179815468..3f196073c9 100644 --- a/Library/Homebrew/rubocops/lines_cop.rb +++ b/Library/Homebrew/rubocops/lines_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/options_cop.rb b/Library/Homebrew/rubocops/options_cop.rb index c39709d7b5..db20d9576f 100644 --- a/Library/Homebrew/rubocops/options_cop.rb +++ b/Library/Homebrew/rubocops/options_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/patches_cop.rb b/Library/Homebrew/rubocops/patches_cop.rb index a752f1019a..43f106d3d4 100644 --- a/Library/Homebrew/rubocops/patches_cop.rb +++ b/Library/Homebrew/rubocops/patches_cop.rb @@ -1,5 +1,5 @@ -require_relative "./extend/formula_cop" -require_relative "../extend/string" +require "rubocops/extend/formula_cop" +require "extend/string" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/text_cop.rb b/Library/Homebrew/rubocops/text_cop.rb index e9b648e281..dd8fb396e3 100644 --- a/Library/Homebrew/rubocops/text_cop.rb +++ b/Library/Homebrew/rubocops/text_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/rubocops/urls_cop.rb b/Library/Homebrew/rubocops/urls_cop.rb index 30420a793a..0dfe5158b4 100644 --- a/Library/Homebrew/rubocops/urls_cop.rb +++ b/Library/Homebrew/rubocops/urls_cop.rb @@ -1,4 +1,4 @@ -require_relative "./extend/formula_cop" +require "rubocops/extend/formula_cop" module RuboCop module Cop diff --git a/Library/Homebrew/test/rubocops/caveats_cop_spec.rb b/Library/Homebrew/test/rubocops/caveats_cop_spec.rb index 3ab4efd14b..c38f9d4eab 100644 --- a/Library/Homebrew/test/rubocops/caveats_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/caveats_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/caveats_cop" +require "rubocops/caveats_cop" describe RuboCop::Cop::FormulaAudit::Caveats do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/checksum_cop_spec.rb b/Library/Homebrew/test/rubocops/checksum_cop_spec.rb index edc3015844..802bcfee6e 100644 --- a/Library/Homebrew/test/rubocops/checksum_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/checksum_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/checksum_cop" +require "rubocops/checksum_cop" describe RuboCop::Cop::FormulaAudit::Checksum do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/class_cop_spec.rb b/Library/Homebrew/test/rubocops/class_cop_spec.rb index 7ada0bebd3..8273f3ebcb 100644 --- a/Library/Homebrew/test/rubocops/class_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/class_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/class_cop" +require "rubocops/class_cop" describe RuboCop::Cop::FormulaAudit::ClassName do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb b/Library/Homebrew/test/rubocops/components_order_cop_spec.rb index cc69b696eb..38a25cfc69 100644 --- a/Library/Homebrew/test/rubocops/components_order_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/components_order_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/components_order_cop" +require "rubocops/components_order_cop" describe RuboCop::Cop::FormulaAudit::ComponentsOrder do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb b/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb index f363ca3853..3cb44387ca 100644 --- a/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/components_redundancy_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/components_redundancy_cop" +require "rubocops/components_redundancy_cop" describe RuboCop::Cop::FormulaAudit::ComponentsRedundancy do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb b/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb index 788d9f6fc9..0f311f904e 100644 --- a/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/conflicts_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/conflicts_cop" +require "rubocops/conflicts_cop" describe RuboCop::Cop::FormulaAudit::Conflicts do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb b/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb index 38af72d231..6f19cc3293 100644 --- a/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/dependency_order_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/dependency_order_cop" +require "rubocops/dependency_order_cop" describe RuboCop::Cop::NewFormulaAudit::DependencyOrder do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb index 32a8e3f918..79eb3a2938 100644 --- a/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/formula_desc_cop" +require "rubocops/formula_desc_cop" describe RuboCop::Cop::FormulaAudit::DescLength do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/homepage_cop_spec.rb b/Library/Homebrew/test/rubocops/homepage_cop_spec.rb index 2620572bba..9240db0fd2 100644 --- a/Library/Homebrew/test/rubocops/homepage_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/homepage_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/homepage_cop" +require "rubocops/homepage_cop" describe RuboCop::Cop::FormulaAudit::Homepage do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/lines_cop_spec.rb b/Library/Homebrew/test/rubocops/lines_cop_spec.rb index 00190a32b9..7195efb1b4 100644 --- a/Library/Homebrew/test/rubocops/lines_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/lines_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/lines_cop" +require "rubocops/lines_cop" describe RuboCop::Cop::FormulaAudit::Lines do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/options_cop_spec.rb b/Library/Homebrew/test/rubocops/options_cop_spec.rb index 79f1d0d522..ef0e824bb5 100644 --- a/Library/Homebrew/test/rubocops/options_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/options_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/options_cop" +require "rubocops/options_cop" describe RuboCop::Cop::FormulaAudit::Options do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/patches_cop_spec.rb b/Library/Homebrew/test/rubocops/patches_cop_spec.rb index 8f5f96e660..0c04a98c05 100644 --- a/Library/Homebrew/test/rubocops/patches_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/patches_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/patches_cop" +require "rubocops/patches_cop" describe RuboCop::Cop::FormulaAudit::Patches do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/text_cop_spec.rb b/Library/Homebrew/test/rubocops/text_cop_spec.rb index e09f99c782..26e88eb805 100644 --- a/Library/Homebrew/test/rubocops/text_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/text_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/text_cop" +require "rubocops/text_cop" describe RuboCop::Cop::FormulaAudit::Text do subject(:cop) { described_class.new } diff --git a/Library/Homebrew/test/rubocops/urls_cop_spec.rb b/Library/Homebrew/test/rubocops/urls_cop_spec.rb index d6b1774dd6..514f895132 100644 --- a/Library/Homebrew/test/rubocops/urls_cop_spec.rb +++ b/Library/Homebrew/test/rubocops/urls_cop_spec.rb @@ -1,4 +1,4 @@ -require_relative "../../rubocops/urls_cop" +require "rubocops/urls_cop" describe RuboCop::Cop::FormulaAudit::Urls do subject(:cop) { described_class.new }