You can use the wrapfig package to automatically wrap text around a figure (including the figure caption). Click the example below which shows left and right aligned figures with wrapped text to try it for yourself.