Skip to content

Commit 3b42ab7

Browse files
Merge pull request #489 from GabrielNagy/vanagon-diff-updates1
(maint) Show platform and project settings once per platform [skip-ci]
2 parents 076d4d9 + 1505be3 commit 3b42ab7

File tree

1 file changed

+18
-3
lines changed

1 file changed

+18
-3
lines changed

tasks/vanagon_component_diff.rake

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,19 @@ namespace :vanagon do |args|
232232
old_hash = old.each_with_object({}) do |k, v|
233233
v[k.first] ||= {} # k.first = platform name
234234
k.last.each do |component| # k.last = components
235+
component["platform"].delete("settings")
236+
v[k.first]["_settings"] = component.delete("settings")
237+
v[k.first]["_platform"] = component.delete("platform")
235238
v[k.first][component.delete("name")] = component
236239
end
237240
end
238241

239242
new_hash = new.each_with_object({}) do |k, v|
240-
v[k.first] ||= {}
241-
k.last.each do |component|
243+
v[k.first] ||= {} # k.first = platform name
244+
k.last.each do |component| # k.last = components
245+
component["platform"].delete("settings")
246+
v[k.first]["_settings"] = component.delete("settings")
247+
v[k.first]["_platform"] = component.delete("platform")
242248
v[k.first][component.delete("name")] = component
243249
end
244250
end
@@ -283,7 +289,16 @@ namespace :vanagon do |args|
283289
end
284290

285291
ordered_diff.each do |component, field_hash|
286-
puts String.start_collapsible("Component".tab.bold + "'#{component.cyan}'")
292+
title = case component
293+
when '_settings'
294+
'Project settings'.tab.bold
295+
when '_platform'
296+
'Platform settings'.tab.bold
297+
else
298+
'Component'.tab.bold + "'#{component.cyan}'"
299+
end
300+
301+
puts String.start_collapsible(title)
287302

288303
field_hash.each do |field, diff|
289304
puts "Field:".tab(2).bold + field.code.cyan

0 commit comments

Comments
 (0)