Avoid unnecessary float to string conversion

This commit is contained in:
Jack Nagel 2013-06-15 09:33:30 -05:00
parent 43b85e5865
commit e9d245cf3a
6 changed files with 28 additions and 28 deletions

View File

@ -81,9 +81,9 @@ end
def bottle_tag def bottle_tag
case MacOS.version case MacOS.version
when 10.8, 10.7, 10.5 when "10.8", "10.7", "10.5"
MacOS.cat MacOS.cat
when 10.6 when "10.6"
Hardware::CPU.is_64_bit? ? :snow_leopard : :snow_leopard_32 Hardware::CPU.is_64_bit? ? :snow_leopard : :snow_leopard_32
else else
Hardware::CPU.type == :ppc ? Hardware::CPU.family : MacOS.cat Hardware::CPU.type == :ppc ? Hardware::CPU.family : MacOS.cat

View File

@ -11,11 +11,11 @@ module MacOS extend self
def cat def cat
case MacOS.version case MacOS.version
when 10.8 then :mountain_lion when "10.8" then :mountain_lion
when 10.7 then :lion when "10.7" then :lion
when 10.6 then :snow_leopard when "10.6" then :snow_leopard
when 10.5 then :leopard when "10.5" then :leopard
when 10.4 then :tiger when "10.4" then :tiger
end end
end end

View File

@ -19,11 +19,11 @@ module MacOS::Xcode extend self
def latest_version def latest_version
case MacOS.version case MacOS.version
when 10.4 then "2.5" when "10.4" then "2.5"
when 10.5 then "3.1.4" when "10.5" then "3.1.4"
when 10.6 then "3.2.6" when "10.6" then "3.2.6"
when 10.7, 10.8 then "4.6.3" when "10.7", "10.8" then "4.6.3"
when 10.9 then "5.0" when "10.9" then "5.0"
else else
# Default to newest known version of Xcode for unreleased OSX versions. # Default to newest known version of Xcode for unreleased OSX versions.
if MacOS.version > 10.9 if MacOS.version > 10.9

View File

@ -3,42 +3,42 @@ require 'bottles'
class BottleTagTests < Test::Unit::TestCase class BottleTagTests < Test::Unit::TestCase
def test_cat_tiger_ppc def test_cat_tiger_ppc
MacOS.stubs(:version).returns(MacOS::Version.new(10.4)) MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
Hardware::CPU.stubs(:type).returns(:ppc) Hardware::CPU.stubs(:type).returns(:ppc)
Hardware::CPU.stubs(:family).returns(:foo) Hardware::CPU.stubs(:family).returns(:foo)
assert_equal :foo, bottle_tag assert_equal :foo, bottle_tag
end end
def test_cat_tiger_intel def test_cat_tiger_intel
MacOS.stubs(:version).returns(MacOS::Version.new(10.4)) MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
Hardware::CPU.stubs(:type).returns(:intel) Hardware::CPU.stubs(:type).returns(:intel)
assert_equal :tiger, bottle_tag assert_equal :tiger, bottle_tag
end end
def test_cat_leopard def test_cat_leopard
MacOS.stubs(:version).returns(MacOS::Version.new(10.5)) MacOS.stubs(:version).returns(MacOS::Version.new("10.5"))
assert_equal :leopard, bottle_tag assert_equal :leopard, bottle_tag
end end
def test_cat_snow_leopard_32 def test_cat_snow_leopard_32
MacOS.stubs(:version).returns(MacOS::Version.new(10.6)) MacOS.stubs(:version).returns(MacOS::Version.new("10.6"))
Hardware::CPU.stubs(:is_64_bit?).returns(false) Hardware::CPU.stubs(:is_64_bit?).returns(false)
assert_equal :snow_leopard_32, bottle_tag assert_equal :snow_leopard_32, bottle_tag
end end
def test_cat_snow_leopard_64 def test_cat_snow_leopard_64
MacOS.stubs(:version).returns(MacOS::Version.new(10.6)) MacOS.stubs(:version).returns(MacOS::Version.new("10.6"))
Hardware::CPU.stubs(:is_64_bit?).returns(true) Hardware::CPU.stubs(:is_64_bit?).returns(true)
assert_equal :snow_leopard, bottle_tag assert_equal :snow_leopard, bottle_tag
end end
def test_cat_lion def test_cat_lion
MacOS.stubs(:version).returns(MacOS::Version.new(10.7)) MacOS.stubs(:version).returns(MacOS::Version.new("10.7"))
assert_equal :lion, bottle_tag assert_equal :lion, bottle_tag
end end
def test_cat_mountain_lion def test_cat_mountain_lion
MacOS.stubs(:version).returns(MacOS::Version.new(10.8)) MacOS.stubs(:version).returns(MacOS::Version.new("10.8"))
assert_equal :mountain_lion, bottle_tag assert_equal :mountain_lion, bottle_tag
end end
end end

View File

@ -102,22 +102,22 @@ class DependencyCollectorTests < Test::Unit::TestCase
end end
def test_x11_proxy_dep_mountain_lion def test_x11_proxy_dep_mountain_lion
MacOS.stubs(:version).returns(MacOS::Version.new(10.8)) MacOS.stubs(:version).returns(MacOS::Version.new("10.8"))
assert_equal Dependency.new("libpng"), @d.build(:libpng) assert_equal Dependency.new("libpng"), @d.build(:libpng)
end end
def test_x11_proxy_dep_lion_or_older def test_x11_proxy_dep_lion_or_older
MacOS.stubs(:version).returns(MacOS::Version.new(10.7)) MacOS.stubs(:version).returns(MacOS::Version.new("10.7"))
assert_equal X11Dependency::Proxy.new(:libpng), @d.build(:libpng) assert_equal X11Dependency::Proxy.new(:libpng), @d.build(:libpng)
end end
def test_ld64_dep_pre_leopard def test_ld64_dep_pre_leopard
MacOS.stubs(:version).returns(MacOS::Version.new(10.4)) MacOS.stubs(:version).returns(MacOS::Version.new("10.4"))
assert_equal LD64Dependency.new, @d.build(:ld64) assert_equal LD64Dependency.new, @d.build(:ld64)
end end
def test_ld64_dep_leopard_or_newer def test_ld64_dep_leopard_or_newer
MacOS.stubs(:version).returns(MacOS::Version.new(10.5)) MacOS.stubs(:version).returns(MacOS::Version.new("10.5"))
assert_nil @d.build(:ld64) assert_nil @d.build(:ld64)
end end

View File

@ -4,7 +4,7 @@ require 'os/mac/version'
class MacOSVersionTests < Test::Unit::TestCase class MacOSVersionTests < Test::Unit::TestCase
def setup def setup
@v = MacOS::Version.new(10.7) @v = MacOS::Version.new("10.7")
end end
def test_compare_with_symbol def test_compare_with_symbol
@ -34,9 +34,9 @@ class MacOSVersionTests < Test::Unit::TestCase
end end
def test_compare_with_version def test_compare_with_version
assert_operator @v, :>, Version.new(10.6) assert_operator @v, :>, Version.new("10.6")
assert_operator @v, :==, Version.new(10.7) assert_operator @v, :==, Version.new("10.7")
assert_operator @v, :===, Version.new(10.7) assert_operator @v, :===, Version.new("10.7")
assert_operator @v, :<, Version.new(10.8) assert_operator @v, :<, Version.new("10.8")
end end
end end