diff options
| author | Jack Nagel | 2014-08-14 01:00:23 -0500 |
|---|---|---|
| committer | Jack Nagel | 2014-08-14 01:00:23 -0500 |
| commit | 19e738db57a43550236722df5ed7bcf834e71c0c (patch) | |
| tree | 24d0d9041bbd8350500980ea45329132e3c6d1f1 | |
| parent | 90a19a24542c27a1a3b11c77d009bd86b6896065 (diff) | |
| download | homebrew-19e738db57a43550236722df5ed7bcf834e71c0c.tar.bz2 | |
Use the as_flags method instead of map
| -rw-r--r-- | Library/Homebrew/formula.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/tab.rb | 8 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_tab.rb | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index b1f3df267..35b0f60a9 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -453,7 +453,7 @@ class Formula hsh["installed"] << { "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, "poured_from_bottle" => tab.poured_from_bottle } diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index c5286ea4e..c295fe90e 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -11,8 +11,8 @@ class Tab < OpenStruct FILENAME = 'INSTALL_RECEIPT.json' def self.create(formula, compiler, stdlib, build) - Tab.new :used_options => build.used_options.map(&:to_s), - :unused_options => build.unused_options.map(&:to_s), + Tab.new :used_options => build.used_options.as_flags, + :unused_options => build.unused_options.as_flags, :tabfile => formula.prefix.join(FILENAME), :built_as_bottle => !!ARGV.build_bottle?, :poured_from_bottle => false, @@ -122,8 +122,8 @@ class Tab < OpenStruct def to_json Utils::JSON.dump({ - :used_options => used_options.map(&:to_s), - :unused_options => unused_options.map(&:to_s), + :used_options => used_options.as_flags, + :unused_options => unused_options.as_flags, :built_as_bottle => built_as_bottle, :poured_from_bottle => poured_from_bottle, :tapped_from => tapped_from, diff --git a/Library/Homebrew/test/test_tab.rb b/Library/Homebrew/test/test_tab.rb index 68e5dfb97..37a2cc06f 100644 --- a/Library/Homebrew/test/test_tab.rb +++ b/Library/Homebrew/test/test_tab.rb @@ -8,8 +8,8 @@ class TabTests < Homebrew::TestCase @unused = Options.create(%w(--with-baz --without-qux)) @tab = Tab.new({ - :used_options => @used.map(&:to_s), - :unused_options => @unused.map(&:to_s), + :used_options => @used.as_flags, + :unused_options => @unused.as_flags, :built_as_bottle => false, :poured_from_bottle => true, :tapped_from => "Homebrew/homebrew", |