foodcritic and rubocop

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
fix conflicts

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>