vagrantup 0.2.0 → 0.3.0

data/lib/vagrant/vm.rb

@@ -2,6 +2,7 @@ module Vagrant
   class VM < Actions::Runner
     include Vagrant::Util
 
+    attr_accessor :env
     attr_accessor :vm
     attr_accessor :from
 

data/templates/{Vagrantfile → Vagrantfile.erb}

@@ -1,8 +1,8 @@
 Vagrant::Config.run do |config|
   # All Vagrant configuration is done here. For a detailed explanation
-  # and listing of configuration options, please check the documentation
+  # and listing of configuration options, please view the documentation
   # online.
 
   # Every Vagrant virtual environment requires a box to build off of.
-  config.vm.box = "base"
+  config.vm.box = "<%= default_box %>"
 end

data/templates/chef_server_client.erb

@@ -0,0 +1,16 @@
+log_level          <%= log_level.inspect %>
+log_location       STDOUT
+node_name          "<%= node_name %>"
+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 %>"
+
+file_store_path    "/srv/chef/file_store"
+file_cache_path    "/srv/chef/cache"
+
+pid_file           "/var/run/chef/chef-client.pid"
+
+Mixlib::Log::Formatter.show_time = true

data/templates/chef_solo_solo.erb

@@ -0,0 +1,4 @@
+file_cache_path "<%= provisioning_path %>"
+cookbook_path <%= cookbooks_path %>
+role_path <%= roles_path %>
+log_level          <%= log_level.inspect %>

data/templates/errors.yml

@@ -0,0 +1,157 @@
+# Using YAMLs Block Literals to preserve new lines
+# http://en.wikipedia.org/wiki/YAML#Newlines_preserved
+# In short, |  means keep new lines, trim whitespace left and right
+# The |- does the above, but trims the new line at the end of all text
+
+:box_already_exists: |-
+  This box appears to already exist! Please call `vagrant box remove <%= box_name %>`
+  and then try to add it again.
+:box_add_already_exists: |-
+  A box with the name '<%= box_name %>' already exists, please use another name or use `vagrant box remove <%= box_name %>`
+:box_download_unknown_type: |-
+  Unknown URI type for box download.
+:box_remove_doesnt_exist: |-
+  The box you're attempting to remove does not exist!
+:box_specified_doesnt_exist: |-
+  Specified box `<%= box_name %>` does not exist!
+
+  The box must be added through the `vagrant box add` command. Please view
+  the documentation associated with the command for more information.
+:box_not_specified: |-
+  No base box was specified! A base box is required as a staring point
+  for every vagrant virtual machine. Please specify one in your Vagrantfile
+  using `config.vm.box`
+:chef_base_invalid_provisioner: |-
+  Vagrant::Provisioners::Chef is not a valid provisioner! Use ChefSolo or ChefServer instead.
+:chef_server_url_required: |-
+  Chef server provisioning requires that the `config.chef.chef_server_url` be set to the
+  URL of your chef server. Examples include "http://12.12.12.12:4000" and
+  "http://myserver.com:4000" (the port of course can be different, but 4000 is the default)
+:chef_server_validation_key_required: |-
+  Chef server provisioning requires that the `config.chef.validation_key_path` configuration
+  be set to a path on your local machine of the validation key used to register the
+  VM with the chef server.
+:chef_server_validation_key_doesnt_exist: |-
+  The validation key set for `config.chef.validation_key_path` does not exist! This
+  file needs to exist so it can be uploaded to the virtual machine. It is
+  currently set to "<%= Vagrant.config.chef.validation_key_path %>"
+:command_box_invalid: |-
+  Please specify a valid action to take on the boxes, either
+  `add` or `remove`. Examples:
+
+  vagrant box add name uri
+  vagrant box remove name
+  vagrant box list
+:command_deprecation_down: |-
+  `vagrant down` is now `vagrant destroy`. Please use that command instead. This
+  warning will be removed in future versions.
+:dotfile_error: |-
+  The dotfile which Vagrant uses to store the UUID of the project's
+  virtual machine already exists and is not a file! The dotfile is
+  currently configured to be `<%= env.dotfile_path %>`
+
+  To change this value, please see `config.vagrant.dotfile_name`
+
+  Are you trying to use Vagrant from your home directory? This is the
+  leading cause of this error message. To resolve this, simply use a
+  different directory. Or, if you really want to run Vagrant from your
+  home directory, modify the `config.vagrant.dotfile_name` configuration
+  key.
+:downloader_file_doesnt_exist: |-
+  The given box does not exist on the file system:
+
+  <%= source_url %>
+:environment_not_created: |-
+  The task you're trying to run requires that the vagrant environment
+  already be created, but unfortunately this vagrant still appears to
+  have no box! You can setup the environment by setting up your
+  <%= Vagrant::Environment::ROOTFILE_NAME %> and running `vagrant up`
+:package_include_file_doesnt_exist: |-
+  File specified to include: '<%= filename %>' does not exist!
+:package_requires_export: |-
+  Package must be used in conjunction with export.
+:provisioner_invalid_class: |-
+  Provisioners must be an instance of Vagrant::Provisioners::Base
+:provisioner_unknown_type: |-
+  Unknown provisioner type: <%= provisioner %>
+:rootfile_already_exists: |-
+  It looks like this directory is already setup for vagrant! (A <%= Vagrant::Environment::ROOTFILE_NAME %>
+  already exists.)
+:rootfile_not_found: |-
+  A `<%= Vagrant::Environment::ROOTFILE_NAME %>` was not found! This file is required for vagrant to run
+  since it describes the expected environment that vagrant is supposed
+  to manage. Please create a `<%= Vagrant::Environment::ROOTFILE_NAME %>` and place it in your project
+  root.
+:ssh_bad_permissions: |-
+  The private key to connect to this box via SSH has invalid permissions
+  set on it. The permissions of the private key should be set to 0600, otherwise SSH will
+  ignore the key. Vagrant tried to do this automatically for you but failed. Please set the
+  permissions on the following file to 0600 and then try running this command again:
+
+  <%= key_path %>
+:ssh_unavailable_windows: |-
+  `vagrant ssh` isn't available on the Windows platform. The
+  vagrant.ppk file is available at
+
+     <%= key_path %>.ppk
+
+  for use with Putty. To do this create a new Putty session for
+  `vagrant@localhost` on port `<%= ssh_port %>`, in the Connection>SSH>Auth
+  configuration section navigate to the vagrant.ppk file,
+  select it, save the session for later use, and connect.
+
+  For a more detailed guide please consult:
+
+     http://vagrantup.com/docs/getting-started/windows.html
+
+:virtualbox_import_failure: |-
+  The VM import failed! Try running `VBoxManage import` on the box file
+  manually for more verbose error output.
+:virtualbox_invalid_version: |-
+  Vagrant has detected that you have VirtualBox version <%= version %> installed!
+  Vagrant requires that you use at least VirtualBox version 3.1. Please install
+  a more recent version of VirtualBox to continue.
+:virtualbox_not_detected: |-
+  Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
+  If VirtualBox is installed, it may be an incorrect version. Vagrant currently
+  only supports VirtualBox 3.1.x. Please install the proper version to continue.
+:vm_failed_to_boot: |-
+  Failed to connect to VM! Failed to boot?
+:vm_base_not_found: |-
+  The specified base VM "<%= name %>" was not found.
+:vm_not_running: |-
+  VM is not running! Nothing to shut down!
+:vm_not_running_for_suspend: |-
+  The vagrant virtual environment you are trying to suspend must be running to be suspended.
+:vm_not_suspended: |-
+  The vagrant virtual environment you are trying to resume is not in a suspended state.
+:vm_port_collision: |-
+  Vagrant cannot forward the specified ports on this VM, since they
+  would collide with another VirtualBox virtual machine's forwarded
+  ports! The "<%= name %>" forwarded port (<%= hostport %>) is already in use on the host
+  machine.
+
+  To fix this, modify your current projects Vagrantfile to use another
+  port. Example, where '1234' would be replaced by a unique host port:
+
+  config.vm.forward_port("<%= name %>", <%= guestport %>, 1234)
+:vm_power_off_to_move_hd: |-
+  The virtual machine must be powered off to move its disk.
+:vm_power_off_to_package: |-
+  The vagrant virtual environment you are trying to package must be powered off.
+:vm_mount_fail: |-
+  Failed to mount shared folders. vboxsf was not available.
+:vm_ssh_auth_failed: |-
+  SSH authentication failed! While this could be due to a variety of reasons,
+  the two most common are: private key path is incorrect or you're using a box
+  which was built for Vagrant 0.1.x.
+
+  Vagrant 0.2.x dropped support for password-based authentication. If you're
+  tring to `vagrant up` a box which does not support Vagrant's private/public
+  keypair, then this error will be raised. To resolve this, read the guide
+  on converting base boxes from password-based to keypairs here:
+
+  http://vagrantup.com/docs/converting_password_to_key_ssh.html
+
+  If the box was built for 0.2.x and contains a custom public key, perhaps
+  the path to the private key is incorrect. Check your `config.ssh.private_key_path`.

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(File.join(File.dirname(__FILE__), "include", "Vagrantfile"))
+load include_vagrantfile if File.exist?(include_vagrantfile)

data/templates/ssh_config.erb

@@ -0,0 +1,7 @@
+Host <%= host_key %>
+  HostName localhost
+  User <%= ssh_user %>
+  Port <%= ssh_port %>
+  UserKnownHostsFile /dev/null
+  StrictHostKeyChecking no
+  IdentityFile <%= private_key_path %>

data/test/test_helper.rb

@@ -3,8 +3,6 @@ begin
 rescue LoadError
   # Fallback on doing the resolve at runtime.
   require "rubygems"
-  require "bundler"
-  Bundler.setup
 end
 
 # ruby-debug, not necessary, but useful if we have it
@@ -18,9 +16,11 @@ require 'contest'
 require 'mocha'
 
 class Test::Unit::TestCase
-  # Clears the previous config and sets up the new config
-  def mock_config
-    Vagrant::Config.reset!
+  # Mocks an environment, setting it up with the given config.
+  def mock_environment
+    environment = Vagrant::Environment.new
+
+    Vagrant::Config.reset!(environment)
 
     Vagrant::Config.run do |config|
       config.vagrant.dotfile_name = ".vagrant"
@@ -49,8 +49,10 @@ class Test::Unit::TestCase
       config.chef.chef_server_url = "http://localhost:4000"
       config.chef.validation_key_path = "validation.pem"
       config.chef.client_key_path = "/zoo/foo/bar.pem"
+      config.chef.node_name = "baz"
       config.chef.cookbooks_path = "cookbooks"
       config.chef.provisioning_path = "/tmp/vagrant-chef"
+      config.chef.log_level = :info
       config.chef.json = {
         :recipes => ["vagrant_main"]
       }
@@ -64,13 +66,10 @@ class Test::Unit::TestCase
       end
     end
 
-    if block_given?
-      Vagrant::Config.run do |config|
-        yield config
-      end
-    end
+    config = Vagrant::Config.execute!
 
-    Vagrant::Config.execute!
+    environment.instance_variable_set(:@config, config)
+    environment
   end
 
   # Sets up the mocks and instantiates an action for testing
@@ -85,11 +84,12 @@ class Test::Unit::TestCase
     mock_vm.stubs(:invoke_callback)
     mock_vm.stubs(:invoke_around_callback).yields
     mock_vm.stubs(:actions).returns([action])
+    mock_vm.stubs(:env).returns(mock_environment)
 
     [mock_vm, vm, action]
   end
 
-  def stub_default_action_dependecies(mock, klass=MockAction)
+  def stub_default_action_dependecies(mock)
     mock.stubs(:precedes).returns([])
     mock.stubs(:follows).returns([])
   end
@@ -103,6 +103,3 @@ class Test::Unit::TestCase
   end
 end
 
-class MockAction; end
-class MockActionOther; end
-

data/test/vagrant/actions/box/add_test.rb

@@ -3,7 +3,6 @@ require File.join(File.dirname(__FILE__), '..', '..', '..', 'test_helper')
 class AddBoxActionTest < Test::Unit::TestCase
   setup do
     @runner, @vm, @action = mock_action(Vagrant::Actions::Box::Add)
-    mock_config
   end
 
   context "prepare" do
@@ -27,7 +26,7 @@ class AddBoxActionTest < Test::Unit::TestCase
 
     should "result in an action exception if the box already exists" do
       File.expects(:exists?).once.returns(true)
-      @runner.expects(:name).twice.returns('foo')
+      @runner.expects(:name).once.returns('foo')
       @runner.expects(:add_action).never
       assert_raise Vagrant::Actions::ActionException do
         @action.prepare

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

@@ -6,7 +6,6 @@ class DestroyBoxActionTest < Test::Unit::TestCase
     @dir = "foo"
     @runner, @vm, @action = mock_action(Vagrant::Actions::Box::Destroy)
     @runner.stubs(:directory).returns(@dir)
-    mock_config
   end
 
   context "executing" do

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

@@ -6,24 +6,20 @@ class DownloadBoxActionTest < Test::Unit::TestCase
     @runner, @vm, @action = mock_action(Vagrant::Actions::Box::Download)
     @runner.stubs(:uri).returns(@uri)
     @runner.stubs(:temp_path=)
-    mock_config
 
-    Vagrant::Env.stubs(:tmp_path).returns("foo")
+    @runner.env.stubs(:tmp_path).returns("foo")
   end
 
   context "preparing" do
     setup do
-      @uri = mock("uri")
-      @uri.stubs(:is_a?).returns(false)
-      URI.stubs(:parse).returns(@uri)
-
       @downloader = mock("downloader")
       Vagrant::Downloaders::File.any_instance.stubs(:prepare)
       Vagrant::Downloaders::HTTP.any_instance.stubs(:prepare)
     end
 
-    should "raise an exception if no URI type is matched" do
-      @uri.stubs(:is_a?).returns(false)
+    should "raise an exception if no URI type is matched" do\
+      Vagrant::Downloaders::File.expects(:match?).returns(false)
+      Vagrant::Downloaders::HTTP.expects(:match?).returns(false)
       assert_raises(Vagrant::Actions::ActionException) {
         @action.prepare
       }
@@ -32,21 +28,31 @@ class DownloadBoxActionTest < Test::Unit::TestCase
     should "call #prepare on the downloader" do
       @downloader.expects(:prepare).with(@runner.uri).once
       Vagrant::Downloaders::File.expects(:new).returns(@downloader)
-      @uri.stubs(:is_a?).with(URI::Generic).returns(true)
+      expect_file
       @action.prepare
     end
 
-    should "set the downloader to file if URI is generic" do
-      @uri.stubs(:is_a?).with(URI::Generic).returns(true)
+    should "set the downloader to file if the uri provided is a file" do
+      expect_file
       @action.prepare
       assert @action.downloader.is_a?(Vagrant::Downloaders::File)
     end
 
-    should "set the downloader to HTTP if URI is HTTP" do
-      @uri.stubs(:is_a?).with(URI::HTTP).returns(true)
+    should "set the downloader to HTTP if the uri provided is a valid url" do
+      expect_http
       @action.prepare
       assert @action.downloader.is_a?(Vagrant::Downloaders::HTTP)
     end
+
+    def expect_file
+      Vagrant::Downloaders::File.expects(:match?).returns(true)
+      Vagrant::Downloaders::HTTP.expects(:match?).returns(false)
+    end
+
+    def expect_http
+      Vagrant::Downloaders::File.expects(:match?).returns(false)
+      Vagrant::Downloaders::HTTP.expects(:match?).returns(true)
+    end
   end
 
   context "executing" do
@@ -81,13 +87,16 @@ class DownloadBoxActionTest < Test::Unit::TestCase
 
   context "tempfile" do
     should "create a tempfile in the vagrant tmp directory" do
-      Tempfile.expects(:open).with(Vagrant::Actions::Box::Download::BASENAME, Vagrant::Env.tmp_path).once
+      File.expects(:open).with { |name, bitmask|
+        name =~ /#{Vagrant::Actions::Box::Download::BASENAME}/ &&  name =~ /#{@runner.env.tmp_path}/
+      }.once
       @action.with_tempfile
     end
 
+
     should "yield the tempfile object" do
       @tempfile = mock("tempfile")
-      Tempfile.expects(:open).yields(@tempfile)
+      File.expects(:open).yields(@tempfile)
 
       @action.with_tempfile do |otherfile|
         assert @tempfile.equal?(otherfile)
@@ -95,6 +104,22 @@ class DownloadBoxActionTest < Test::Unit::TestCase
     end
   end
 
+  context "file options" do
+    should "include add binary bit to options on windows platform" do
+      # This constant is not defined on non-windows platforms, so define it here
+      File::BINARY = 4096 unless defined?(File::BINARY)
+
+      Mario::Platform.expects(:windows?).returns(true)
+      assert_equal @action.file_options, File::CREAT|File::EXCL|File::WRONLY|File::BINARY
+    end
+
+    should "not include binary bit on other platforms" do
+      Mario::Platform.expects(:windows?).returns(false)
+      assert_equal @action.file_options, File::CREAT|File::EXCL|File::WRONLY
+    end
+  end
+
+
   context "cleaning up" do
     setup do
       @temp_path = "foo"

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

@@ -5,9 +5,8 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
     @runner, @vm, @action = mock_action(Vagrant::Actions::Box::Unpackage)
     @runner.stubs(:name).returns("foo")
     @runner.stubs(:temp_path).returns("bar")
-    mock_config
 
-    Vagrant::Env.stubs(:boxes_path).returns("bar")
+    @runner.env.stubs(:boxes_path).returns("bar")
   end
 
   context "executing" do
@@ -68,7 +67,7 @@ class UnpackageBoxActionTest < Test::Unit::TestCase
 
     should "error and exit if the directory exists" do
       File.expects(:directory?).returns(true)
-      @action.expects(:error_and_exit).once
+      @action.expects(:error_and_exit).with(:box_already_exists, :box_name => @runner.name).once
       @action.setup_box_dir
     end