Merge pull request #4798 from Homebrew/revert-4771-rubocop-path

Revert "Add `$LOAD_PATH` for RuboCop cops."
Homebrew · Sep 2, 2018 · bfb2d53 · bfb2d53
2 parents 0dc2c72 + 0aa9dce
commit bfb2d53
Show file tree

Hide file tree

Showing 31 changed files with 47 additions and 49 deletions.
diff --git a/Library/Homebrew/rubocops.rb b/Library/Homebrew/rubocops.rb
@@ -1,16 +1,14 @@
-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"
+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"
diff --git a/Library/Homebrew/rubocops/caveats_cop.rb b/Library/Homebrew/rubocops/caveats_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/checksum_cop.rb b/Library/Homebrew/rubocops/checksum_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/class_cop.rb b/Library/Homebrew/rubocops/class_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./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
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./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
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/conflicts_cop.rb b/Library/Homebrew/rubocops/conflicts_cop.rb
@@ -1,5 +1,5 @@
-require "rubocops/extend/formula_cop"
-require "extend/string"
+require_relative "./extend/formula_cop"
+require_relative "../extend/string"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/dependency_order_cop.rb b/Library/Homebrew/rubocops/dependency_order_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./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
@@ -7,7 +7,7 @@
   $VERBOSE = old_verbosity
 end
 
-require "extend/string"
+require_relative "../../extend/string"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/formula_desc_cop.rb b/Library/Homebrew/rubocops/formula_desc_cop.rb
@@ -1,5 +1,5 @@
-require "rubocops/extend/formula_cop"
-require "extend/string"
+require_relative "./extend/formula_cop"
+require_relative "../extend/string"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/homepage_cop.rb b/Library/Homebrew/rubocops/homepage_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/lines_cop.rb b/Library/Homebrew/rubocops/lines_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/options_cop.rb b/Library/Homebrew/rubocops/options_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/patches_cop.rb b/Library/Homebrew/rubocops/patches_cop.rb
@@ -1,5 +1,5 @@
-require "rubocops/extend/formula_cop"
-require "extend/string"
+require_relative "./extend/formula_cop"
+require_relative "../extend/string"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/text_cop.rb b/Library/Homebrew/rubocops/text_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/rubocops/urls_cop.rb b/Library/Homebrew/rubocops/urls_cop.rb
@@ -1,4 +1,4 @@
-require "rubocops/extend/formula_cop"
+require_relative "./extend/formula_cop"
 
 module RuboCop
   module Cop

diff --git a/Library/Homebrew/tap.rb b/Library/Homebrew/tap.rb
@@ -271,7 +271,7 @@ def install(options = {})
           raise "Cannot tap #{name}: invalid syntax in tap!"
         end
       end
-    rescue Interrupt, RuntimeError
+    rescue Interrupt, ErrorDuringExecution, 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
@@ -1,4 +1,4 @@
-require "rubocops/caveats_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/checksum_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/class_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/components_order_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/components_redundancy_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/conflicts_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/dependency_order_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/formula_desc_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/homepage_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/lines_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/options_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/patches_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/text_cop"
+require_relative "../../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
@@ -1,4 +1,4 @@
-require "rubocops/urls_cop"
+require_relative "../../rubocops/urls_cop"
 
 describe RuboCop::Cop::FormulaAudit::Urls do
   subject(:cop) { described_class.new }