vagrantup 0.6.9 → 0.7.0

data/test/vagrant/config_test.rb

@@ -5,117 +5,79 @@ class ConfigTest < Test::Unit::TestCase
     @klass = Vagrant::Config
   end
 
-  context "with an instance" do
-    setup do
-      @env = vagrant_env
-      @instance = @klass.new(@env)
-    end
+  context "with the class" do
+    should "allow access to the last proc" do
+      foo = mock("object")
+      foo.expects(:call).once
 
-    should "initially have an empty queue" do
-      assert @instance.queue.empty?
-    end
+      @klass.run { |config| foo.call }
+      value = @klass.last_proc.first
+      assert value.is_a?(Proc)
+      value.call(nil)
 
-    should "reset the config class on load, then execute" do
-      seq = sequence("sequence")
-      @klass.expects(:reset!).with(@env).in_sequence(seq)
-      @klass.expects(:execute!).in_sequence(seq)
-      @instance.load!
+      assert @klass.last_proc.nil?
     end
+  end
 
-    should "run the queue in the order given" do
-      @instance.queue << Proc.new { |config| config.vm.box = "foo" }
-      @instance.queue << Proc.new { |config| config.vm.box = "bar" }
-      result = @instance.load!
-
-      assert_equal "bar", result.vm.box
+  context "with an instance" do
+    setup do
+      @instance = @klass.new
     end
 
-    should "allow nested arrays" do
-      queue = []
-      queue << Proc.new { |config| config.vm.box = "foo" }
-      queue << Proc.new { |config| config.vm.box = "bar" }
-      @instance.queue << queue
-      result = @instance.load!
+    should "load the config files in the given order" do
+      names = %w{alpha beta gamma}
 
-      assert_equal "bar", result.vm.box
-    end
+      @instance.load_order = [:alpha, :beta]
 
-    should "load a file if it exists" do
-      filename = "foo"
-      File.expects(:exist?).with(filename).returns(true)
-      @instance.expects(:load).with(filename).once
+      names.each do |name|
+        vagrantfile(vagrant_box(name), "config.vm.box = '#{name}'")
+        @instance.set(name.to_sym, vagrant_box(name).join("Vagrantfile"))
+      end
 
-      @instance.queue << filename
-      @instance.load!
+      config = @instance.load(nil)
+      assert_equal "beta", config.vm.box
     end
 
-    should "not load a file if it doesn't exist" do
-      filename = "foo"
-      File.expects(:exist?).with(filename).returns(false)
-      @instance.expects(:load).with(filename).never
+    should "load the config as procs" do
+      @instance.set(:proc, Proc.new { |config| config.vm.box = "proc" })
+      @instance.load_order = [:proc]
+      config = @instance.load(nil)
 
-      @instance.queue << filename
-      @instance.load!
+      assert_equal "proc", config.vm.box
     end
 
-    should "raise an exception if there is a syntax error in a file" do
-      @instance.queue << "foo"
-      File.expects(:exist?).with("foo").returns(true)
-      @instance.expects(:load).with("foo").raises(SyntaxError.new)
+    should "load an array of procs" do
+      @instance.set(:proc, [Proc.new { |config| config.vm.box = "proc" },
+                            Proc.new { |config| config.vm.box = "proc2" }])
+      @instance.load_order = [:proc]
+      config = @instance.load(nil)
 
-      assert_raises(Vagrant::Errors::VagrantfileSyntaxError) {
-        @instance.load!
-      }
+      assert_equal "proc2", config.vm.box
     end
-  end
 
-  context "resetting" do
-    setup do
-      @klass.reset!(vagrant_env)
-      @klass::Top.any_instance.stubs(:validate!)
-      @klass.run { |config| }
-      @klass.execute!
+    should "not care if a file doesn't exist" do
+      @instance.load_order = [:foo]
+      assert_nothing_raised { @instance.set(:foo, "i/dont/exist") }
+      assert_nothing_raised { @instance.load(nil) }
     end
 
-    should "return the same config object typically" do
-      config = @klass.config
-      assert config.equal?(@klass.config)
-    end
+    should "not reload a file" do
+      foo_path = vagrant_box("foo").join("Vagrantfile")
 
-    should "create a new object if cleared" do
-      config = @klass.config
-      @klass.reset!
-      assert !config.equal?(@klass.config)
-    end
+      vagrantfile(vagrant_box("foo"))
+      @instance.set(:foo, foo_path)
 
-    should "empty the proc stack" do
-      assert !@klass.proc_stack.empty?
-      @klass.reset!
-      assert @klass.proc_stack.empty?
+      # Nothing should be raised in this case because the file isn't reloaded
+      vagrantfile(vagrant_box("foo"), "^%&8318")
+      assert_nothing_raised { @instance.set(:foo, foo_path) }
     end
 
-    should "reload the config object based on the given environment" do
-      env = mock("env")
-      @klass.expects(:config).with(env).once
-      @klass.reset!(env)
-    end
-  end
-
-  context "initializing" do
-    setup do
-      @klass.reset!(vagrant_env)
-    end
-
-    should "add the given block to the proc stack" do
-      proc = Proc.new {}
-      @klass.run(&proc)
-      assert_equal [proc], @klass.proc_stack
-    end
+    should "raise an exception if there is a syntax error in a file" do
+      vagrantfile(vagrant_box("foo"), "^%&8318")
 
-    should "return the configuration on execute!" do
-      @klass.run {}
-      result = @klass.execute!
-      assert result.is_a?(@klass::Top)
+      assert_raises(Vagrant::Errors::VagrantfileSyntaxError) {
+        @instance.set(:foo, vagrant_box("foo").join("Vagrantfile"))
+      }
     end
   end
 
@@ -149,7 +111,6 @@ class ConfigTest < Test::Unit::TestCase
           key = "key#{i}"
           klass = mock("klass#{i}")
           instance = mock("instance#{i}")
-          instance.expects(:env=).with(env)
           instance.expects(:top=).with() do |top|
             assert top.is_a?(@klass::Top)
             true
@@ -165,7 +126,6 @@ class ConfigTest < Test::Unit::TestCase
         key = "my_foo_bar_key"
         klass = mock("klass")
         instance = mock("instance")
-        instance.stubs(:env=)
         instance.stubs(:top=)
         klass.expects(:new).returns(instance)
         @klass::Top.configures(key, klass)

data/test/vagrant/downloaders/file_test.rb

@@ -17,11 +17,25 @@ class FileDownloaderTest < Test::Unit::TestCase
   end
 
   context "downloading" do
+    setup do
+      clean_paths
+    end
+
     should "cp the file" do
-      path = '/path'
-      @tempfile.expects(:path).returns(path)
-      FileUtils.expects(:cp).with(@uri, path)
-      @downloader.download!(@uri, @tempfile)
+      uri = tmp_path.join("foo_source")
+      dest = tmp_path.join("foo_dest")
+
+      # Create the source file, then "download" it
+      File.open(uri, "w+") { |f| f.write("FOO") }
+      File.open(dest, "w+") do |dest_file|
+        @downloader.download!(uri, dest_file)
+      end
+
+      # Finally, verify the destination file was properly created
+      assert File.file?(dest)
+      File.open(dest) do |f|
+        assert_equal "FOO", f.read
+      end
     end
   end
 

data/test/vagrant/environment_test.rb

@@ -4,15 +4,17 @@ require "pathname"
 class EnvironmentTest < Test::Unit::TestCase
   setup do
     @klass = Vagrant::Environment
+
+    clean_paths
   end
 
   context "class method check virtualbox version" do
     setup do
-      VirtualBox.stubs(:version).returns("3.1.4")
+      VirtualBox.stubs(:version).returns("4.0.0")
     end
 
     should "not error and exit if everything is good" do
-      VirtualBox.expects(:version).returns("3.2.4")
+      VirtualBox.expects(:version).returns("4.0.0")
       assert_nothing_raised { @klass.check_virtualbox! }
     end
 
@@ -21,17 +23,11 @@ class EnvironmentTest < Test::Unit::TestCase
       assert_raises(Vagrant::Errors::VirtualBoxNotDetected) { @klass.check_virtualbox! }
     end
 
-    should "error and exit if VirtualBox is lower than version 3.2" do
-      version = "3.1.12r1041"
+    should "error and exit if VirtualBox is lower than version 4.0" do
+      version = "3.2.12r1041"
       VirtualBox.expects(:version).returns(version)
       assert_raises(Vagrant::Errors::VirtualBoxInvalidVersion) { @klass.check_virtualbox! }
     end
-
-    should "error and exit for OSE VirtualBox" do
-      version = "3.2.6_OSE"
-      VirtualBox.expects(:version).returns(version)
-      assert_raises(Vagrant::Errors::VirtualBoxInvalidOSE) { @klass.check_virtualbox! }
-    end
   end
 
   context "initialization" do
@@ -59,8 +55,21 @@ class EnvironmentTest < Test::Unit::TestCase
     end
 
     context "home path" do
+      setup do
+        @env = @klass.new
+      end
+
       should "return the home path if it loaded" do
-        expected = Pathname.new(File.expand_path(@env.config.vagrant.home, @env.root_path))
+        ENV["VAGRANT_HOME"] = nil
+
+        expected = Pathname.new(File.expand_path(@klass::DEFAULT_HOME))
+        assert_equal expected, @env.home_path
+      end
+
+      should "return the home path set by the environmental variable" do
+        ENV["VAGRANT_HOME"] = "foo"
+
+        expected = Pathname.new(File.expand_path(ENV["VAGRANT_HOME"]))
         assert_equal expected, @env.home_path
       end
     end
@@ -391,7 +400,7 @@ class EnvironmentTest < Test::Unit::TestCase
         create_box_vagrantfile
         vagrantfile(@env.root_path, "config.vm.box = 'box'")
 
-        assert_equal "box.box", @env.config.package.name
+        assert_equal "box.box", @env.primary_vm.env.config.package.name
       end
 
       should "load from home path if exists" do
@@ -425,6 +434,21 @@ class EnvironmentTest < Test::Unit::TestCase
         @env.load_config!
         assert @env.instance_variable_get(:@logger).nil?
       end
+
+      should "be able to reload config" do
+        vagrantfile(@env.root_path, "config.vm.box = 'box'")
+
+        # First load the config normally
+        @env.load_config!
+        assert_equal "box", @env.config.vm.box
+        assert_not_equal "set", @env.config.vm.base_mac
+
+        # Modify the Vagrantfile and reload it, then verify new results
+        # are available
+        vagrantfile(@env.root_path, "config.vm.base_mac = 'set'")
+        @env.reload_config!
+        assert_equal "set", @env.config.vm.base_mac
+      end
     end
 
     context "loading home directory" do

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