chef-client should have an -E / --environment option that sets Chef::Config[:environment]