aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/extend/pathname.rb
diff options
context:
space:
mode:
authorJack Nagel2013-04-20 13:48:49 -0500
committerJack Nagel2013-04-20 13:50:42 -0500
commit51bfd4fc1e9b2653d369663b8414638f6b2c8a64 (patch)
treec0ec124239ce7840d7ea2f7d84abbf567052b7f6 /Library/Homebrew/extend/pathname.rb
parent1e2cb0fd650a5b5990d82541251585425b2d62fe (diff)
downloadbrew-51bfd4fc1e9b2653d369663b8414638f6b2c8a64.tar.bz2
Avoid calling to_s on the same Pathname multiple times
Diffstat (limited to 'Library/Homebrew/extend/pathname.rb')
-rw-r--r--Library/Homebrew/extend/pathname.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb
index 07526f0a2..df8f3813e 100644
--- a/Library/Homebrew/extend/pathname.rb
+++ b/Library/Homebrew/extend/pathname.rb
@@ -122,17 +122,17 @@ class Pathname
# extended to support common double extensions
alias extname_old extname
- def extname
- BOTTLE_EXTNAME_RX.match to_s
+ def extname(path=to_s)
+ BOTTLE_EXTNAME_RX.match(path)
return $1 if $1
- /(\.(tar|cpio)\.(gz|bz2|xz|Z))$/.match to_s
+ /(\.(tar|cpio)\.(gz|bz2|xz|Z))$/.match(path)
return $1 if $1
- return File.extname(to_s)
+ return File.extname(path)
end
# for filetypes we support, basename without extension
def stem
- return File.basename(to_s, extname)
+ File.basename((path = to_s), extname(path))
end
# I don't trust the children.length == 0 check particularly, not to mention