vagrant 0.7.0.beta → 0.7.0.beta2

data/test/vagrant/provisioners/base_test.rb

@@ -1,14 +1,37 @@
 require "test_helper"
 
 class BaseProvisionerTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Provisioners::Base
+  end
+
   should "include the util class so subclasses have access to it" do
     assert Vagrant::Provisioners::Base.include?(Vagrant::Util)
   end
 
+  context "registering provisioners" do
+    teardown do
+      @klass.registered.delete(:zomg)
+    end
+
+    should "not have unregistered provisioners" do
+      assert_nil @klass.registered[:foo]
+    end
+
+    should "be able to register a provisioner" do
+      foo = Class.new(@klass) do
+        register :zomg
+      end
+
+      assert_equal foo, @klass.registered[:zomg]
+    end
+  end
+
   context "base instance" do
     setup do
       @env = Vagrant::Action::Environment.new(vagrant_env)
-      @base = Vagrant::Provisioners::Base.new(@env)
+      @config = mock("config")
+      @base = Vagrant::Provisioners::Base.new(@env, @config)
     end
 
     should "set the environment" do
@@ -19,6 +42,10 @@ class BaseProvisionerTest < Test::Unit::TestCase
       assert_equal @env.env.vm, @base.vm
     end
 
+    should "provide access to the config" do
+      assert_equal @config, @base.config
+    end
+
     should "implement provision! which does nothing" do
       assert_nothing_raised do
         assert @base.respond_to?(:provision!)

data/test/vagrant/provisioners/chef_server_test.rb

@@ -2,13 +2,44 @@ require "test_helper"
 
 class ChefServerProvisionerTest < Test::Unit::TestCase
   setup do
+    @klass = Vagrant::Provisioners::ChefServer
+
     @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
-    @action = Vagrant::Provisioners::ChefServer.new(@action_env)
+    @config = @klass::Config.new
+    @action = @klass.new(@action_env, @config)
     @env = @action.env
     @vm = @action.vm
   end
 
+  context "config validation" do
+    setup do
+      @errors = Vagrant::Config::ErrorRecorder.new
+
+      @config.run_list = ["foo"]
+      @config.chef_server_url = "foo"
+      @config.validation_key_path = "foo"
+    end
+
+    should "be invalid if run list is empty" do
+      @config.run_list = []
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid if run list is empty" do
+      @config.chef_server_url = nil
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid if run list is empty" do
+      @config.validation_key_path = nil
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+  end
+
   context "provisioning" do
     should "run the proper sequence of methods in order" do
       prov_seq = sequence("prov_seq")
@@ -29,21 +60,14 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
     end
 
     should "not raise an exception if validation_key_path is set" do
-      @env = vagrant_env(vagrantfile(<<-vf))
-        config.chef.validation_key_path = "7"
-        config.chef.chef_server_url = "7"
-      vf
+      @config.validation_key_path = "7"
+      @config.chef_server_url = "7"
 
-      @action.stubs(:env).returns(@env)
       assert_nothing_raised { @action.prepare }
     end
 
     should "raise an exception if validation_key_path is nil" do
-      @env = vagrant_env(vagrantfile(<<-vf))
-        config.chef.validation_key_path = nil
-      vf
-
-      @action.stubs(:env).returns(@env)
+      @config.validation_key_path = nil
 
       assert_raises(Vagrant::Provisioners::Chef::ChefError) {
         @action.prepare
@@ -51,23 +75,15 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
     end
 
     should "not raise an exception if validation_key_path does exist" do
-      @env = vagrant_env(vagrantfile(<<-vf))
-        config.chef.validation_key_path = "#{vagrantfile(tmp_path)}"
-        config.chef.chef_server_url = "7"
-      vf
+      @config.validation_key_path = vagrantfile(tmp_path)
+      @config.chef_server_url = "7"
 
-      @action.stubs(:env).returns(@env)
       assert_nothing_raised { @action.prepare }
     end
 
     should "raise an exception if validation_key_path doesn't exist" do
-      @env = vagrant_env(vagrantfile(<<-vf))
-        config.chef.validation_key_path = "7"
-        config.chef.chef_server_url = "7"
-      vf
-
-      @action.stubs(:env).returns(@env)
-      @action.stubs(:validation_key_path).returns("9")
+      @config.validation_key_path = "7"
+      @config.chef_server_url = "7"
 
       File.expects(:file?).with(@action.validation_key_path).returns(false)
       assert_raises(Vagrant::Provisioners::Chef::ChefError) {
@@ -76,21 +92,14 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
     end
 
     should "not raise an exception if chef_server_url is set" do
-      @env = vagrant_env(vagrantfile(<<-vf))
-        config.chef.validation_key_path = "#{vagrantfile(tmp_path)}"
-        config.chef.chef_server_url = "7"
-      vf
+      @config.validation_key_path = vagrantfile(tmp_path)
+      @config.chef_server_url = "7"
 
-      @action.stubs(:env).returns(@env)
       assert_nothing_raised { @action.prepare }
     end
 
     should "raise an exception if chef_server_url is nil" do
-      @env = vagrant_env(vagrantfile(<<-vf))
-        config.chef.chef_server_url = nil
-      vf
-
-      @action.stubs(:env).returns(@env)
+      @config.chef_server_url = nil
 
       assert_raises(Vagrant::Provisioners::Chef::ChefError) {
         @action.prepare
@@ -101,7 +110,7 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
   context "creating the client key folder" do
     setup do
       @raw_path = "/foo/bar/baz.pem"
-      @env.config.chef.client_key_path = @raw_path
+      @config.client_key_path = @raw_path
 
       @path = Pathname.new(@raw_path)
     end
@@ -126,7 +135,7 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
   context "the validation key path" do
     should "expand the configured key path" do
       result = mock("result")
-      File.expects(:expand_path).with(@env.config.chef.validation_key_path, @env.root_path).once.returns(result)
+      File.expects(:expand_path).with(@config.validation_key_path, @env.root_path).once.returns(result)
       assert_equal result, @action.validation_key_path
     end
   end
@@ -134,7 +143,7 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
   context "the guest validation key path" do
     should "be the provisioning path joined with validation.pem" do
       result = mock("result")
-      File.expects(:join).with(@env.config.chef.provisioning_path, "validation.pem").once.returns(result)
+      File.expects(:join).with(@config.provisioning_path, "validation.pem").once.returns(result)
       assert_equal result, @action.guest_validation_key_path
     end
   end
@@ -146,11 +155,11 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
 
     should "call setup_config with proper variables" do
       @action.expects(:setup_config).with("chef_server_client", "client.rb", {
-        :node_name => @env.config.chef.node_name,
-        :chef_server_url => @env.config.chef.chef_server_url,
-        :validation_client_name => @env.config.chef.validation_client_name,
+        :node_name => @config.node_name,
+        :chef_server_url => @config.chef_server_url,
+        :validation_client_name => @config.validation_client_name,
         :validation_key => @action.guest_validation_key_path,
-        :client_key => @env.config.chef.client_key_path
+        :client_key => @config.client_key_path
       })
 
       @action.setup_server_config
@@ -164,7 +173,7 @@ class ChefServerProvisionerTest < Test::Unit::TestCase
     end
 
     should "cd into the provisioning directory and run chef client" do
-      @ssh.expects(:exec!).with("cd #{@env.config.chef.provisioning_path} && sudo -E chef-client -c client.rb -j dna.json").once
+      @ssh.expects(:exec!).with("sudo -i 'cd #{@config.provisioning_path} && chef-client -c client.rb -j dna.json'").once
       @action.run_chef_client
     end
 

data/test/vagrant/provisioners/chef_solo_test.rb

@@ -2,13 +2,36 @@ require "test_helper"
 
 class ChefSoloProvisionerTest < Test::Unit::TestCase
   setup do
+    @klass = Vagrant::Provisioners::ChefSolo
+
     @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
-    @action = Vagrant::Provisioners::ChefSolo.new(@action_env)
+    @config = @klass::Config.new
+    @action = @klass.new(@action_env, @config)
     @env = @action.env
     @vm = @action.vm
   end
 
+  context "config validation" do
+    setup do
+      @errors = Vagrant::Config::ErrorRecorder.new
+      @config.run_list = ["foo"]
+      @config.cookbooks_path = "cookbooks"
+    end
+
+    should "be invalid if run list is empty" do
+      @config.run_list = []
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+
+    should "be invalid if cookbooks path is empty" do
+      @config.cookbooks_path = nil
+      @config.validate(@errors)
+      assert !@errors.errors.empty?
+    end
+  end
+
   context "preparing" do
     should "share cookbook folders" do
       @action.expects(:share_cookbook_folders).once
@@ -87,8 +110,8 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
   context "host cookbooks paths" do
     should "get folders path for configured cookbooks path" do
       result = mock("result")
-      @env.config.chef.stubs(:cookbooks_path).returns("foo")
-      @action.expects(:host_folder_paths).with(@env.config.chef.cookbooks_path).returns(result)
+      @config.stubs(:cookbooks_path).returns("foo")
+      @action.expects(:host_folder_paths).with(@config.cookbooks_path).returns(result)
       assert_equal result, @action.host_cookbook_paths
     end
   end
@@ -96,15 +119,15 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
   context "host roles paths" do
     should "get folders path for configured roles path" do
       result = mock("result")
-      @env.config.chef.stubs(:roles_path).returns("foo")
-      @action.expects(:host_folder_paths).with(@env.config.chef.roles_path).returns(result)
+      @config.stubs(:roles_path).returns("foo")
+      @action.expects(:host_folder_paths).with(@config.roles_path).returns(result)
       assert_equal result, @action.host_role_paths
     end
   end
 
   context "folder path" do
     should "return a proper path to a single folder" do
-      expected = File.join(@env.config.chef.provisioning_path, "cookbooks-5")
+      expected = File.join(@config.provisioning_path, "cookbooks-5")
       assert_equal expected, @action.folder_path("cookbooks", 5)
     end
 
@@ -125,33 +148,33 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     end
 
     should "properly format VM folder paths" do
-      @env.config.chef.provisioning_path = "/foo"
+      @config.provisioning_path = "/foo"
       assert_equal "/foo/bar", @action.folders_path([:vm, "bar"], nil)
     end
   end
 
   context "cookbooks path" do
     should "return a proper path to a single cookbook" do
-      expected = File.join(@env.config.chef.provisioning_path, "cookbooks-5")
+      expected = File.join(@config.provisioning_path, "cookbooks-5")
       assert_equal expected, @action.cookbook_path(5)
     end
 
     should "properly call folders path and return result" do
       result = [:a, :b, :c]
-      @action.expects(:folders_path).with(@env.config.chef.cookbooks_path, "cookbooks").once.returns(result)
+      @action.expects(:folders_path).with(@config.cookbooks_path, "cookbooks").once.returns(result)
       assert_equal result.to_json, @action.cookbooks_path
     end
   end
 
   context "roles path" do
     should "return a proper path to a single role" do
-      expected = File.join(@env.config.chef.provisioning_path, "roles-5")
+      expected = File.join(@config.provisioning_path, "roles-5")
       assert_equal expected, @action.role_path(5)
     end
 
     should "properly call folders path and return result" do
       result = [:a, :b, :c]
-      @action.expects(:folders_path).with(@env.config.chef.roles_path, "roles").once.returns(result)
+      @action.expects(:folders_path).with(@config.roles_path, "roles").once.returns(result)
       assert_equal result.to_json, @action.roles_path
     end
   end
@@ -160,15 +183,15 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     setup do
       @vm.ssh.stubs(:upload!)
 
-      @env.config.chef.recipe_url = "foo/bar/baz"
+      @config.recipe_url = "foo/bar/baz"
     end
 
     should "call setup_config with proper variables" do
       @action.expects(:setup_config).with("chef_solo_solo", "solo.rb", {
-        :node_name => @env.config.chef.node_name,
-        :provisioning_path => @env.config.chef.provisioning_path,
+        :node_name => @config.node_name,
+        :provisioning_path => @config.provisioning_path,
         :cookbooks_path => @action.cookbooks_path,
-        :recipe_url => @env.config.chef.recipe_url,
+        :recipe_url => @config.recipe_url,
         :roles_path => @action.roles_path
       })
 
@@ -183,7 +206,7 @@ class ChefSoloProvisionerTest < Test::Unit::TestCase
     end
 
     should "cd into the provisioning directory and run chef solo" do
-      @ssh.expects(:exec!).with("cd #{@env.config.chef.provisioning_path} && sudo -E chef-solo -c solo.rb -j dna.json").once
+      @ssh.expects(:exec!).with("sudo -i 'cd #{@config.provisioning_path} && chef-solo -c solo.rb -j dna.json'").once
       @action.run_chef_solo
     end
 

data/test/vagrant/provisioners/chef_test.rb

@@ -4,24 +4,22 @@ class ChefProvisionerTest < Test::Unit::TestCase
   setup do
     @action_env = Vagrant::Action::Environment.new(vagrant_env.vms[:default].env)
 
-    @action = Vagrant::Provisioners::Chef.new(@action_env)
+    @klass = Vagrant::Provisioners::Chef
+    @config = @klass::Config.new
+    @action = @klass.new(@action_env, @config)
     @env = @action.env
     @vm = @action.vm
   end
 
   context "preparing" do
     should "error the environment" do
-      assert_raises(Vagrant::Provisioners::Chef::ChefError) {
+      assert_raises(@klass::ChefError) {
         @action.prepare
       }
     end
   end
 
   context "config" do
-    setup do
-      @config = Vagrant::Provisioners::Chef::ChefConfig.new
-    end
-
     should "not include the 'json' key in the config dump" do
       result = @config.to_json
       assert result !~ /"json":/
@@ -65,74 +63,6 @@ class ChefProvisionerTest < Test::Unit::TestCase
       @config.add_role("role[user]")
       assert_equal "role[user]", @config.run_list[0]
     end
-
-    context "validation" do
-      setup do
-        @errors = Vagrant::Config::ErrorRecorder.new
-        @top = @config.top = Vagrant::Config::Top.new(@env)
-      end
-
-      context "chef solo" do
-        setup do
-          @top.vm.provisioner = :chef_solo
-
-          @config.run_list = ["foo"]
-          @config.cookbooks_path = "cookbooks"
-        end
-
-        should "be valid if provisioner is not chef solo" do
-          @top.vm.provisioner = nil
-          @config.validate(@errors)
-          assert @errors.errors.empty?
-        end
-
-        should "be invalid if run list is empty" do
-          @config.run_list = []
-          @config.validate(@errors)
-          assert !@errors.errors.empty?
-        end
-
-        should "be invalid if cookbooks path is empty" do
-          @config.cookbooks_path = nil
-          @config.validate(@errors)
-          assert !@errors.errors.empty?
-        end
-      end
-
-      context "chef server" do
-        setup do
-          @top.vm.provisioner = :chef_server
-
-          @config.run_list = ["foo"]
-          @config.chef_server_url = "foo"
-          @config.validation_key_path = "foo"
-        end
-
-        should "be valid if provisioner is not chef solo" do
-          @top.vm.provisioner = nil
-          @config.validate(@errors)
-          assert @errors.errors.empty?
-        end
-
-        should "be invalid if run list is empty" do
-          @config.run_list = []
-          @config.validate(@errors)
-          assert !@errors.errors.empty?
-        end
-
-        should "be invalid if run list is empty" do
-          @config.chef_server_url = nil
-          @config.validate(@errors)
-          assert !@errors.errors.empty?
-        end
-
-        should "be invalid if run list is empty" do
-          @config.validation_key_path = nil
-          @config.validate(@errors)
-          assert !@errors.errors.empty?
-        end
-      end
-    end
   end
 
   context "verifying binary" do
@@ -143,7 +73,7 @@ class ChefProvisionerTest < Test::Unit::TestCase
 
     should "verify binary exists" do
       binary = "foo"
-      @ssh.expects(:exec!).with("which #{binary}", anything)
+      @ssh.expects(:exec!).with("sudo -i which #{binary}", anything)
       @action.verify_binary(binary)
     end
   end
@@ -152,8 +82,8 @@ class ChefProvisionerTest < Test::Unit::TestCase
     should "create and chown the folder to the ssh user" do
       ssh_seq = sequence("ssh_seq")
       ssh = mock("ssh")
-      ssh.expects(:exec!).with("sudo mkdir -p #{@env.config.chef.provisioning_path}").once.in_sequence(ssh_seq)
-      ssh.expects(:exec!).with("sudo chown #{@env.config.ssh.username} #{@env.config.chef.provisioning_path}").once.in_sequence(ssh_seq)
+      ssh.expects(:exec!).with("sudo mkdir -p #{@config.provisioning_path}").once.in_sequence(ssh_seq)
+      ssh.expects(:exec!).with("sudo chown #{@env.config.ssh.username} #{@config.provisioning_path}").once.in_sequence(ssh_seq)
       @vm.ssh.expects(:execute).yields(ssh)
       @action.chown_provisioning_folder
     end
@@ -174,7 +104,7 @@ class ChefProvisionerTest < Test::Unit::TestCase
       string_io = mock("string_io")
       Vagrant::Util::TemplateRenderer.expects(:render).with(@template, anything).returns(template_data)
       StringIO.expects(:new).with(template_data).returns(string_io)
-      File.expects(:join).with(@env.config.chef.provisioning_path, @filename).once.returns("bar")
+      File.expects(:join).with(@config.provisioning_path, @filename).once.returns("bar")
       @vm.ssh.expects(:upload!).with(string_io, "bar")
 
       @action.setup_config(@template, @filename, {})
@@ -183,7 +113,7 @@ class ChefProvisionerTest < Test::Unit::TestCase
     should "provide log level by default" do
       Vagrant::Util::TemplateRenderer.expects(:render).returns("foo").with() do |template, vars|
         assert vars.has_key?(:log_level)
-        assert_equal @env.config.chef.log_level.to_sym, vars[:log_level]
+        assert_equal @config.log_level.to_sym, vars[:log_level]
         true
       end
 
@@ -221,7 +151,7 @@ class ChefProvisionerTest < Test::Unit::TestCase
     end
 
     should "merge in the extra json specified in the config" do
-      @env.config.chef.json = { :foo => "BAR" }
+      @config.json = { :foo => "BAR" }
       assert_json do |data|
         assert_equal "BAR", data["foo"]
       end
@@ -241,7 +171,7 @@ class ChefProvisionerTest < Test::Unit::TestCase
 
     should "upload a StringIO to dna.json" do
       StringIO.expects(:new).with(anything).returns("bar")
-      File.expects(:join).with(@env.config.chef.provisioning_path, "dna.json").once.returns("baz")
+      File.expects(:join).with(@config.provisioning_path, "dna.json").once.returns("baz")
       @vm.ssh.expects(:upload!).with("bar", "baz").once
       @action.setup_json
     end