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

Prefer File.extname to regexp

Browse Source
This commit is contained in:
Jack Nagel 2014-04-05 17:41:36 -05:00
parent 8c88d48af7
commit ce367e711b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Library/Homebrew/formulary.rb
View File

@ -115,7 +115,7 @@ class Formulary
def initialize path def initialize path
# require allows filenames to drop the .rb extension, but everything else # require allows filenames to drop the .rb extension, but everything else
# in our codebase will require an exact and fullpath. # in our codebase will require an exact and fullpath.
path = "#{path}.rb" unless path =~ /\.rb$/ path = "#{path}.rb" unless File.extname(path) == ".rb"
path = Pathname.new(path).expand_path path = Pathname.new(path).expand_path
super path.stem, path super path.stem, path
end end
@ -179,7 +179,7 @@ class Formulary
elsif name_or_path.include? "/" elsif name_or_path.include? "/"
# If name was a path or mapped to a cached formula # If name was a path or mapped to a cached formula
f = FromPathLoader.new(name_or_path) f = FromPathLoader.new(name_or_path)
elsif name_or_path =~ /\.rb$/ elsif File.extname(name_or_path) == ".rb"
f = FromPathLoader.new(File.expand_path(name_or_path)) f = FromPathLoader.new(File.expand_path(name_or_path))
else else
f = StandardLoader.new(name_or_path) f = StandardLoader.new(name_or_path)