Given that, I'd definitely recommend you check out Rump: https://github.com/railsmachine/rump

It'll let you manage your servers in a headless manner, using simple version control via git to manage your puppet configuration.

[Disclaimer: I work for Rails Machine.]