Add $LOAD_PATH for RuboCop cops.

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
+require_relative "load_path"
-
-unless $LOAD_PATH.include?(HOMEBREW_LIBRARY_PATH.to_s)
-  $LOAD_PATH.push(HOMEBREW_LIBRARY_PATH.to_s)
-end
 
 require "config"
-
-require "English"
-require "ostruct"
-require "messages"
-
-require "pp"
 require "extend/ARGV"
-
+require "messages"
 require "system_command"
 
 ARGV.extend(HomebrewArgvExtension)

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

Library/Homebrew/rubocops.rb

@@ -1,14 +1,16 @@
-require_relative "./rubocops/formula_desc_cop"
+require_relative "load_path"
-require_relative "./rubocops/components_order_cop"
+
-require_relative "./rubocops/components_redundancy_cop"
+require "rubocops/formula_desc_cop"
-require_relative "./rubocops/dependency_order_cop"
+require "rubocops/components_order_cop"
-require_relative "./rubocops/homepage_cop"
+require "rubocops/components_redundancy_cop"
-require_relative "./rubocops/text_cop"
+require "rubocops/dependency_order_cop"
-require_relative "./rubocops/caveats_cop"
+require "rubocops/homepage_cop"
-require_relative "./rubocops/checksum_cop"
+require "rubocops/text_cop"
-require_relative "./rubocops/patches_cop"
+require "rubocops/caveats_cop"
-require_relative "./rubocops/conflicts_cop"
+require "rubocops/checksum_cop"
-require_relative "./rubocops/options_cop"
+require "rubocops/patches_cop"
-require_relative "./rubocops/urls_cop"
+require "rubocops/conflicts_cop"
-require_relative "./rubocops/lines_cop"
+require "rubocops/options_cop"
-require_relative "./rubocops/class_cop"
+require "rubocops/urls_cop"
+require "rubocops/lines_cop"
+require "rubocops/class_cop"

Library/Homebrew/rubocops/caveats_cop.rb

@@ -1,4 +1,4 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
 
 module RuboCop
   module Cop

Library/Homebrew/rubocops/checksum_cop.rb

@@ -1,4 +1,4 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
 
 module RuboCop
   module Cop

Library/Homebrew/rubocops/class_cop.rb

@@ -1,4 +1,4 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
 
 module RuboCop
   module Cop

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

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

Library/Homebrew/rubocops/conflicts_cop.rb

@@ -1,5 +1,5 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
-require_relative "../extend/string"
+require "extend/string"
 
 module RuboCop
   module Cop

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

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

Library/Homebrew/rubocops/formula_desc_cop.rb

@@ -1,5 +1,5 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
-require_relative "../extend/string"
+require "extend/string"
 
 module RuboCop
   module Cop

Library/Homebrew/rubocops/homepage_cop.rb

@@ -1,4 +1,4 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
 
 module RuboCop
   module Cop

Library/Homebrew/rubocops/lines_cop.rb

@@ -1,4 +1,4 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
 
 module RuboCop
   module Cop

Library/Homebrew/rubocops/options_cop.rb

@@ -1,4 +1,4 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
 
 module RuboCop
   module Cop

Library/Homebrew/rubocops/patches_cop.rb

@@ -1,5 +1,5 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
-require_relative "../extend/string"
+require "extend/string"
 
 module RuboCop
   module Cop

Library/Homebrew/rubocops/text_cop.rb

@@ -1,4 +1,4 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
 
 module RuboCop
   module Cop

Library/Homebrew/rubocops/urls_cop.rb

@@ -1,4 +1,4 @@
-require_relative "./extend/formula_cop"
+require "rubocops/extend/formula_cop"
 
 module RuboCop
   module Cop

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

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }

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 }