@@ -232,13 +232,19 @@ namespace :vanagon do |args|
232
232
old_hash = old . each_with_object ( { } ) do |k , v |
233
233
v [ k . first ] ||= { } # k.first = platform name
234
234
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" )
235
238
v [ k . first ] [ component . delete ( "name" ) ] = component
236
239
end
237
240
end
238
241
239
242
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" )
242
248
v [ k . first ] [ component . delete ( "name" ) ] = component
243
249
end
244
250
end
@@ -283,7 +289,16 @@ namespace :vanagon do |args|
283
289
end
284
290
285
291
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 )
287
302
288
303
field_hash . each do |field , diff |
289
304
puts "Field:" . tab ( 2 ) . bold + field . code . cyan
0 commit comments