vagrant 1.0.7 → 1.5.0

data/templates/nfs/exports.erb

@@ -1,5 +0,0 @@
-# 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_freebsd.erb

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

data/templates/nfs/exports_linux.erb

@@ -1,5 +0,0 @@
-# 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 %>,fsid=<%= opts[:uuid] %>)
-<% end %>
-# VAGRANT-END: <%= uuid %>

data/templates/package_Vagrantfile.erb

@@ -1,11 +0,0 @@
-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/provisioners/chef_client/client.erb

@@ -1,32 +0,0 @@
-log_level          <%= log_level.inspect %>
-log_location       STDOUT
-<% if node_name %>
-node_name          "<%= node_name %>"
-<% end %>
-ssl_verify_mode    :verify_none
-chef_server_url    "<%= chef_server_url %>"
-
-validation_client_name "<%= validation_client_name %>"
-validation_key         "<%= validation_key %>"
-client_key             "<%= client_key %>"
-
-encrypted_data_bag_secret "<%= encrypted_data_bag_secret %>"
-
-<% unless environment.nil? %>
-environment        "<%= environment %>"
-<% end %>
-
-file_cache_path    "<%= file_cache_path %>"
-file_backup_path   "<%= file_backup_path %>"
-
-http_proxy <%= http_proxy.inspect %>
-http_proxy_user <%= http_proxy_user.inspect %>
-http_proxy_pass <%= http_proxy_pass.inspect %>
-https_proxy <%= https_proxy.inspect %>
-https_proxy_user <%= https_proxy_user.inspect %>
-https_proxy_pass <%= https_proxy_pass.inspect %>
-no_proxy <%= no_proxy.inspect %>
-
-pid_file           "/var/run/chef/chef-client.pid"
-
-Mixlib::Log::Formatter.show_time = true

data/templates/provisioners/chef_solo/solo.erb

@@ -1,25 +0,0 @@
-<% if node_name %>
-node_name "<%= node_name %>"
-<% end %>
-file_cache_path "<%= provisioning_path %>"
-cookbook_path <%= cookbooks_path.inspect %>
-role_path <%= roles_path.inspect %>
-log_level <%= log_level.inspect %>
-
-encrypted_data_bag_secret "<%= encrypted_data_bag_secret %>"
-
-<% if data_bags_path -%>
-data_bag_path <%= data_bags_path.inspect %>
-<% end %>
-
-<% if recipe_url -%>
-recipe_url "<%= recipe_url %>"
-<% end -%>
-
-http_proxy <%= http_proxy.inspect %>
-http_proxy_user <%= http_proxy_user.inspect %>
-http_proxy_pass <%= http_proxy_pass.inspect %>
-https_proxy <%= https_proxy.inspect %>
-https_proxy_user <%= https_proxy_user.inspect %>
-https_proxy_pass <%= https_proxy_pass.inspect %>
-no_proxy <%= no_proxy.inspect %>

data/test/acceptance/base.rb

@@ -1,48 +0,0 @@
-require "rubygems"
-require "rspec/autorun"
-
-require "log4r"
-
-# Add the test directory to the load path
-$:.unshift File.expand_path("../../", __FILE__)
-
-# Load in the supporting files for our tests
-require "acceptance/support/shared/base_context"
-require "acceptance/support/config"
-require "acceptance/support/virtualbox"
-require "acceptance/support/matchers/match_output"
-require "acceptance/support/matchers/succeed"
-
-# Do not buffer output
-$stdout.sync = true
-$stderr.sync = true
-
-# If VirtualBox is currently running, fail.
-if Acceptance::VirtualBox.find_vboxsvc
-  $stderr.puts "VirtualBox must be closed and remain closed for the duration of the tests."
-  abort
-end
-
-# Enable logging if requested
-if ENV["ACCEPTANCE_LOG"]
-  logger = Log4r::Logger.new("test")
-  logger.outputters = Log4r::Outputter.stdout
-  logger.level = Log4r.const_get(ENV["ACCEPTANCE_LOG"].upcase)
-  logger = nil
-end
-
-# Parse the command line options and load the global configuration.
-if !ENV.has_key?("ACCEPTANCE_CONFIG")
-  $stderr.puts "A configuration file must be passed into the acceptance test."
-  abort
-elsif !File.file?(ENV["ACCEPTANCE_CONFIG"])
-  $stderr.puts "The configuration file must exist."
-  abort
-end
-
-$acceptance_options = Acceptance::Config.new(ENV["ACCEPTANCE_CONFIG"])
-
-# Configure RSpec
-RSpec.configure do |c|
-  c.expect_with :rspec, :stdlib
-end

data/test/acceptance/box_test.rb

@@ -1,99 +0,0 @@
-require File.expand_path("../base", __FILE__)
-
-describe "vagrant box" do
-  include_context "acceptance"
-
-  it "has no boxes by default" do
-    result = execute("vagrant", "box", "list")
-    result.stdout.should match_output(:no_boxes)
-  end
-
-  it "can add a box from a file" do
-    require_box("default")
-
-    # Add the box, which we expect to succeed
-    result = execute("vagrant", "box", "add", "foo", box_path("default"))
-    result.should succeed
-
-    # Verify that the box now shows up in the list of available boxes
-    result = execute("vagrant", "box", "list")
-    result.stdout.should match_output(:box_installed, "foo")
-  end
-
-  it "errors if attempting to add a box with the same name" do
-    require_box("default")
-
-    # Add the box, which we expect to succeed
-    assert_execute("vagrant", "box", "add", "foo", box_path("default"))
-
-    # Adding it again should not succeed
-    result = execute("vagrant", "box", "add", "foo", box_path("default"))
-    result.should_not succeed
-    result.stderr.should match_output(:box_already_exists, "foo")
-  end
-
-  it "overwrites a box when adding with `--force`" do
-    require_box("default")
-
-    # Add the box, which we expect to succeed
-    assert_execute("vagrant", "box", "add", "foo", box_path("default"))
-
-    # Adding it again should not succeed
-    assert_execute("vagrant", "box", "add", "foo", box_path("default"), "--force")
-  end
-
-  it "gives an error if the file doesn't exist" do
-    result = execute("vagrant", "box", "add", "foo", "/tmp/nope/nope/nope/nonono.box")
-    result.should_not succeed
-    result.stderr.should match_output(:box_path_doesnt_exist)
-  end
-
-  it "gives an error if the file is not a valid box" do
-    invalid = environment.workdir.join("nope.txt")
-    invalid.open("w+") do |f|
-      f.write("INVALID!")
-    end
-
-    result = execute("vagrant", "box", "add", "foo", invalid.to_s)
-    result.should_not succeed
-    result.stderr.should match_output(:box_invalid)
-  end
-
-  it "can add a box from an HTTP server" do
-    pending("Need to setup HTTP server functionality")
-  end
-
-  it "can remove a box" do
-    require_box("default")
-
-    # Add the box, remove the box, then verify that the box no longer
-    # shows up in the list of available boxes.
-    execute("vagrant", "box", "add", "foo", box_path("default"))
-    execute("vagrant", "box", "remove", "foo")
-    result = execute("vagrant", "box", "list")
-    result.should succeed
-    result.stdout.should match_output(:no_boxes)
-  end
-
-  it "can repackage a box" do
-    require_box("default")
-
-    original_size = File.size(box_path("default"))
-    logger.debug("Original package size: #{original_size}")
-
-    # Add the box, repackage it, and verify that a package.box is
-    # dumped of relatively similar size.
-    execute("vagrant", "box", "add", "foo", box_path("default"))
-    execute("vagrant", "box", "repackage", "foo")
-
-    # By default, repackage should dump into package.box into the CWD
-    repackaged_file = environment.workdir.join("package.box")
-    repackaged_file.file?.should be, "package.box should exist in cwd of environment"
-
-    # Compare the sizes
-    repackaged_size = repackaged_file.size
-    logger.debug("Repackaged size: #{repackaged_size}")
-    size_diff = (repackaged_size - original_size).abs
-    size_diff.should be < 1000, "Sizes should be very similar"
-  end
-end

data/test/acceptance/destroy_test.rb

@@ -1,37 +0,0 @@
-require File.expand_path("../base", __FILE__)
-require "acceptance/support/shared/command_examples"
-
-describe "vagrant destroy" do
-  include_context "acceptance"
-  it_behaves_like "a command that requires a Vagrantfile", ["vagrant", "destroy"]
-
-  it "succeeds and ignores if the VM is not created" do
-    require_box("default")
-
-    assert_execute("vagrant", "box", "add", "base", box_path("default"))
-    assert_execute("vagrant", "init")
-
-    result = assert_execute("vagrant", "destroy")
-    result.stdout.should match_output(:vm_not_created_warning)
-  end
-
-  it "is able to destroy a running virtual machine" do
-    require_box("default")
-
-    assert_execute("vagrant", "box", "add", "base", box_path("default"))
-    assert_execute("vagrant", "init")
-    assert_execute("vagrant", "up")
-
-    # Destroy the VM and assert that it worked properly (seemingly)
-    result = assert_execute("vagrant", "destroy")
-    result.stdout.should match_output(:vm_destroyed)
-
-    # Assert that the VM no longer is created
-    result = assert_execute("vagrant", "status")
-    result.stdout.should match_output(:status, "default", "not created")
-  end
-
-  # TODO:
-  # it is able to destroy a halted virtual machine
-  # it is able to destroy a suspended virtual machine
-end

data/test/acceptance/halt_test.rb

@@ -1,72 +0,0 @@
-require File.expand_path("../base", __FILE__)
-require "acceptance/support/shared/command_examples"
-
-describe "vagrant halt" do
-  include_context "acceptance"
-  it_behaves_like "a command that requires a Vagrantfile", ["vagrant", "halt"]
-
-  it "succeeds and ignores if the VM is not created" do
-    require_box("default")
-
-    assert_execute("vagrant", "box", "add", "base", box_path("default"))
-    assert_execute("vagrant", "init")
-
-    result = assert_execute("vagrant", "halt")
-    result.stdout.should match_output(:vm_not_created_warning)
-  end
-
-  it "is able to halt a running virtual machine" do
-    require_box("default")
-
-    assert_execute("vagrant", "box", "add", "base", box_path("default"))
-    assert_execute("vagrant", "init")
-    assert_execute("vagrant", "up")
-
-    # Halt the VM and assert that it worked properly (seemingly)
-    result = assert_execute("vagrant", "halt")
-    result.stdout.should match_output(:vm_halt_graceful)
-
-    # Assert that the VM is no longer running
-    result = assert_execute("vagrant", "status")
-    result.stdout.should match_output(:status, "default", "poweroff")
-  end
-
-  it "is able to force halt a running virtual machine" do
-    require_box("default")
-
-    assert_execute("vagrant", "box", "add", "base", box_path("default"))
-    assert_execute("vagrant", "init")
-    assert_execute("vagrant", "up")
-
-    # Halt the VM and assert that it worked properly (seemingly)
-    result = assert_execute("vagrant", "halt", "--force")
-    result.stdout.should match_output(:vm_halt_force)
-
-    # Assert that the VM is no longer running
-    result = assert_execute("vagrant", "status")
-    result.stdout.should match_output(:status, "default", "poweroff")
-  end
-
-  it "is able to come back up after the machine has been halted" do
-    require_box("default")
-
-    assert_execute("vagrant", "box", "add", "base", box_path("default"))
-    assert_execute("vagrant", "init")
-    assert_execute("vagrant", "up")
-    assert_execute("vagrant", "halt")
-
-    # Assert that the VM is no longer running
-    result = assert_execute("vagrant", "status")
-    result.stdout.should match_output(:status, "default", "poweroff")
-
-    assert_execute("vagrant", "up")
-
-    # Assert that the VM is once again running
-    result = assert_execute("vagrant", "status")
-    result.stdout.should match_output(:status, "default", "running")
-  end
-
-  # TODO:
-  # halt behavior on suspend machine
-  # halt behavior if machine is already powered off
-end

data/test/acceptance/init_test.rb

@@ -1,33 +0,0 @@
-require File.expand_path("../base", __FILE__)
-
-describe "vagrant init" do
-  include_context "acceptance"
-
-  it "creates a Vagrantfile in the working directory" do
-    vagrantfile = environment.workdir.join("Vagrantfile")
-    vagrantfile.exist?.should_not be, "Vagrantfile shouldn't exist initially"
-
-    result = execute("vagrant", "init")
-    result.should succeed
-    vagrantfile.exist?.should be, "Vagrantfile should exist"
-  end
-
-  it "creates a Vagrantfile with the box set to the given argument" do
-    vagrantfile = environment.workdir.join("Vagrantfile")
-
-    result = execute("vagrant", "init", "foo")
-    result.should succeed
-    vagrantfile.read.should match(/config.vm.box = "foo"$/)
-  end
-
-  it "creates a Vagrantfile with the box URL set to the given argument" do
-    vagrantfile = environment.workdir.join("Vagrantfile")
-
-    result = execute("vagrant", "init", "foo", "bar")
-    result.should succeed
-
-    contents = vagrantfile.read
-    contents.should match(/config.vm.box = "foo"$/)
-    contents.should match(/config.vm.box_url = "bar"$/)
-  end
-end

data/test/acceptance/networking/host_only_test.rb

@@ -1,37 +0,0 @@
-require File.expand_path("../../base", __FILE__)
-
-require "net/http"
-require "uri"
-
-require "acceptance/support/network_tests"
-require "acceptance/support/shared/command_examples"
-require "support/tempdir"
-
-describe "vagrant host only networking" do
-  include Acceptance::NetworkTests
-
-  include_context "acceptance"
-
-  def initialize_environment(env=nil)
-    require_box("default")
-
-    env ||= environment
-    env.execute("vagrant", "box", "add", "base", box_path("default")).should succeed
-  end
-
-  it "creates a network with a static IP" do
-    initialize_environment
-
-    environment.workdir.join("Vagrantfile").open("w+") do |f|
-      f.puts(<<VFILE)
-Vagrant::Config.run do |config|
-  config.vm.box = "base"
-  config.vm.network :hostonly, "192.168.33.10"
-end
-VFILE
-    end
-
-    assert_execute("vagrant", "up")
-    assert_host_to_vm_network("http://192.168.33.10:8000/", 8000)
-  end
-end

data/test/acceptance/networking/port_forward_test.rb

@@ -1,125 +0,0 @@
-require File.expand_path("../../base", __FILE__)
-
-require "net/http"
-require "uri"
-
-require "acceptance/support/network_tests"
-require "acceptance/support/shared/command_examples"
-require "support/tempdir"
-
-describe "vagrant port forwarding" do
-  include Acceptance::NetworkTests
-
-  include_context "acceptance"
-
-  def initialize_environment(env=nil)
-    require_box("default")
-
-    env ||= environment
-    env.execute("vagrant", "box", "add", "base", box_path("default")).should succeed
-  end
-
-  it "forwards ports properly" do
-    initialize_environment
-
-    guest_port = 3000
-    host_port  = 5000
-
-    environment.workdir.join("Vagrantfile").open("w+") do |f|
-      f.puts(<<VFILE)
-Vagrant::Config.run do |config|
-  config.vm.box = "base"
-  config.vm.forward_port #{guest_port}, #{host_port}
-end
-VFILE
-    end
-
-    assert_execute("vagrant", "up")
-    assert_host_to_vm_network("http://localhost:#{host_port}/", guest_port)
-  end
-
-  it "properly overrides port forwarding from the same port" do
-    initialize_environment
-
-    guest_port = 3000
-    host_port  = 5000
-
-    environment.workdir.join("Vagrantfile").open("w+") do |f|
-      f.puts(<<VFILE)
-Vagrant::Config.run do |config|
-  config.vm.box = "base"
-  config.vm.forward_port #{guest_port}, #{host_port - 1}
-  config.vm.forward_port #{guest_port}, #{host_port}
-end
-VFILE
-    end
-
-    assert_execute("vagrant", "up")
-    assert_host_to_vm_network("http://localhost:#{host_port}/", guest_port)
-  end
-
-  it "detects and corrects port collisions" do
-    # The two environments need to share a VBOX_USER_HOME so that the
-    # VM's go into the same place.
-    env_vars     = { "VBOX_USER_HOME" => Tempdir.new("vagrant").to_s }
-    environment  = new_environment(env_vars)
-    environment2 = new_environment(env_vars)
-
-    # For this test we create two isolated environments and `vagrant up`
-    # in each. SSH would collide, so this verifies that it won't!
-    begin
-      initialize_environment(environment)
-      initialize_environment(environment2)
-
-      # Build both environments up.
-      environment.execute("vagrant", "init").should succeed
-      environment.execute("vagrant", "up").should succeed
-      environment2.execute("vagrant", "init").should succeed
-      environment2.execute("vagrant", "up").should succeed
-
-      # Touch files in both environments
-      environment.execute("vagrant", "ssh", "-c", "touch /vagrant/foo").should succeed
-      environment2.execute("vagrant", "ssh", "-c", "touch /vagrant/bar").should succeed
-
-      # Verify that the files exist in each folder, properly
-      environment.workdir.join("foo").exist?.should be
-      environment2.workdir.join("bar").exist?.should be
-    ensure
-      environment.close
-      environment2.close
-    end
-  end
-
-  it "refuses to resume if there is a port collision" do
-    # The two environments need to share a VBOX_USER_HOME so that the
-    # VM's go into the same place.
-    env_vars     = { "VBOX_USER_HOME" => Tempdir.new("vagrant").path }
-    environment  = new_environment(env_vars)
-    environment2 = new_environment(env_vars)
-
-    # For this test we `vagrant up` one environment, suspend it,
-    # `vagrant up` another environment, and then come back to the first
-    # and try to resume. SSH would collide so it should error.
-    begin
-      # Bring up the first environment and suspend it
-      initialize_environment(environment)
-      environment.execute("vagrant", "init").should succeed
-      environment.execute("vagrant", "up").should succeed
-      environment.execute("vagrant", "suspend").should succeed
-
-      # Bring up the second environment
-      initialize_environment(environment2)
-      environment2.execute("vagrant", "init").should succeed
-      environment2.execute("vagrant", "up").should succeed
-
-      # Attempt to bring up the first environment again, but it should
-      # result in an error.
-      result = environment.execute("vagrant", "up")
-      result.should_not succeed
-      result.stderr.should match_output(:resume_port_collision)
-    ensure
-      environment.close
-      environment2.close
-    end
-  end
-end