Merge pull request #3304 from richiethomas/refactor_uses

In 'readall.rb', replaced multi-step 'each' loop with one-line method chain of Ruby enumerator methods
This commit is contained in:
Mike McQuaid 2017-10-20 18:10:31 +01:00 committed by GitHub
commit ed28ed78d1
2 changed files with 3 additions and 11 deletions

View File

@ -39,7 +39,7 @@ module Homebrew
filtered_list
elsif ARGV.named.empty?
if ARGV.include? "--full-name"
full_names = Formula.installed.map(&:full_name).sort &tap_and_name_comparison
full_names = Formula.installed.map(&:full_name).sort(&tap_and_name_comparison)
return if full_names.empty?
puts Formatter.columns(full_names)
else

View File

@ -14,16 +14,8 @@ module Homebrew
def readall
if ARGV.include?("--syntax")
ruby_files = []
scan_files = %W[
#{HOMEBREW_LIBRARY}/*.rb
#{HOMEBREW_LIBRARY}/Homebrew/**/*.rb
]
Dir.glob(scan_files).each do |rb|
next if rb.include?("/vendor/")
next if rb.include?("/cask/")
ruby_files << rb
end
scan_files = "#{HOMEBREW_LIBRARY_PATH}/**/*.rb"
ruby_files = Dir.glob(scan_files).reject { |file| file =~ %r{/(vendor|cask)/} }
Homebrew.failed = true unless Readall.valid_ruby_syntax?(ruby_files)
end