From ce454bd141ec4f97b2bfb9d71e0cea4389c78089 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 30 Dec 2016 18:15:35 +0000 Subject: [PATCH] tab: parse full Homebrew version string It didn't occur to me that this would work, but it does! Magic. --- Library/Homebrew/tab.rb | 2 +- Library/Homebrew/test/tab_test.rb | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index 332237a57f..ced49b7b22 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -248,7 +248,7 @@ class Tab < OpenStruct def parsed_homebrew_version return Version::NULL if homebrew_version.nil? - Version.new(homebrew_tag) + Version.new(homebrew_version) end # Whether there is reliable runtime dependency information in the receipt. diff --git a/Library/Homebrew/test/tab_test.rb b/Library/Homebrew/test/tab_test.rb index eecb111947..bc0be85764 100644 --- a/Library/Homebrew/test/tab_test.rb +++ b/Library/Homebrew/test/tab_test.rb @@ -86,11 +86,18 @@ class TabTests < Homebrew::TestCase tab = Tab.new(homebrew_version: "1.2.3") assert_equal "1.2.3", tab.parsed_homebrew_version + assert tab.parsed_homebrew_version < "1.2.3-1-g12789abdf" assert_kind_of Version, tab.parsed_homebrew_version + tab.homebrew_version = "1.2.4-567-g12789abdf" + assert tab.parsed_homebrew_version > "1.2.4" + assert tab.parsed_homebrew_version > "1.2.4-566-g21789abdf" + assert tab.parsed_homebrew_version < "1.2.4-568-g01789abdf" + tab = Tab.new(homebrew_version: "2.0.0-134-gabcdefabc-dirty") - assert_equal "2.0.0", tab.parsed_homebrew_version - assert_kind_of Version, tab.parsed_homebrew_version + assert tab.parsed_homebrew_version > "2.0.0" + assert tab.parsed_homebrew_version > "2.0.0-133-g21789abdf" + assert tab.parsed_homebrew_version < "2.0.0-135-g01789abdf" end def test_reliable_runtime_dependencies?