From 49c9097b07c121d2d577f68e7148bc0dca10ea62 Mon Sep 17 00:00:00 2001 From: Jack Nagel Date: Sat, 15 Jun 2013 19:40:42 -0500 Subject: [PATCH] Push MacOS.cat logic down into MacOS::Version --- Library/Homebrew/macos.rb | 12 +----------- Library/Homebrew/os/mac/version.rb | 20 ++++++++++++-------- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/Library/Homebrew/macos.rb b/Library/Homebrew/macos.rb index 54cf434877..147676b3c2 100644 --- a/Library/Homebrew/macos.rb +++ b/Library/Homebrew/macos.rb @@ -10,17 +10,7 @@ module MacOS extend self end def cat - case MacOS.version - when "10.8" then :mountain_lion - when "10.7" then :lion - when "10.6" then :snow_leopard - when "10.5" then :leopard - when "10.4" then :tiger - end - end - - def pretty_name - MacOS.version.pretty_name + version.to_sym end def locate tool diff --git a/Library/Homebrew/os/mac/version.rb b/Library/Homebrew/os/mac/version.rb index 6e841cf652..4de3b91e7b 100644 --- a/Library/Homebrew/os/mac/version.rb +++ b/Library/Homebrew/os/mac/version.rb @@ -20,16 +20,20 @@ module MacOS super(Version.new(v)) end - def pretty_name + def to_sym case @version - when "10.9" then "Mavericks" - when "10.8" then "Mountain Lion" - when "10.7" then "Lion" - when "10.6" then "Snow Leopard" - when "10.5" then "Leopard" - when "10.4" then "Tiger" - else @version + when '10.9' then :mavericks + when '10.8' then :mountain_lion + when '10.7' then :lion + when '10.6' then :snow_leopard + when '10.5' then :leopard + when '10.4' then :tiger + else :dunno end end + + def pretty_name + to_sym.to_s.split('_').map(&:capitalize).join(' ') + end end end