admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Use the as_flags method instead of map

Browse Source
This commit is contained in:
Jack Nagel 2014-08-14 01:00:23 -05:00
parent 4c4193e905
commit c7444d34f7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/formula.rb
View File

@ -453,7 +453,7 @@ class Formula
hsh["installed"] << { hsh["installed"] << {
"version" => keg.version.to_s, "version" => keg.version.to_s,
"used_options" => tab.used_options.map(&:flag), "used_options" => tab.used_options.as_flags,
"built_as_bottle" => tab.built_bottle, "built_as_bottle" => tab.built_bottle,
"poured_from_bottle" => tab.poured_from_bottle "poured_from_bottle" => tab.poured_from_bottle
} }

8
Library/Homebrew/tab.rb
View File

@ -11,8 +11,8 @@ class Tab < OpenStruct
FILENAME = 'INSTALL_RECEIPT.json' FILENAME = 'INSTALL_RECEIPT.json'
def self.create(formula, compiler, stdlib, build) def self.create(formula, compiler, stdlib, build)
Tab.new :used_options => build.used_options.map(&:to_s), Tab.new :used_options => build.used_options.as_flags,
:unused_options => build.unused_options.map(&:to_s), :unused_options => build.unused_options.as_flags,
:tabfile => formula.prefix.join(FILENAME), :tabfile => formula.prefix.join(FILENAME),
:built_as_bottle => !!ARGV.build_bottle?, :built_as_bottle => !!ARGV.build_bottle?,
:poured_from_bottle => false, :poured_from_bottle => false,
@ -122,8 +122,8 @@ class Tab < OpenStruct
def to_json def to_json
Utils::JSON.dump({ Utils::JSON.dump({
:used_options => used_options.map(&:to_s), :used_options => used_options.as_flags,
:unused_options => unused_options.map(&:to_s), :unused_options => unused_options.as_flags,
:built_as_bottle => built_as_bottle, :built_as_bottle => built_as_bottle,
:poured_from_bottle => poured_from_bottle, :poured_from_bottle => poured_from_bottle,
:tapped_from => tapped_from, :tapped_from => tapped_from,

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

@ -8,8 +8,8 @@ class TabTests < Homebrew::TestCase
@unused = Options.create(%w(--with-baz --without-qux)) @unused = Options.create(%w(--with-baz --without-qux))
@tab = Tab.new({ @tab = Tab.new({
:used_options => @used.map(&:to_s), :used_options => @used.as_flags,
:unused_options => @unused.map(&:to_s), :unused_options => @unused.as_flags,
:built_as_bottle => false, :built_as_bottle => false,
:poured_from_bottle => true, :poured_from_bottle => true,
:tapped_from => "Homebrew/homebrew", :tapped_from => "Homebrew/homebrew",