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

rubocops: refactor to use consistent _body_node parameter name #2801

Merged
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
4 changes: 2 additions & 2 deletions Library/Homebrew/rubocops/bottle_block_cop.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ module FormulaAuditStrict
class BottleBlock < FormulaCop
MSG = "Use rebuild instead of revision in bottle block".freeze

def audit_formula(_node, _class_node, _parent_class_node, formula_class_body_node)
bottle = find_block(formula_class_body_node, :bottle)
def audit_formula(_node, _class_node, _parent_class_node, body_node)
bottle = find_block(body_node, :bottle)
return if bottle.nil? || block_size(bottle).zero?
problem "Use rebuild instead of revision in bottle block" if method_called_in_block?(bottle, :revision)
end
Expand Down
8 changes: 4 additions & 4 deletions Library/Homebrew/rubocops/components_order_cop.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module FormulaAuditStrict
# - component_precedence_list has component hierarchy in a nested list
# where each sub array contains components' details which are at same precedence level
class ComponentsOrder < FormulaCop
def audit_formula(_node, _class_node, _parent_class_node, formula_class_body_node)
def audit_formula(_node, _class_node, _parent_class_node, body_node)
component_precedence_list = [
[{ name: :include, type: :method_call }],
[{ name: :desc, type: :method_call }],
Expand Down Expand Up @@ -41,11 +41,11 @@ def audit_formula(_node, _class_node, _parent_class_node, formula_class_body_nod
components.each do |component|
case component[:type]
when :method_call
relevant_components += find_method_calls_by_name(formula_class_body_node, component[:name]).to_a
relevant_components += find_method_calls_by_name(body_node, component[:name]).to_a
when :block_call
relevant_components += find_blocks(formula_class_body_node, component[:name]).to_a
relevant_components += find_blocks(body_node, component[:name]).to_a
when :method_definition
relevant_components << find_method_def(formula_class_body_node, component[:name])
relevant_components << find_method_def(body_node, component[:name])
end
end
relevant_components.delete_if(&:nil?)
Expand Down
14 changes: 7 additions & 7 deletions Library/Homebrew/rubocops/components_redundancy_cop.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@ class ComponentsRedundancy < FormulaCop
HEAD_MSG = "`head` and `head do` should not be simultaneously present".freeze
BOTTLE_MSG = "`bottle :modifier` and `bottle do` should not be simultaneously present".freeze

def audit_formula(_node, _class_node, _parent_class_node, formula_class_body_node)
stable_block = find_block(formula_class_body_node, :stable)
def audit_formula(_node, _class_node, _parent_class_node, body_node)
stable_block = find_block(body_node, :stable)
if stable_block
[:url, :sha256, :mirror].each do |method_name|
problem "`#{method_name}` should be put inside `stable` block" if method_called?(formula_class_body_node, method_name)
problem "`#{method_name}` should be put inside `stable` block" if method_called?(body_node, method_name)
end
end

problem HEAD_MSG if method_called?(formula_class_body_node, :head) &&
find_block(formula_class_body_node, :head)
problem HEAD_MSG if method_called?(body_node, :head) &&
find_block(body_node, :head)

problem BOTTLE_MSG if method_called?(formula_class_body_node, :bottle) &&
find_block(formula_class_body_node, :bottle)
problem BOTTLE_MSG if method_called?(body_node, :bottle) &&
find_block(body_node, :bottle)
end
end
end
Expand Down
8 changes: 4 additions & 4 deletions Library/Homebrew/rubocops/formula_desc_cop.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ module FormulaAuditStrict
# - Checks for existence of `desc`
# - Checks if size of `desc` > 80
class DescLength < FormulaCop
def audit_formula(_node, _class_node, _parent_class_node, body)
desc_call = find_node_method_by_name(body, :desc)
def audit_formula(_node, _class_node, _parent_class_node, body_node)
desc_call = find_node_method_by_name(body_node, :desc)

# Check if a formula's desc is present
if desc_call.nil?
Expand Down Expand Up @@ -48,8 +48,8 @@ class Desc < FormulaCop
xUnit
].freeze

def audit_formula(_node, _class_node, _parent_class_node, body)
desc_call = find_node_method_by_name(body, :desc)
def audit_formula(_node, _class_node, _parent_class_node, body_node)
desc_call = find_node_method_by_name(body_node, :desc)
return if desc_call.nil?

desc = parameters(desc_call).first
Expand Down
4 changes: 2 additions & 2 deletions Library/Homebrew/rubocops/homepage_cop.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ module Cop
module FormulaAudit
# This cop audits `homepage` url in Formulae
class Homepage < FormulaCop
def audit_formula(_node, _class_node, _parent_class_node, formula_class_body_node)
homepage_node = find_node_method_by_name(formula_class_body_node, :homepage)
def audit_formula(_node, _class_node, _parent_class_node, body_node)
homepage_node = find_node_method_by_name(body_node, :homepage)
homepage = if homepage_node
string_content(parameters(homepage_node).first)
else
Expand Down