Rename :chef_server to :chef_client. [GH-359]

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## 0.8.0 (unreleased)
 
   - Performance optimizations in `virtualbox` gem. Huge speed gains.
+  - `:chef_server` provisioner is now `:chef_client`. [GH-359]
 
 ## 0.7.6 (July 2, 2011)
 

lib/vagrant/provisioners.rb

@@ -2,7 +2,7 @@
 # as configuration classes right away with Vagrant.
 require 'vagrant/provisioners/base'
 require 'vagrant/provisioners/chef'
-require 'vagrant/provisioners/chef_server'
+require 'vagrant/provisioners/chef_client'
 require 'vagrant/provisioners/chef_solo'
 require 'vagrant/provisioners/puppet'
 require 'vagrant/provisioners/puppet_server'

lib/vagrant/provisioners/chef_client.rb

@@ -4,8 +4,8 @@ module Vagrant
   module Provisioners
     # This class implements provisioning via chef-client, allowing provisioning
     # with a chef server.
-    class ChefServer < Chef
-      register :chef_server
+    class ChefClient < Chef
+      register :chef_client
 
       class Config < Chef::Config
         attr_accessor :chef_server_url
@@ -68,7 +68,7 @@ module Vagrant
         env.ui.info I18n.t("vagrant.provisioners.chef.upload_validation_key")
         vm.ssh.upload!(validation_key_path, guest_validation_key_path)
       end
-      
+
       def upload_encrypted_data_bag_secret
         env.ui.info I18n.t("vagrant.provisioners.chef.upload_encrypted_data_bag_secret_key")
         vm.ssh.upload!(encrypted_data_bag_secret_key_path, config.encrypted_data_bag_secret)
@@ -107,7 +107,7 @@ module Vagrant
       def validation_key_path
         File.expand_path(config.validation_key_path, env.root_path)
       end
-      
+
       def encrypted_data_bag_secret_key_path
         File.expand_path(config.encrypted_data_bag_secret_key_path, env.root_path)
       end

templates/locales/en.yml

@@ -468,7 +468,7 @@ en:
         upload_encrypted_data_bag_secret_key: "Uploading chef encrypted data bag secret key..."
         running_client: "Running chef-client..."
         running_solo: "Running chef-solo..."
-        invalid_provisioner: "Vagrant::Provisioners::Chef is not a valid provisioner! Use ChefSolo or ChefServer instead."
+        invalid_provisioner: "Vagrant::Provisioners::Chef is not a valid provisioner! Use ChefSolo or ChefClient instead."
         not_detected: |-
           The `%{binary}` binary appears to not be in the PATH of the guest. This
           could be because the PATH is not properly setup or perhaps chef is not

test/vagrant/provisioners/chef_client_test.rb

@@ -1,8 +1,8 @@
 require "test_helper"
 
-class ChefServerProvisionerTest < Test::Unit::TestCase
+class ChefClientProvisionerTest < Test::Unit::TestCase
   setup do
-    @klass = Vagrant::Provisioners::ChefServer
+    @klass = Vagrant::Provisioners::ChefClient
 
     @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)