mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate conditional

Browse Source
This commit is contained in:
Jack Nagel 2015-02-21 12:15:39 -05:00
parent 22cf99094f
commit a6b16dfa18
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Library/Homebrew/tab.rb
View File

@ -42,7 +42,7 @@ class Tab < OpenStruct
if path.exist? if path.exist?
from_file(path) from_file(path)
else else
dummy_tab empty
end end
end end
@ -83,16 +83,19 @@ class Tab < OpenStruct
tab = from_file(path) tab = from_file(path)
used_options = remap_deprecated_options(f.deprecated_options, tab.used_options) used_options = remap_deprecated_options(f.deprecated_options, tab.used_options)
tab.used_options = used_options.as_flags tab.used_options = used_options.as_flags
tab
else else
dummy_tab(f) tab = empty
tab.unused_options = f.options.as_flags
tab.source = { :path => f.path.to_s }
end end
tab
end end
def self.dummy_tab f=nil def self.empty
attributes = { attributes = {
:used_options => [], :used_options => [],
:unused_options => f ? f.options.as_flags : [], :unused_options => [],
:built_as_bottle => false, :built_as_bottle => false,
:poured_from_bottle => false, :poured_from_bottle => false,
:tapped_from => "", :tapped_from => "",
@ -101,7 +104,7 @@ class Tab < OpenStruct
:stdlib => nil, :stdlib => nil,
:compiler => "clang", :compiler => "clang",
:source => { :source => {
:path => f ? f.path.to_s : nil, :path => nil,
}, },
} }

2
Library/Homebrew/test/test_tab.rb
View File

@ -22,7 +22,7 @@ class TabTests < Homebrew::TestCase
end end
def test_defaults def test_defaults
tab = Tab.dummy_tab tab = Tab.empty
assert_empty tab.unused_options assert_empty tab.unused_options
assert_empty tab.used_options assert_empty tab.used_options
refute_predicate tab, :built_as_bottle refute_predicate tab, :built_as_bottle