Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add $LOAD_PATH for RuboCop cops. #4771

Merged
merged 2 commits into from
Aug 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 16 additions & 14 deletions Library/Homebrew/rubocops.rb
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/caveats_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/checksum_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/class_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/components_order_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/components_redundancy_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/rubocops/conflicts_cop.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/dependency_order_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/extend/formula_cop.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
$VERBOSE = old_verbosity
end

require_relative "../../extend/string"
require "extend/string"

module RuboCop
module Cop
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/rubocops/formula_desc_cop.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/homepage_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/lines_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/options_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/rubocops/patches_cop.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/text_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/rubocops/urls_cop.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "./extend/formula_cop"
require "rubocops/extend/formula_cop"

module RuboCop
module Cop
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/tap.rb
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ def install(options = {})
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
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/caveats_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/caveats_cop"
require "rubocops/caveats_cop"

describe RuboCop::Cop::FormulaAudit::Caveats do
subject(:cop) { described_class.new }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/checksum_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/checksum_cop"
require "rubocops/checksum_cop"

describe RuboCop::Cop::FormulaAudit::Checksum do
subject(:cop) { described_class.new }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/class_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/class_cop"
require "rubocops/class_cop"

describe RuboCop::Cop::FormulaAudit::ClassName do
subject(:cop) { described_class.new }
Expand Down
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/conflicts_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/conflicts_cop"
require "rubocops/conflicts_cop"

describe RuboCop::Cop::FormulaAudit::Conflicts do
subject(:cop) { described_class.new }
Expand Down
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/formula_desc_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/homepage_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/homepage_cop"
require "rubocops/homepage_cop"

describe RuboCop::Cop::FormulaAudit::Homepage do
subject(:cop) { described_class.new }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/lines_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/lines_cop"
require "rubocops/lines_cop"

describe RuboCop::Cop::FormulaAudit::Lines do
subject(:cop) { described_class.new }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/options_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/options_cop"
require "rubocops/options_cop"

describe RuboCop::Cop::FormulaAudit::Options do
subject(:cop) { described_class.new }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/patches_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/patches_cop"
require "rubocops/patches_cop"

describe RuboCop::Cop::FormulaAudit::Patches do
subject(:cop) { described_class.new }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/text_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/text_cop"
require "rubocops/text_cop"

describe RuboCop::Cop::FormulaAudit::Text do
subject(:cop) { described_class.new }
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/test/rubocops/urls_cop_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require_relative "../../rubocops/urls_cop"
require "rubocops/urls_cop"

describe RuboCop::Cop::FormulaAudit::Urls do
subject(:cop) { described_class.new }
Expand Down