RUBOCOP AssignmentInCondition Part 1

fix the simple 2/3
RUBOCOP AssignmentInConditon Part 2

Including a semi decent refactor around checking for existing hooks to
be more understandable