Break apart cli.rb in an effort to make the code more testable

[athompson-r7]

All of the code in cli.rb is largely not under test directly. We should start pulling things out of that file in an effort to make testing a bit easier.