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

adapt to executable and subcmd being mandatory

Browse Source
This commit is contained in:
Max Eisner 2022-08-10 17:37:43 +02:00
parent 60db35096f
commit a56feff5d0
No known key found for this signature in database
GPG Key ID: 4BF122C22879F0C8
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Library/Homebrew/rubocops/lines.rb
View File

@ -424,7 +424,7 @@ module RuboCop
def audit_formula(_node, _class_node, _parent_class_node, body_node) def audit_formula(_node, _class_node, _parent_class_node, body_node)
install = find_method_def(body_node, :install) install = find_method_def(body_node, :install)
correctable_shell_completion_node(install) do |node, shell, base_name, executable, cmd, shell_parameter| correctable_shell_completion_node(install) do |node, shell, base_name, executable, subcmd, shell_parameter|
# generate_completions_from_executable only applicable if shell is passed # generate_completions_from_executable only applicable if shell is passed
next unless shell_parameter.match?(/(bash|zsh|fish)/) next unless shell_parameter.match?(/(bash|zsh|fish)/)
@ -443,12 +443,10 @@ module RuboCop
end end
replacement_args = %w[] replacement_args = %w[]
replacement_args << executable
replacement_args << subcmd.inspect
replacement_args << "base_name: \"#{base_name}\"" unless base_name == @formula_name replacement_args << "base_name: \"#{base_name}\"" unless base_name == @formula_name
replacement_args << "shells: [:#{shell}]" replacement_args << "shells: [:#{shell}]"
if executable.to_s != "bin/\"#{@formula_name}\"" && executable.to_s != "bin/\"#{base_name}\""
replacement_args << "executable: #{executable}"
end
replacement_args << "cmd: \"#{cmd}\"" unless cmd == "completion"
replacement_args << "shell_parameter_format: #{shell_parameter_format.inspect}" unless shell_parameter_format.nil? replacement_args << "shell_parameter_format: #{shell_parameter_format.inspect}" unless shell_parameter_format.nil?
offending_node(node) offending_node(node)
@ -465,7 +463,7 @@ module RuboCop
end end
end end
# matches ({bash,zsh,fish}_completion/"_?foo{.fish}?").write Utils.safe_popen_read(foo, cmd, shell_parameter) # matches ({bash,zsh,fish}_completion/"_?foo{.fish}?").write Utils.safe_popen_read(foo, subcmd, shell_parameter)
def_node_search :correctable_shell_completion_node, <<~EOS def_node_search :correctable_shell_completion_node, <<~EOS
$(send $(send
(begin (begin