From 346fa5098fdb36cfb97a954c50059de15a28f952 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Fri, 27 Jun 2014 21:58:15 -0500 Subject: [PATCH] Simplify valid_formula_location? method --- Library/Homebrew/cmd/update.rb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Library/Homebrew/cmd/update.rb b/Library/Homebrew/cmd/update.rb index 6166571cd1..042214ee37 100644 --- a/Library/Homebrew/cmd/update.rb +++ b/Library/Homebrew/cmd/update.rb @@ -232,13 +232,14 @@ class Report < Hash end def valid_formula_location?(relative_path) - ruby_file = /\A.*\.rb\Z/ parts = relative_path.split('/')[2..-1] - [ - parts.length == 1 && parts.first =~ ruby_file, - parts.length == 2 && parts.first == 'Formula' && parts.last =~ ruby_file, - parts.length == 2 && parts.first == 'HomebrewFormula' && parts.last =~ ruby_file, - ].any? + return false unless File.extname(parts.last) == ".rb" + case parts.first + when "Formula", "HomebrewFormula" + parts.length == 2 + else + parts.length == 1 + end end def new_tapped_formula