admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Support constants in DependencyOrder cop.

Browse Source
This commit is contained in:
Markus Reiter 2018-06-11 04:14:13 +02:00
parent fdb2406b20
commit b9ba631982
1 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Library/Homebrew/rubocops/dependency_order_cop.rb
View File

@ -20,7 +20,7 @@ module RuboCop
def check_dependency_nodes_order(parent_node) def check_dependency_nodes_order(parent_node)
return if parent_node.nil? return if parent_node.nil?
dependency_nodes = fetch_depends_on_nodes(parent_node) dependency_nodes = fetch_depends_on_nodes(parent_node)
ordered = dependency_nodes.sort { |a, b| sort_by_dependency_name(a, b) } ordered = dependency_nodes.sort_by { |node| dependency_name(node).downcase }
ordered = sort_dependencies_by_type(ordered) ordered = sort_dependencies_by_type(ordered)
sort_conditional_dependencies!(ordered) sort_conditional_dependencies!(ordered)
verify_order_in_source(ordered) verify_order_in_source(ordered)
@ -31,18 +31,6 @@ module RuboCop
parent_node.each_child_node.select { |x| depends_on_node?(x) } parent_node.each_child_node.select { |x| depends_on_node?(x) }
end end
def sort_by_dependency_name(a, b)
a_name = dependency_name(a)
b_name = dependency_name(b)
if a_name < b_name
-1
elsif a_name > b_name
1
else
0
end
end
# Separate dependencies according to precedence order: # Separate dependencies according to precedence order:
# build-time > test > normal > recommended > optional # build-time > test > normal > recommended > optional
def sort_dependencies_by_type(dependency_nodes) def sort_dependencies_by_type(dependency_nodes)
@ -119,8 +107,8 @@ module RuboCop
# Node pattern method to extract `name` in `depends_on :name` # Node pattern method to extract `name` in `depends_on :name`
def_node_search :dependency_name_node, <<~EOS def_node_search :dependency_name_node, <<~EOS
{(send nil? :depends_on {(hash (pair $_ _)) $({str sym} _)}) {(send nil? :depends_on {(hash (pair $_ _)) $({str sym} _) $(const nil? _)})
(if _ (send nil? :depends_on {(hash (pair $_ _)) $({str sym} _)}) nil?)} (if _ (send nil? :depends_on {(hash (pair $_ _)) $({str sym} _) $(const nil? _)}) nil?)}
EOS EOS
# Node pattern method to extract `name` in `build.with? :name` # Node pattern method to extract `name` in `build.with? :name`