Updated Cask::Cask#to_h to call Conflicts#to_h instead of to_a. Updated ConflictsWith#to_h to iterate over VALID_KEYS.
This commit is contained in:
parent
cadb193e3b
commit
97ca5932cf
@ -133,7 +133,7 @@ module Cask
|
|||||||
end,
|
end,
|
||||||
"caveats" => caveats,
|
"caveats" => caveats,
|
||||||
"depends_on" => depends_on,
|
"depends_on" => depends_on,
|
||||||
"conflicts_with" => conflicts_with.to_a,
|
"conflicts_with" => conflicts_with.to_h,
|
||||||
"container" => container,
|
"container" => container,
|
||||||
"auto_updates" => auto_updates,
|
"auto_updates" => auto_updates,
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,10 +26,8 @@ module Cask
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def to_a
|
def to_h
|
||||||
conflicts={}
|
Hash[VALID_KEYS.map { |key| [key, instance_variable_get("@#{key}").to_a] }]
|
||||||
@pairs.each { |k, v| conflicts[k]=v }
|
|
||||||
conflicts
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user