From 8bd38d08cb65be99eac0cbb9cda98c8231057f06 Mon Sep 17 00:00:00 2001 From: AndrewMcBurney Date: Tue, 6 Mar 2018 12:07:57 -0500 Subject: [PATCH] Move `linkage_cache_store.rb` to `~/Library/Homebrew`. --- Library/Homebrew/{os/mac => }/linkage_cache_store.rb | 5 +++-- Library/Homebrew/linkage_checker.rb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) rename Library/Homebrew/{os/mac => }/linkage_cache_store.rb (97%) diff --git a/Library/Homebrew/os/mac/linkage_cache_store.rb b/Library/Homebrew/linkage_cache_store.rb similarity index 97% rename from Library/Homebrew/os/mac/linkage_cache_store.rb rename to Library/Homebrew/linkage_cache_store.rb index 4e2cb3ece5..cb306b9089 100644 --- a/Library/Homebrew/os/mac/linkage_cache_store.rb +++ b/Library/Homebrew/linkage_cache_store.rb @@ -1,3 +1,4 @@ +require "set" require "cache_store" # @@ -27,9 +28,9 @@ class LinkageStore < CacheStore # @return [nil] def update!(array_values: {}, hash_values: {}, **values) values.each do |key, value| - if value.is_a? Hash + if value.is_a?(Hash) hash_values[key] = value - elsif value.is_a? Array + elsif value.is_a?(Array) || value.is_a?(Set) array_values[key] = value else raise TypeError, "Can't store types that are not `Array` or `Hash` in the linkage store." diff --git a/Library/Homebrew/linkage_checker.rb b/Library/Homebrew/linkage_checker.rb index 9b04dbc79a..0cf05441ea 100644 --- a/Library/Homebrew/linkage_checker.rb +++ b/Library/Homebrew/linkage_checker.rb @@ -1,7 +1,7 @@ require "set" require "keg" require "formula" -require "os/mac/linkage_cache_store" +require "linkage_cache_store" class LinkageChecker attr_reader :keg, :formula, :store