From eca488a966f33db77795640da8a3936626b7e467 Mon Sep 17 00:00:00 2001 From: Markus Reiter Date: Sun, 2 Sep 2018 23:30:07 +0200 Subject: [PATCH] Add `$LOAD_PATH` for RuboCop cops. --- Library/Homebrew/global.rb | 18 ++++------- Library/Homebrew/load_path.rb | 7 +++++ Library/Homebrew/rubocops.rb | 30 ++++++++++--------- Library/Homebrew/rubocops/caveats_cop.rb | 2 +- Library/Homebrew/rubocops/checksum_cop.rb | 2 +- Library/Homebrew/rubocops/class_cop.rb | 2 +- .../Homebrew/rubocops/components_order_cop.rb | 2 +- .../rubocops/components_redundancy_cop.rb | 2 +- Library/Homebrew/rubocops/conflicts_cop.rb | 4 +-- .../Homebrew/rubocops/dependency_order_cop.rb | 2 +- .../Homebrew/rubocops/extend/formula_cop.rb | 2 +- Library/Homebrew/rubocops/formula_desc_cop.rb | 4 +-- Library/Homebrew/rubocops/homepage_cop.rb | 2 +- Library/Homebrew/rubocops/lines_cop.rb | 2 +- Library/Homebrew/rubocops/options_cop.rb | 2 +- Library/Homebrew/rubocops/patches_cop.rb | 4 +-- Library/Homebrew/rubocops/text_cop.rb | 2 +- Library/Homebrew/rubocops/urls_cop.rb | 2 +- Library/Homebrew/tap.rb | 2 +- .../test/rubocops/caveats_cop_spec.rb | 2 +- .../test/rubocops/checksum_cop_spec.rb | 2 +- .../Homebrew/test/rubocops/class_cop_spec.rb | 2 +- .../rubocops/components_order_cop_spec.rb | 2 +- .../components_redundancy_cop_spec.rb | 2 +- .../test/rubocops/conflicts_cop_spec.rb | 2 +- .../rubocops/dependency_order_cop_spec.rb | 2 +- .../test/rubocops/formula_desc_cop_spec.rb | 2 +- .../test/rubocops/homepage_cop_spec.rb | 2 +- .../Homebrew/test/rubocops/lines_cop_spec.rb | 2 +- .../test/rubocops/options_cop_spec.rb | 2 +- .../test/rubocops/patches_cop_spec.rb | 2 +- .../Homebrew/test/rubocops/text_cop_spec.rb | 2 +- .../Homebrew/test/rubocops/urls_cop_spec.rb | 2 +- 33 files changed, 61 insertions(+), 60 deletions(-) create mode 100644 Library/Homebrew/load_path.rb diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index e90846fc12..3d1e293d70 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -1,23 +1,15 @@ -require "pathname" require "English" require "json" require "json/add/exception" +require "pathname" +require "ostruct" +require "pp" -HOMEBREW_LIBRARY_PATH = Pathname.new(__FILE__).realpath.parent - -unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s) - $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s) -end +require_relative "load_path" require "config" - -require "English" -require "ostruct" -require "messages" - -require "pp" require "extend/ARGV" - +require "messages" require "system_command" ARGV.extend(HomebrewArgvExtension) diff --git a/Library/Homebrew/load_path.rb b/Library/Homebrew/load_path.rb new file mode 100644 index 0000000000..bab8941a97 --- /dev/null +++ b/Library/Homebrew/load_path.rb @@ -0,0 +1,7 @@ +require "pathname" + +HOMEBREW_LIBRARY_PATH = Pathname(__dir__).realpath + +unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s) + $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s) +end diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb index e0a532363a..b5dd08187b 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 "load_path" + +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 10263f163e..1a41b7b252 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 2458334053..385d368375 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 884ed0c1d0..ab30562532 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 ea7aa9196f..1c07f2896b 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 551c9aec26..6a17fd2fc6 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 da89510ad3..338fcf2355 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 da828fe112..0ca6bce28f 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/tap.rb b/Library/Homebrew/tap.rb index 7d50102595..7b7ec6a726 100644 --- a/Library/Homebrew/tap.rb +++ b/Library/Homebrew/tap.rb @@ -271,7 +271,7 @@ class Tap raise "Cannot tap #{name}: invalid syntax in tap!" end end - rescue Interrupt, ErrorDuringExecution, RuntimeError + rescue Interrupt, RuntimeError ignore_interrupts do # wait for git to possibly cleanup the top directory when interrupt happens. sleep 0.1 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 a10254de28..7173092bac 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 1cb87980aa..d141ba82f0 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 bc39a08e5b..5664b93ccb 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 }