If they are in spasm , no use stretching them, just makes it worse unless you are very gentle about it.

My chiro used a NIMMO technique which is more or less a mix of trigger point & deep tissue, plus a lot of ultrasound, heat, low level laser, IF stim.. all my upper body muscles were spasmed/locked up at the time.

Hiker is your rib not healed/healing ?