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

Only call Pathname#to_s once per Version object

Browse Source
This commit is contained in:
Jack Nagel 2013-04-16 14:32:28 -05:00
parent 1426b92a82
commit 42da1295ce
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Library/Homebrew/version.rb
View File

@ -108,32 +108,34 @@ class Version
def self._parse spec def self._parse spec
spec = Pathname.new(spec) unless spec.is_a? Pathname spec = Pathname.new(spec) unless spec.is_a? Pathname
spec_s = spec.to_s
stem = if spec.directory? stem = if spec.directory?
spec.basename.to_s spec.basename.to_s
elsif %r[((?:sourceforge.net|sf.net)/.*)/download$].match(spec.to_s) elsif %r[((?:sourceforge.net|sf.net)/.*)/download$].match(spec_s)
Pathname.new(spec.dirname).stem Pathname.new(spec.dirname).stem
else else
spec.stem spec.stem
end end
# GitHub tarballs, e.g. v1.2.3 # GitHub tarballs, e.g. v1.2.3
m = %r[github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+)$].match(spec.to_s) m = %r[github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+)$].match(spec_s)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. https://github.com/sam-github/libnet/tarball/libnet-1.1.4 # e.g. https://github.com/sam-github/libnet/tarball/libnet-1.1.4
m = %r[github.com/.+/(?:zip|tar)ball/.*-((\d+\.)+\d+)$].match(spec.to_s) m = %r[github.com/.+/(?:zip|tar)ball/.*-((\d+\.)+\d+)$].match(spec_s)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. https://github.com/isaacs/npm/tarball/v0.2.5-1 # e.g. https://github.com/isaacs/npm/tarball/v0.2.5-1
m = %r[github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+-(\d+))$].match(spec.to_s) m = %r[github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+-(\d+))$].match(spec_s)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. https://github.com/petdance/ack/tarball/1.93_02 # e.g. https://github.com/petdance/ack/tarball/1.93_02
m = %r[github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+_(\d+))$].match(spec.to_s) m = %r[github.com/.+/(?:zip|tar)ball/v?((\d+\.)+\d+_(\d+))$].match(spec_s)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. https://github.com/erlang/otp/tarball/OTP_R15B01 (erlang style) # e.g. https://github.com/erlang/otp/tarball/OTP_R15B01 (erlang style)
m = /[-_](R\d+[AB]\d*(-\d+)?)/.match(spec.to_s) m = /[-_](R\d+[AB]\d*(-\d+)?)/.match(spec_s)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. boost_1_39_0 # e.g. boost_1_39_0
@ -182,7 +184,7 @@ class Version
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. http://mirrors.jenkins-ci.org/war/1.486/jenkins.war # e.g. http://mirrors.jenkins-ci.org/war/1.486/jenkins.war
m = /\/(\d\.\d+)\//.match(spec.to_s) m = /\/(\d\.\d+)\//.match(spec_s)
return m.captures.first unless m.nil? return m.captures.first unless m.nil?
# e.g. http://www.ijg.org/files/jpegsrc.v8d.tar.gz # e.g. http://www.ijg.org/files/jpegsrc.v8d.tar.gz