fixed-vagrant 0.7.4.dev

data/templates/network_entry_debian.erb

@@ -0,0 +1,8 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant.
+# Please do not modify any of these contents.
+auto eth<%= net_options[:adapter] %>
+iface eth<%= net_options[:adapter] %> inet static
+      address <%= net_options[:ip] %>
+      netmask <%= net_options[:netmask] %>
+#VAGRANT-END

data/templates/network_entry_gentoo.erb

@@ -0,0 +1,5 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant.
+# Please do not modify any of these contents.
+config_eth<%= net_options[:adapter] %>=("<%= net_options[:ip] %> netmask <%= net_options[:netmask] %>")
+#VAGRANT-END

data/templates/network_entry_redhat.erb

@@ -0,0 +1,8 @@
+#VAGRANT-BEGIN
+# The contents below are automatically generated by Vagrant.
+# Please do not modify any of these contents.
+BOOTPROTO=static
+DHCPCLASS=
+IPADDR=<%= net_options[:ip] %>
+NETMASK=<%= net_options[:netmask] %>
+#VAGRANT-END

data/templates/nfs/exports.erb

@@ -0,0 +1,5 @@
+# VAGRANT-BEGIN: <%= uuid %>
+<% folders.each do |name, opts| %>
+"<%= opts[:hostpath] %>" <%= ip %><% if opts[:map_uid] -%> -mapall=<%= [opts[:map_uid],opts[:map_gid]].compact.join(":") %><% end -%>
+<% end %>
+# VAGRANT-END: <%= uuid %>

data/templates/nfs/exports_linux.erb

@@ -0,0 +1,5 @@
+# VAGRANT-BEGIN: <%= uuid %>
+<% folders.each do |name, opts| %>
+"<%= opts[:hostpath] %>" <%= ip %>(rw,no_subtree_check,all_squash<% if opts[:map_uid] %>,anonuid=<%= opts[:map_uid] %><% end %><% if opts[:map_gid] %>,anongid=<%= opts[:map_gid] %><% end %>)
+<% end %>
+# VAGRANT-END: <%= uuid %>

data/templates/package_Vagrantfile.erb

@@ -0,0 +1,11 @@
+Vagrant::Config.run do |config|
+  # This Vagrantfile is auto-generated by `vagrant package` to contain
+  # the MAC address of the box. Custom configuration should be placed in
+  # the actual `Vagrantfile` in this box.
+  config.vm.base_mac = "<%= base_mac %>"
+end
+
+# Load include vagrant file if it exists after the auto-generated
+# so it can override any of the settings
+include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
+load include_vagrantfile if File.exist?(include_vagrantfile)

data/templates/ssh_config.erb

@@ -0,0 +1,9 @@
+Host <%= host_key %>
+  HostName <%= ssh_host %>
+  User <%= ssh_user %>
+  Port <%= ssh_port %>
+  UserKnownHostsFile /dev/null
+  StrictHostKeyChecking no
+  PasswordAuthentication no
+  IdentityFile <%= private_key_path %>
+  IdentitiesOnly yes

data/test/locales/en.yml

@@ -0,0 +1,8 @@
+en:
+  vagrant:
+    test:
+      errors:
+        test_key: This is a test key
+        test_key_with_interpolation: This is a test key that says %{key}
+      alternate:
+        test_key: This is an alternate

data/test/test_helper.rb

@@ -0,0 +1,26 @@
+# Add this folder to the load path for "test_helper"
+$:.unshift(File.dirname(__FILE__))
+
+require 'vagrant'
+require 'mario'
+require 'contest'
+require 'mocha'
+
+# Try to load ruby debug since its useful if it is available.
+# But not a big deal if its not available (probably on a non-MRI
+# platform)
+begin
+  require 'ruby-debug'
+rescue LoadError
+end
+
+# Silence Mario by sending log output to black hole
+Mario::Platform.logger(nil)
+
+# Add the I18n locale for tests
+I18n.load_path << File.expand_path("../locales/en.yml", __FILE__)
+
+class Test::Unit::TestCase
+  include Vagrant::TestHelpers
+end
+

data/test/vagrant/action/box/destroy_test.rb

@@ -0,0 +1,18 @@
+require "test_helper"
+
+class DestroyBoxActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::Box::Destroy
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
+
+    @instance = @klass.new(@app, @env)
+  end
+
+  should "delete the box directory" do
+    seq = sequence("seq")
+    FileUtils.expects(:rm_rf).with(@env["box"].directory).in_sequence(seq)
+    @app.expects(:call).with(@env).once.in_sequence(seq)
+    @instance.call(@env)
+  end
+end

data/test/vagrant/action/box/download_test.rb

@@ -0,0 +1,125 @@
+require "test_helper"
+
+class DownloadBoxActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::Box::Download
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
+    @env["box"].uri = "http://google.com"
+  end
+
+  context "initializing" do
+    should "initialize download classes" do
+      @klass.new(@app, @env)
+      assert_equal [Vagrant::Downloaders::HTTP, Vagrant::Downloaders::File], @env["download.classes"]
+    end
+  end
+
+  context "with an instance" do
+    setup do
+      @instance = @klass.new(@app, @env)
+    end
+
+    context "calling" do
+      should "call the proper methods in sequence" do
+        seq = sequence("seq")
+        @instance.expects(:instantiate_downloader).in_sequence(seq).returns(true)
+        @instance.expects(:download).in_sequence(seq)
+        @app.expects(:call).with(@env).in_sequence(seq)
+        @instance.expects(:recover).with(@env).in_sequence(seq)
+        @instance.call(@env)
+      end
+    end
+
+    context "instantiating downloader" do
+      should "instantiate the proper class" do
+        instance = mock("instance")
+        Vagrant::Downloaders::HTTP.expects(:new).with(@env).returns(instance)
+        instance.expects(:prepare).with(@env["box"].uri).once
+        assert @instance.instantiate_downloader
+      end
+
+      should "error environment if URI is invalid for any downloaders" do
+        @env["box"].uri = "foobar"
+        assert_raises(Vagrant::Errors::BoxDownloadUnknownType) {
+          @instance.instantiate_downloader
+        }
+      end
+    end
+
+    context "downloading" do
+      setup do
+        @path = "foo"
+
+        @tempfile = mock("tempfile")
+        @tempfile.stubs(:path).returns(@path)
+
+        @instance.stubs(:with_tempfile).yields(@tempfile)
+        @instance.stubs(:download_to)
+      end
+
+      should "make a tempfile and copy the URI contents to it" do
+        @instance.expects(:with_tempfile).yields(@tempfile)
+        @instance.expects(:download_to).with(@tempfile)
+        @instance.download
+      end
+
+      should "save the tempfile path" do
+        @instance.download
+        assert @env.has_key?("download.temp_path")
+        assert_equal @tempfile.path, @env["download.temp_path"]
+        assert_equal @tempfile.path, @instance.temp_path
+      end
+    end
+
+    context "tempfile" do
+      should "create a tempfile in the vagrant tmp directory" do
+        File.expects(:open).with { |name, bitmask|
+          name.to_s =~ /#{Vagrant::Action::Box::Download::BASENAME}/ &&  name.to_s =~ /#{@env.env.tmp_path}/
+        }.once
+        @instance.with_tempfile
+      end
+
+      should "yield the tempfile object" do
+        @tempfile = mock("tempfile")
+        File.expects(:open).yields(@tempfile)
+
+        @instance.with_tempfile do |otherfile|
+          assert @tempfile.equal?(otherfile)
+        end
+      end
+    end
+
+    context "cleaning up" do
+      setup do
+        @temp_path = "foo"
+        @instance.stubs(:temp_path).returns(@temp_path)
+        File.stubs(:exist?).returns(true)
+      end
+
+      should "delete the temporary file if it exists" do
+        File.expects(:unlink).with(@temp_path).once
+        @instance.recover(@env)
+      end
+
+      should "not delete anything if it doesn't exist" do
+        File.stubs(:exist?).returns(false)
+        File.expects(:unlink).never
+        @instance.recover(@env)
+      end
+    end
+
+    context "downloading to" do
+      setup do
+        @downloader = mock("downloader")
+        @instance.instance_variable_set(:@downloader, @downloader)
+      end
+
+      should "call download! on the download with the URI and tempfile" do
+        tempfile = "foo"
+        @downloader.expects(:download!).with(@env["box"].uri, tempfile)
+        @instance.download_to(tempfile)
+      end
+    end
+  end
+end

data/test/vagrant/action/box/package_test.rb

@@ -0,0 +1,25 @@
+require "test_helper"
+
+class PackageBoxActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::Box::Package
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
+
+    @instance = @klass.new(@app, @env)
+  end
+
+  should "be a subclass of general packaging middleware" do
+    assert @instance.is_a?(Vagrant::Action::General::Package)
+  end
+
+  should "set the package directory then call parent" do
+    @instance.expects(:general_call).once.with() do |env|
+      assert env["package.directory"]
+      assert_equal env["package.directory"], @env["box"].directory
+      true
+    end
+
+    @instance.call(@env)
+  end
+end

data/test/vagrant/action/box/unpackage_test.rb

@@ -0,0 +1,84 @@
+require "test_helper"
+
+class UnpackageBoxActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::Box::Unpackage
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
+
+    @instance = @klass.new(@app, @env)
+  end
+
+  context "calling" do
+    should "call the proper chain" do
+      seq = sequence("sequence")
+      @instance.expects(:setup_box_directory).in_sequence(seq).returns(true)
+      @instance.expects(:decompress).in_sequence(seq)
+      @app.expects(:call).with(@env)
+      @instance.call(@env)
+    end
+  end
+
+  context "cleaning up" do
+    setup do
+      @instance.stubs(:box_directory).returns("foo")
+      File.stubs(:directory?).returns(false)
+      FileUtils.stubs(:rm_rf)
+    end
+
+    should "do nothing if box directory is not set" do
+      @instance.stubs(:box_directory).returns(nil)
+      File.expects(:directory?).never
+      FileUtils.expects(:rm_rf).never
+      @instance.recover(nil)
+    end
+
+    should "do nothing if not a directory" do
+      FileUtils.expects(:rm_rf).never
+      @instance.recover(nil)
+    end
+
+    should "remove the directory if exists" do
+      File.expects(:directory?).with(@instance.box_directory).once.returns(true)
+      FileUtils.expects(:rm_rf).with(@instance.box_directory).once
+      @instance.recover(nil)
+    end
+  end
+
+  context "setting up the box directory" do
+    setup do
+      File.stubs(:directory?).returns(false)
+      FileUtils.stubs(:mkdir_p)
+    end
+
+    should "error the environment if the box already exists" do
+      File.expects(:directory?).returns(true)
+      assert_raises(Vagrant::Errors::BoxAlreadyExists) {
+        @instance.setup_box_directory
+      }
+    end
+
+    should "create the directory" do
+      FileUtils.expects(:mkdir_p).with(@env["box"].directory).once
+      @instance.setup_box_directory
+    end
+  end
+
+  context "decompressing" do
+    setup do
+      @env["download.temp_path"] = "bar"
+
+      Dir.stubs(:chdir).yields
+    end
+
+    should "change to the box directory" do
+      Dir.expects(:chdir).with(@env["box"].directory)
+      @instance.decompress
+    end
+
+    should "open the tar file within the new directory, and extract it all" do
+      Archive::Tar::Minitar.expects(:unpack).with(@env["download.temp_path"], @env["box"].directory.to_s).once
+      @instance.decompress
+    end
+  end
+end

data/test/vagrant/action/box/verify_test.rb

@@ -0,0 +1,30 @@
+require "test_helper"
+
+class VerifyBoxActionTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::Box::Verify
+    @app, @env = action_env
+    @env["box"] = Vagrant::Box.new(vagrant_env, "foo")
+
+    @instance = @klass.new(@app, @env)
+  end
+
+  context "calling" do
+    should "continue fine if verification succeeds" do
+      seq = sequence("seq")
+      VirtualBox::Appliance.expects(:new).with(@env["box"].ovf_file.to_s).in_sequence(seq)
+      @app.expects(:call).with(@env).once.in_sequence(seq)
+      assert_nothing_raised {
+        @instance.call(@env)
+      }
+    end
+
+    should "halt chain if verification fails" do
+      VirtualBox::Appliance.expects(:new).with(@env["box"].ovf_file.to_s).raises(Exception)
+      @app.expects(:call).with(@env).never
+      assert_raises(Vagrant::Errors::BoxVerificationFailed) {
+        @instance.call(@env)
+      }
+    end
+  end
+end

data/test/vagrant/action/builder_test.rb

@@ -0,0 +1,203 @@
+require "test_helper"
+
+class ActionBuilderTest < Test::Unit::TestCase
+  setup do
+    @klass = Vagrant::Action::Builder
+  end
+
+  context "initializing" do
+    should "setup empty middleware stack" do
+      builder = @klass.new
+      assert builder.stack.empty?
+    end
+
+    should "take block to setup stack" do
+      builder = @klass.new do
+        use Hash
+        use lambda { |i| i }
+      end
+
+      assert !builder.stack.empty?
+      assert_equal 2, builder.stack.length
+    end
+  end
+
+  context "with an instance" do
+    setup do
+      @instance = @klass.new
+    end
+
+    context "adding to the stack" do
+      should "return self" do
+        assert @instance.equal?(@instance.use(1))
+      end
+
+      should "add to the end" do
+        @instance.use 1
+        @instance.use 2
+        assert_equal [2, [], nil], @instance.stack.last
+      end
+
+      should "merge in other builder's stack" do
+        other = @klass.new do
+          use 2
+          use 3
+        end
+
+        @instance.use 1
+        @instance.use other
+        assert_equal 3, @instance.stack.length
+      end
+
+      should "prepend a set environment task for merging middlewares if given" do
+        other = @klass.new do
+          use 1
+        end
+
+        @instance.use 0
+        @instance.use(other, :foo => :bar)
+        assert_equal 3, @instance.stack.length
+        assert_equal Vagrant::Action::Env::Set, @instance.stack[1].first
+      end
+    end
+
+    context "flatten" do
+      should "return the flattened format of the builder" do
+        env = Vagrant::Action::Environment.new(nil)
+        env.expects(:foo).once
+
+        func = lambda { |x| x.foo }
+        @instance.use func
+        proc = @instance.flatten
+        assert proc.respond_to?(:call)
+        proc.call(env)
+      end
+    end
+
+    context "inserting" do
+      setup do
+        @instance.use "1"
+        @instance.use "2"
+      end
+
+      should "insert at the proper numeric index" do
+        @instance.insert(1, "3")
+        assert_equal "3", @instance.stack[1].first
+      end
+
+      should "insert next to the proper object if given" do
+        @instance.insert("2", "3")
+        assert_equal "3", @instance.stack[1].first
+      end
+
+      should "be able to call insert_before as well" do
+        @instance.insert_before("1", "0")
+        assert_equal "0", @instance.stack.first.first
+      end
+
+      should "be able to insert_after" do
+        @instance.insert_after("1", "0")
+        assert_equal "0", @instance.stack[1].first
+      end
+
+      should "be able to insert_after using numeric index" do
+        @instance.insert_after(1, "0")
+        assert_equal "0", @instance.stack[2].first
+      end
+
+      should "raise an exception if invalid index" do
+        assert_raises(RuntimeError) {
+          @instance.insert_after("15", "0")
+        }
+      end
+    end
+
+    context "swapping" do
+      setup do
+        @instance.use "1"
+        @instance.use "2"
+      end
+
+      should "be able to swap using the object" do
+        @instance.swap "1", "3"
+        assert_equal "3", @instance.stack.first.first
+      end
+
+      should "be able to swap using the index" do
+        @instance.swap 0, "3"
+        assert_equal "3", @instance.stack.first.first
+      end
+    end
+
+    context "deleting" do
+      setup do
+        @instance.use "1"
+      end
+
+      should "delete the proper object" do
+        @instance.delete("1")
+        assert @instance.stack.empty?
+      end
+
+      should "delete by index if given" do
+        @instance.delete(0)
+        assert @instance.stack.empty?
+      end
+    end
+
+    context "getting an index of an object" do
+      should "return the proper index if it exists" do
+        @instance.use 1
+        @instance.use 2
+        @instance.use 3
+        assert_equal 1, @instance.index(2)
+      end
+    end
+
+    context "converting to an app" do
+      should "make non-classes lambdas" do
+        env = Vagrant::Action::Environment.new(nil)
+        env.expects(:foo).once
+
+        func = lambda { |x| x.foo }
+        @instance.use func
+        @instance.to_app(env).call(env)
+      end
+
+      should "raise exception if given invalid middleware" do
+        @instance.use 7
+        assert_raises(RuntimeError) {
+          @instance.to_app(nil)
+        }
+      end
+    end
+
+    context "calling" do
+      def mock_middleware
+        middleware = Class.new do
+          def initialize(app, env)
+            @app = app
+          end
+
+          def call(env)
+            @app.call(env)
+          end
+        end
+      end
+
+      should "convert to an app then call with the env" do
+        mw = mock_middleware
+        mw.any_instance.expects(:call).with() do |env|
+          assert env.has_key?(:key)
+          true
+        end
+
+        env = Vagrant::Action::Environment.new(nil)
+        env[:key] = :value
+
+        @instance.use(mw)
+        @instance.call(env)
+      end
+    end
+  end
+end