aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/tab.rb
diff options
context:
space:
mode:
authorJack Nagel2015-02-21 12:15:39 -0500
committerJack Nagel2015-02-21 12:26:14 -0500
commita6b16dfa187dca5521da8b99eba2eeb69cb561cc (patch)
tree742e817f052c0eb8b3bfbf13d695ead04a163629 /Library/Homebrew/tab.rb
parent22cf99094f7944de1c7989235c628c599dc760c7 (diff)
downloadbrew-a6b16dfa187dca5521da8b99eba2eeb69cb561cc.tar.bz2
Eliminate conditional
Diffstat (limited to 'Library/Homebrew/tab.rb')
-rw-r--r--Library/Homebrew/tab.rb15
1 files changed, 9 insertions, 6 deletions
diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb
index 530cee404..f077f6451 100644
--- a/Library/Homebrew/tab.rb
+++ b/Library/Homebrew/tab.rb
@@ -42,7 +42,7 @@ class Tab < OpenStruct
if path.exist?
from_file(path)
else
- dummy_tab
+ empty
end
end
@@ -83,16 +83,19 @@ class Tab < OpenStruct
tab = from_file(path)
used_options = remap_deprecated_options(f.deprecated_options, tab.used_options)
tab.used_options = used_options.as_flags
- tab
else
- dummy_tab(f)
+ tab = empty
+ tab.unused_options = f.options.as_flags
+ tab.source = { :path => f.path.to_s }
end
+
+ tab
end
- def self.dummy_tab f=nil
+ def self.empty
attributes = {
:used_options => [],
- :unused_options => f ? f.options.as_flags : [],
+ :unused_options => [],
:built_as_bottle => false,
:poured_from_bottle => false,
:tapped_from => "",
@@ -101,7 +104,7 @@ class Tab < OpenStruct
:stdlib => nil,
:compiler => "clang",
:source => {
- :path => f ? f.path.to_s : nil,
+ :path => nil,
},
}