vagrantup 1.0.7 → 1.1.0

data/test/unit/vagrant/config/v2/dummy_config_test.rb

@@ -0,0 +1,24 @@
+require File.expand_path("../../../../base", __FILE__)
+
+describe Vagrant::Config::V2::DummyConfig do
+  it "should allow attribute setting" do
+    expect { subject.foo = :bar }.
+      to_not raise_error
+  end
+
+  it "should allow method calls that return more DummyConfigs" do
+    subject.foo.should be_kind_of(described_class)
+  end
+
+  it "should allow hash access" do
+    expect { subject[:foo] }.
+      to_not raise_error
+
+    subject[:foo].should be_kind_of(described_class)
+  end
+
+  it "should allow setting hash values" do
+    expect { subject[:foo] = :bar }.
+      to_not raise_error
+  end
+end

data/test/unit/vagrant/config/v2/loader_test.rb

@@ -0,0 +1,151 @@
+require "ostruct"
+
+require File.expand_path("../../../../base", __FILE__)
+
+describe Vagrant::Config::V2::Loader do
+  include_context "unit"
+
+  before(:each) do
+    # Force the V2 loader to believe that we are in V2
+    stub_const("Vagrant::Config::CURRENT_VERSION", "2")
+  end
+
+  describe "empty" do
+    it "returns an empty configuration object" do
+      result = described_class.init
+      result.should be_kind_of(Vagrant::Config::V2::Root)
+    end
+  end
+
+  describe "finalizing" do
+    it "should call `#finalize` on the configuration object" do
+      # Register a plugin for our test
+      register_plugin("2") do |plugin|
+        plugin.config "foo" do
+          Class.new do
+            attr_accessor :bar
+
+            def finalize!
+              @bar = "finalized"
+            end
+          end
+        end
+      end
+
+      # Create the proc we're testing
+      config_proc = Proc.new do |config|
+        config.foo.bar = "value"
+      end
+
+      # Test that it works properly
+      config = described_class.load(config_proc)
+      config.foo.bar.should == "value"
+
+      # Finalize it
+      described_class.finalize(config)
+      config.foo.bar.should == "finalized"
+    end
+  end
+
+  describe "loading" do
+    it "should configure with all plugin config keys loaded" do
+      # Register a plugin for our test
+      register_plugin("2") do |plugin|
+        plugin.config("foo") { OpenStruct }
+      end
+
+      # Create the proc we're testing
+      config_proc = Proc.new do |config|
+        config.foo.bar = "value"
+      end
+
+      # Test that it works properly
+      config = described_class.load(config_proc)
+      config.foo.bar.should == "value"
+    end
+  end
+
+  describe "merging" do
+    it "should merge available configuration keys" do
+      old = Vagrant::Config::V2::Root.new({ :foo => Object })
+      new = Vagrant::Config::V2::Root.new({ :bar => Object })
+      result = described_class.merge(old, new)
+      result.foo.should be_kind_of(Object)
+      result.bar.should be_kind_of(Object)
+    end
+
+    it "should merge instantiated objects" do
+      config_class = Class.new do
+        attr_accessor :value
+      end
+
+      old = Vagrant::Config::V2::Root.new({ :foo => config_class })
+      old.foo.value = "old"
+
+      new = Vagrant::Config::V2::Root.new({ :bar => config_class })
+      new.bar.value = "new"
+
+      result = described_class.merge(old, new)
+      result.foo.value.should == "old"
+      result.bar.value.should == "new"
+    end
+
+    it "should merge conflicting classes by calling `merge`" do
+      config_class = Class.new do
+        attr_accessor :value
+
+        def merge(new)
+          result       = self.class.new
+          result.value = @value + new.value
+          result
+        end
+      end
+
+      old = Vagrant::Config::V2::Root.new({ :foo => config_class })
+      old.foo.value = 10
+
+      new = Vagrant::Config::V2::Root.new({ :foo => config_class })
+      new.foo.value = 15
+
+      result = described_class.merge(old, new)
+      result.foo.value.should == 25
+    end
+  end
+
+  describe "upgrading" do
+    it "should continue fine if the key doesn't implement upgrade" do
+      # Make an old V1 root object
+      old = Vagrant::Config::V1::Root.new({ :foo => Class.new })
+
+      # It should work fine
+      expect { result = described_class.upgrade(old) }.to_not raise_error
+    end
+
+    it "should upgrade the config if it implements the upgrade method" do
+      # Create the old V1 class that will be upgraded
+      config_class = Class.new do
+        attr_accessor :value
+
+        def upgrade(new)
+          new.foo.value = value * 2
+
+          [["foo"], ["bar"]]
+        end
+      end
+
+      # Create the new V2 plugin it is writing to
+      register_plugin("2") do |p|
+        p.config("foo") { OpenStruct }
+      end
+
+      # Test it out!
+      old = Vagrant::Config::V1::Root.new({ :foo => config_class })
+      old.foo.value = 5
+
+      data = described_class.upgrade(old)
+      data[0].foo.value.should == 10
+      data[1].should == ["foo"]
+      data[2].should == ["bar"]
+    end
+  end
+end

data/test/unit/vagrant/config/v2/root_test.rb

@@ -0,0 +1,97 @@
+require "set"
+
+require File.expand_path("../../../../base", __FILE__)
+
+describe Vagrant::Config::V2::Root do
+  include_context "unit"
+
+  it "should provide access to config objects" do
+    foo_class = Class.new
+    map       = { :foo => foo_class }
+
+    instance  = described_class.new(map)
+    foo       = instance.foo
+    foo.should be_kind_of(foo_class)
+    instance.foo.should eql(foo)
+  end
+
+  it "record a missing key call if invalid key used" do
+    instance = described_class.new({})
+    expect { instance.foo }.to_not raise_error
+    instance.__internal_state["missing_key_calls"].include?("foo").should be
+  end
+
+  it "returns a dummy config for a missing key" do
+    instance = described_class.new({})
+    expect { instance.foo.foo = "bar" }.to_not raise_error
+  end
+
+  it "can be created with initial state" do
+    instance = described_class.new({}, { :foo => "bar" })
+    instance.foo.should == "bar"
+  end
+
+  it "should return internal state" do
+    map      = { "foo" => Object, "bar" => Object }
+    instance = described_class.new(map)
+    instance.__internal_state.should == {
+      "config_map"        => map,
+      "keys"              => {},
+      "missing_key_calls" => Set.new
+    }
+  end
+
+  describe "validation" do
+    let(:instance) do
+      map = { :foo => Object, :bar => Object }
+      described_class.new(map)
+    end
+
+    it "should return nil if valid" do
+      instance.validate({}).should == {}
+    end
+
+    it "should return errors if invalid" do
+      errors = { "foo" => ["errors!"] }
+      env    = { "errors" => errors }
+      foo    = instance.foo
+      def foo.validate(env)
+        env["errors"]
+      end
+
+      instance.validate(env).should == errors
+    end
+
+    it "should merge errors via array concat if matching keys" do
+      errors = { "foo" => ["errors!"] }
+      env    = { "errors" => errors }
+      foo    = instance.foo
+      bar    = instance.bar
+      def foo.validate(env)
+        env["errors"]
+      end
+
+      def bar.validate(env)
+        env["errors"].merge({ "bar" => ["bar"] })
+      end
+
+      expected_errors = {
+        "foo" => ["errors!", "errors!"],
+        "bar" => ["bar"]
+      }
+
+      instance.validate(env).should == expected_errors
+    end
+
+    it "shouldn't count empty keys" do
+      errors = { "foo" => [] }
+      env    = { "errors" => errors }
+      foo    = instance.foo
+      def foo.validate(env)
+        env["errors"]
+      end
+
+      instance.validate(env).should == {}
+    end
+  end
+end

data/test/unit/vagrant/config/v2/util_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path("../../../../base", __FILE__)
+
+require "vagrant/config/v2/util"
+
+describe Vagrant::Config::V2::Util do
+  describe "merging errors" do
+    it "should merge matching keys and leave the rest alone" do
+      first  = { "one" => ["foo"], "two" => ["two"] }
+      second = { "one" => ["bar"], "three" => ["three"] }
+
+      expected = {
+        "one" => ["foo", "bar"],
+        "two" => ["two"],
+        "three" => ["three"]
+      }
+
+      result = described_class.merge_errors(first, second)
+      result.should == expected
+    end
+  end
+end

data/test/unit/vagrant/config_test.rb

@@ -7,6 +7,31 @@ describe Vagrant::Config do
     end
   end
 
+  it "should capture calls to `Vagrant.configure`" do
+    receiver = double()
+
+    procs = described_class.capture_configures do
+      Vagrant.configure("1") do
+        receiver.one
+      end
+
+      Vagrant.configure("2") do
+        receiver.two
+      end
+    end
+
+    procs.should be_kind_of(Array)
+    procs.length.should == 2
+    procs[0][0].should == "1"
+    procs[1][0].should == "2"
+
+    # Verify the proper procs were captured
+    receiver.should_receive(:one).once.ordered
+    receiver.should_receive(:two).once.ordered
+    procs[0][1].call
+    procs[1][1].call
+  end
+
   it "should capture configuration procs" do
     receiver = double()
 
@@ -22,6 +47,20 @@ describe Vagrant::Config do
 
     # Verify that the proper proc was captured
     receiver.should_receive(:hello!).once
-    procs[0].call
+    procs[0][0].should == "1"
+    procs[0][1].call
+  end
+
+  it "should capture the proper version" do
+    procs = described_class.capture_configures do
+      described_class.run("1") {}
+      described_class.run("2") {}
+    end
+
+    # Verify the structure of the result
+    procs.should be_kind_of(Array)
+    procs.length.should == 2
+    procs[0][0].should == "1"
+    procs[1][0].should == "2"
   end
 end

data/test/unit/vagrant/downloaders/base_test.rb

@@ -8,10 +8,6 @@ describe Vagrant::Downloaders::Base do
     described_class.match?("foo").should_not be
   end
 
-  it "should implement `prepare`" do
-    instance.prepare("foo").should be_nil
-  end
-
   it "should implement `download!`" do
     instance.download!("foo", "bar").should be_nil
   end

data/test/unit/vagrant/downloaders/file_test.rb

@@ -3,9 +3,15 @@ require File.expand_path("../../../base", __FILE__)
 require "tempfile"
 
 describe Vagrant::Downloaders::File do
+  include_context "unit"
+
   let(:ui) { double("ui") }
   let(:instance) { described_class.new(ui) }
 
+  before(:each) do
+    ui.stub(:info)
+  end
+
   describe "matching" do
     it "should match an existing file" do
       described_class.match?(__FILE__).should be
@@ -19,33 +25,41 @@ describe Vagrant::Downloaders::File do
       old_home = ENV["HOME"]
       begin
         # Create a temporary file
-        temp = Tempfile.new("vagrant")
+        temp = temporary_file
 
         # Set our home directory to be this directory so we can use
         # "~" paths
-        ENV["HOME"] = File.dirname(temp.path)
+        ENV["HOME"] = File.dirname(temp.to_s)
 
         # Test that we can find the temp file
-        described_class.match?("~/#{File.basename(temp.path)}").should be
+        described_class.match?("~/#{File.basename(temp.to_s)}").should be
       ensure
         ENV["HOME"] = old_home
       end
     end
+
+    it "should match file:// URIs" do
+      described_class.match?("file://#{__FILE__}").should be
+    end
   end
 
-  describe "preparing" do
+  describe "downloading" do
+    let(:destination_file) { temporary_file.open("w") }
+
     it "should raise an exception if the file does not exist" do
       path = File.join(__FILE__, "nopenopenope")
       File.exist?(path).should_not be
 
-      expect { instance.prepare(path) }.to raise_error(Vagrant::Errors::DownloaderFileDoesntExist)
+      expect { instance.download!(path, destination_file) }.
+        to raise_error(Vagrant::Errors::DownloaderFileDoesntExist)
     end
 
     it "should raise an exception if the file is a directory" do
       path = File.dirname(__FILE__)
       File.should be_directory(path)
 
-      expect { instance.prepare(path) }.to raise_error(Vagrant::Errors::DownloaderFileDoesntExist)
+      expect { instance.download!(path, destination_file) }.
+        to raise_error(Vagrant::Errors::DownloaderFileDoesntExist)
     end
 
     it "should find files that use shell expansions" do
@@ -59,15 +73,13 @@ describe Vagrant::Downloaders::File do
         ENV["HOME"] = File.dirname(temp.path)
 
         # Test that we can find the temp file
-        expect { instance.prepare("~/#{File.basename(temp.path)}") }.
+        expect { instance.download!("~/#{File.basename(temp.path)}", destination_file) }.
           to_not raise_error
       ensure
         ENV["HOME"] = old_home
       end
     end
-  end
 
-  describe "downloading" do
     it "should copy the source to the destination" do
       pending "setup paths"
     end

data/test/unit/vagrant/downloaders/http_test.rb

@@ -11,6 +11,10 @@ describe Vagrant::Downloaders::HTTP do
       described_class.match?("http://foo:bar@google.com/foo.box").should be
       described_class.match?("http://google.com:8500/foo.box").should be
     end
+
+    it "should not match file:// URIs" do
+      described_class.match?("file://#{__FILE__}").should_not be
+    end
   end
 
   describe "downloading" do