vagrantup 0.5.4 → 0.6.0

data/templates/commands/init/Vagrantfile.erb

@@ -0,0 +1,13 @@
+Vagrant::Config.run do |config|
+  # All Vagrant configuration is done here. For a detailed explanation
+  # and listing of configuration options, please view the documentation
+  # online.
+
+  # Every Vagrant virtual environment requires a box to build off of.
+  config.vm.box = "<%= box_name %>"
+  <% if !box_url.nil? %>
+
+  # The url from where the 'config.vm.box' box will be fetched if it
+  # doesn't already exist on the user's system
+  config.vm.box_url = "<%= box_url %>"<% end %>
+end

data/templates/config/validation_failed.erb

@@ -0,0 +1,7 @@
+<% errors.each do |key, container| -%>
+<%= key %>:
+<% container.errors.each do |error| -%>
+* <%= error %>
+<% end -%>
+
+<% end -%>

data/templates/locales/en.yml

@@ -0,0 +1,402 @@
+en:
+  vagrant:
+    general:
+      creating_home_dir: "Creating home directory since it doesn't exist: %{directory}"
+
+#-------------------------------------------------------------------------------
+# Translations for exception classes
+#-------------------------------------------------------------------------------
+    errors:
+      base_vm_not_found: The base VM with the name '%{name}' was not found.
+      box_not_found: Box '%{name}' could not be found.
+      cli_missing_env: This command requires that a Vagrant environment be properly passed in as the last parameter.
+      config_validation: |-
+        There was a problem with the configuration of Vagrant. The error message(s)
+        are printed below:
+
+        %{messages}
+      interrupted: Vagrant exited after cleanup due to external interrupt.
+      multi_vm_required: A multi-vm environment is required for name specification to this command.
+      multi_vm_target_required: `vagrant %{command}` requires a specific VM name to target in a multi-VM environment.
+      no_env: No Vagrant environment detected. Run `vagrant init` to set one up.
+      ssh_authentication_failed: |-
+        SSH authentication failed! This is typically caused by the public/private
+        keypair for the SSH user not being properly set on the guest VM. Please
+        verify that the guest VM is setup with the proper public key, and that
+        the private key path for Vagrant is setup properly as well.
+      ssh_bad_exit_status: |-
+        The following SSH command responded with a non-zero exit status.
+        Vagrant assumes that this means the command failed!
+
+        %{command}
+      ssh_connection_refused: |-
+        SSH connection was refused! This usually happens if the VM failed to
+        boot properly. Some steps to try to fix this: First, try reloading your
+        VM with `vagrant reload`, since a simple restart sometimes fixes things.
+        If that doesn't work, destroy your VM and recreate it with a `vagrant destroy`
+        followed by a `vagrant up`. If that doesn't work, contact a Vagrant
+        maintainer (support channels listed on the website) for more assistance.
+      ssh_key_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 for use with Putty is available at:
+
+          %{key_path}.ppk
+
+        To use 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.
+
+      system:
+        invalid_class: |-
+          The specified system does not inherit from `Vagrant::Systems::Base`. The
+          specified system class must inherit from this class.
+
+          The specified system class was: %{system}
+        unknown_type: |-
+          The specified system type is unknown: %{system}. Please change this
+          to a proper value.
+        unspecified: |-
+          A VM system type must be specified! This is done via the `config.vm.system`
+          configuration value. Please read the documentation online for more information.
+      vagrantfile_syntax_error: |-
+        There is a syntax error in the following Vagrantfile. The syntax error
+        message is reproduced below for convenience:
+
+        %{file}
+      virtualbox_invalid_ose: |-
+        Vagrant has detected you're using an OSE ("Open Source Edition") of VirtualBox.
+        Vagrant currently doesn't support any of the OSE editions due to slight API
+        differences. Please download the regular package from virtualbox.org and install
+        to continue.
+      virtualbox_invalid_version: |-
+        Vagrant has detected that you have VirtualBox version %{version} installed!
+        Vagrant requires that you use at least VirtualBox version 3.2. 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
+        requires VirtualBox 3.2.x. Please install the proper version to continue.
+      vm_creation_required: VM must be created before running this command. Run `vagrant up` first.
+      vm_not_found: A VM by the name of %{name} was not found.
+
+#-------------------------------------------------------------------------------
+# Translations for config validation errors
+#-------------------------------------------------------------------------------
+    config:
+      common:
+        error_empty: `%{field}` must be filled in.
+      ssh:
+        private_key_missing: "`private_key_path` file must exist: %{path}"
+      vm:
+        shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
+        boot_mode_invalid: "Boot mode must be one of: vrdp or gui"
+
+#-------------------------------------------------------------------------------
+# Translations for commands. e.g. `vagrant x`
+#-------------------------------------------------------------------------------
+    commands:
+      common:
+        vm_not_created: "VM not created. Moving on..."
+      box:
+        no_installed_boxes: "There are no installed boxes! Use `vagrant box add` to add some."
+      ssh:
+        execute: "Execute: %{command}"
+      status:
+        output: |-
+          Current VM states:
+
+          %{states}
+
+          %{message}
+        not_created: |-
+          The environment has not yet been created. Run `vagrant up` to
+          create the environment.
+        powered_off: The VM is powered off. To restart the VM, simply run `vagrant up`
+        running: |-
+          The VM is running. To stop this VM, you can run `vagrant halt` to
+          shut it down forcefully, or you can run `vagrant suspend` to simply
+          suspend the virtual machine. In either case, to restart it again,
+          simply run `vagrant up`.
+        saved: To resume this VM, simply run `vagrant up`.
+        listing: |-
+          This environment represents multiple VMs. The VMs are all listed
+          above with their current state. For more information about a specific
+          VM, run `vagrant status NAME`.
+      up:
+        vm_created: "VM already created. Booting if its not already running..."
+      upgrade_to_060:
+        already_done: "Environment appears to already be upgraded to 0.6.0. Doing nothing!"
+        ask: "Are you sure you want to execute this command?"
+        backing_up: "Backing up previous .vagrant file..."
+        complete: "Environment upgraded to 0.6.0 successfully."
+        info: |-
+          This command will upgrade the current environment from a pre-0.6.0
+          environment to a 0.6.x compatible environment. Running this command
+          multiple times should be okay. This command will make a backup file
+          prior to making any changes. Therefore, if anything goes wrong, then
+          restore that file to ".vagrant" in the same directory as the Vagrantfile.
+        quit: "Not executing this command by user request. Quitting..."
+      version:
+        output: "Vagrant version %{version}"
+
+#-------------------------------------------------------------------------------
+# Translations for Vagrant middleware acions
+#-------------------------------------------------------------------------------
+    actions:
+      runner:
+        waiting_cleanup: "Waiting for cleanup before exiting..."
+        exit_immediately: "Exiting immediately, without cleanup!"
+      vm:
+        boot:
+          booting: Booting VM...
+          waiting: Waiting for VM to boot. This can take a few minutes.
+          ready: VM booted and ready for use!
+          failed: Failed to connect to VM!
+          failed_to_boot: VM failed to boot.
+        check_box:
+          not_found: Box %{name} was not found. Fetching box from specified URL...
+          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`
+          does_not_exist: |-
+            Specified 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.
+        check_guest_additions:
+          not_detected: |-
+            No guest additions were detected on the base box for this VM! Guest
+            additions are required for forwarded ports, shared folders, host only
+            networking, and more. If SSH fails on this machine, please install
+            the guest additions and repackage the box to continue.
+
+            This is not an error message; everything may continue to work properly,
+            in which case you may ignore this message.
+          version_mismatch: |-
+            The guest additions on this VM do not match the install version of
+            VirtualBox! This may cause things such as forwarded ports, shared
+            folders, and more to not work properly. If any of those things fail on
+            this machine, please update the guest additions and repackage the
+            box.
+
+            Guest Additions Version: %{guest_version}
+            VirtualBox Version: %{virtualbox_version}
+        clear_forward_ports:
+          deleting: Clearing any previously set forwarded ports...
+        clear_shared_folders:
+          deleting: Cleaning previously set shared folders...
+        customize:
+          running: Running any VM customizations...
+        destroy:
+          destroying: Destroying VM and associated drives...
+        destroy_network:
+          destroying: Destroying unused networking interface...
+        disable_networks:
+          disabling: Disabling host only networks...
+        discard_state:
+          discarding: Discarding saved state of VM...
+        export:
+          create_dir: Creating temporary directory for export...
+          exporting: Exporting VM...
+          power_off: "The Vagrant virtual environment you are trying to package must be powered off."
+        forward_ports:
+          auto_empty: |-
+            Vagrant found a port collision for the specified port and virtual machine.
+            While this port was marked to be auto-corrected, the ports in the
+            auto-correction range are all also used.
+
+            VM: %{vm_name}
+            Forwarded port: %{name} (%{guest_port} => %{host_port})
+          below_threshold_error: |-
+            The host port of all forwarded ports must be above 1024. VirtualBox
+            does not allow host ports to be below 1024. (Guest ports below 1024
+            are fine. For example: SSH on port 22 on the guest can be forwarded
+            to port 2222, but not 222).
+          collision_error: |-
+            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 (%{host_port}) 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}", %{guest_port}, 1234)
+
+          fixed_collision: Fixed port collision '%{name}'. Now on port %{new_port}.
+          forwarding: Forwarding ports...
+          forwarding_entry: "-- %{name}: %{guest_port} => %{host_port} (adapter %{adapter})"
+          non_nat: |-
+            VirtualBox adapter #%{adapter} not configured as "NAT"
+            Skipping port forwarding '%{name}'.
+        halt:
+          force: Forcing shutdown of VM...
+        import:
+          importing: Importing base box '%{name}'...
+          failure: |-
+            The VM import failed! Try running `VBoxManage import` on the box file
+            manually for more verbose error output.
+        match_mac:
+          matching: Matching MAC address for NAT networking...
+        network:
+          collides: |-
+            The specified host network collides with a non-hostonly network!
+            This will cause your specified IP to be inaccessible. Please change
+            the IP or name of your host only network to not match that of
+            a bridged or non-hostonly network.
+          creating: Creating new host only network for environment...
+          enabling: Enabling host only network...
+          not_found: |-
+            The specified host network could not be found: '%{name}.'
+            If the name specification is removed, Vagrant will create a new
+            host only network for you. Alternatively, please create the
+            specified network manually.
+          preparing: Preparing host only network...
+        nfs:
+          host_required: |-
+            A host class is required for NFS shared folders. By default, these
+            are auto-detected, but can be overridden with `config.vagrant.host`.
+            There is currently not host class loaded.
+          no_host_network: |-
+            NFS shared folders requires that host only networking is enabled.
+            Please enable host only networking via `config.vm.network`.
+          not_supported: |-
+            The host class is reporting that NFS is not supported by this host,
+            or `nfsd` may not be installed. Please verify that `nfsd` is installed
+            on your machine, and retry.
+          exporting: Exporting NFS shared folders...
+          mounting: Mounting NFS shared folders...
+        persist:
+          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 '%{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.
+          persisting: "Persisting the VM UUID (%{uuid})..."
+        provision:
+          beginning: "Beginning provisioning process..."
+          enabled: "Provisioning enabled with %{provisioner}..."
+          invalid_class: "Provisioners must be an instance of Vagrant::Provisioners::Base"
+          unknown_type: "Unknown provisioner type: %{provisioner}"
+        resume:
+          resuming: Resuming suspended VM...
+        share_folders:
+          creating: Creating shared folders metadata...
+          mounting: Mounting shared folders...
+          mounting_entry: "-- %{name}: %{guest_path}"
+        suspend:
+          suspending: Saving VM state and suspending execution...
+
+      box:
+        destroy:
+          destroying: "Deleting box '%{name}'..."
+        download:
+          with: "Downloading with %{class}..."
+          cleaning: "Cleaning up downloaded box..."
+          copying: "Copying box to temporary location..."
+          unknown_type: "Unknown or unsupported URI type given for box download."
+        unpackage:
+          extracting: "Extracting box..."
+          already_exists: |-
+            A box already exists under the name of '%{name}'. This may or may
+            not be the same box you are trying to add. Please use another name
+            or remove the previous box then try to add it again.
+        verify:
+          verifying: "Verifying box..."
+          failed: |-
+            The box file you're attempting to add is invalid. This can be
+            commonly attributed to typos in the path given to the box add
+            command. Another common case of this is invalid packaging of the
+            box itself.
+
+      general:
+        package:
+          packaging: "Packaging additional file: %{file}"
+          compressing: "Compressing package to: %{tar_path}"
+          output_exists: |-
+            The specified file to save the package as already exists. Please
+            remove this file or specify a different file name for outputting.
+          requires_directory: |-
+            A directory was not specified to package. This should never happen
+            and is a result of an internal inconsistency.
+          include_file_missing: |-
+            Package include file doesn't exist: %{file}
+
+    downloaders:
+      file:
+        file_missing: "The specified path to a file doesn't exist."
+      http:
+        socket_error: |-
+          An error occurred while trying to download the specified box. This most
+          often happens if there is no internet connection or the address is
+          invalid.
+
+    hosts:
+      bsd:
+        nfs_export:
+          prepare: "Preparing to edit /etc/exports. Administrator privileges will be required..."
+      linux:
+        nfs_export:
+          prepare: "Preparing to edit /etc/exports. Administrator privileges will be required..."
+
+    provisioners:
+      chef:
+        json: "Generating chef JSON and uploading..."
+        client_key_folder: "Creating folder to hold client key..."
+        upload_validation_key: "Uploading chef client validation key..."
+        running_client: "Running chef-client..."
+        running_solo: "Running chef-solo..."
+        invalid_provisioner: "Vagrant::Provisioners::Chef is not a valid provisioner! Use ChefSolo or ChefServer instead."
+        not_detected: |-
+          The `%{binary}` binary appears to not be in the PATH of the guest. This
+          could be because the PATH is not properly setup or perhaps chef is not
+          installed on this guest. Chef provisioning can not continue without
+          chef properly installed.
+        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)
+        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.
+        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.
+
+    systems:
+      linux:
+        attempting_halt: "Attempting graceful shutdown of linux..."
+        mount_fail: "Failed to mount shared folders. `vboxsf` was not available."
+        network_not_debian: |-
+          Host only networking is only supported for Debian/Ubuntu by the built-in
+          "Linux" system. If you're using some other distro and want to implement
+          host only networking, please subclass the `Vagrant::Systems::Linux` class
+          and implement the `prepare_host_only_network` and `enable_host_only_network`
+          methods.
+
+          Otherwise, please report your distro and how to modify network interfaces
+          to the Vagrant mailing list or IRC and we'll probably be glad to add it
+          to the internal systems.
+      solaris:
+        attempting_halt: "Attempting graceful shutdown of solaris..."

data/templates/package_Vagrantfile.erb

@@ -7,5 +7,5 @@ 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"))
+include_vagrantfile = File.expand_path("../include/_Vagrantfile", __FILE__)
 load include_vagrantfile if File.exist?(include_vagrantfile)

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

@@ -1,127 +1,43 @@
-# ruby-debug, not necessary, but useful if we have it
-begin
-  require 'ruby-debug'
-rescue LoadError; end
-
-require File.join(File.dirname(__FILE__), '..', 'lib', 'vagrant')
-require 'contest'
-require 'mocha'
-
 # Add this folder to the load path for "test_helper"
 $:.unshift(File.dirname(__FILE__))
 
-class Test::Unit::TestCase
-  # 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.home = '~/.home'
-      config.vagrant.dotfile_name = ".vagrant"
-      config.vagrant.log_output = nil
-      config.vagrant.host = :detect
-
-      config.ssh.username = "foo"
-      config.ssh.host = "baz"
-      config.ssh.port = 22
-      config.ssh.forwarded_port_key = "ssh"
-      config.ssh.max_tries = 10
-      config.ssh.timeout = 10
-      config.ssh.private_key_path = '~/foo'
-
-      config.vm.box = "foo"
-      config.vm.box_url = nil
-      config.vm.box_ovf = "box.ovf"
-      config.vm.base_mac = "42"
-      config.vm.disk_image_format = 'VMDK'
-      config.vm.forward_port("ssh", 22, 2222)
-      config.vm.shared_folder_uid = nil
-      config.vm.shared_folder_gid = nil
-      config.vm.system = :linux
-      config.vm.share_folder("v-root", "/vagrant", ".")
-
-      config.package.name = 'package'
-
-      # Unison
-      config.unison.folder_suffix = ".sync"
-      config.unison.log_file = "foo-%s"
-
-      # Chef
-      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.recipe_url = nil
-      config.chef.cookbooks_path = "cookbooks"
-      config.chef.provisioning_path = "/tmp/vagrant-chef"
-      config.chef.log_level = :info
-      config.chef.json = {
-        :recipes => ["vagrant_main"]
-      }
-    end
-
-    if block_given?
-      Vagrant::Config.run do |config|
-        yield config
-      end
-    end
+require 'vagrant'
+require 'mario'
+require 'contest'
+require 'mocha'
 
-    config = Vagrant::Config.execute!
+# 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
 
-    environment.instance_variable_set(:@config, config)
+# Silence Mario by sending log output to black hole
+Mario::Platform.logger(nil)
 
-    # Setup the logger. We create it then reset it so that subsequent
-    # calls will recreate it for us.
-    environment.load_logger!
-    environment.logger.class.reset_singleton_logger!
-    environment.logger.stubs(:flush_progress)
-    environment.logger.stubs(:cl_reset).returns("")
+# Add the I18n locale for tests
+I18n.load_path << File.expand_path("../locales/en.yml", __FILE__)
 
-    environment
-  end
+class Test::Unit::TestCase
+  include Vagrant::TestHelpers
 
   # Sets up the mocks for a VM
   def mock_vm(env=nil)
-    env ||= mock_environment
+    env ||= vagrant_env
     vm = Vagrant::VM.new
     vm.stubs(:env).returns(env)
     vm.stubs(:ssh).returns(Vagrant::SSH.new(vm.env))
     vm
   end
 
-  def mock_action_data
-    app = lambda { |env| }
-    env = Vagrant::Action::Environment.new(mock_environment)
-    env["vagrant.test"] = true
-    [app, env]
-  end
-
-  # Returns a resource logger which is safe for tests
-  def quiet_logger(resource, env=nil)
-    logger = Vagrant::ResourceLogger.new(resource, env)
-    logger.stubs(:flush_progress)
-    logger.stubs(:cl_reset).returns("")
-    logger
-  end
-
-  # Returns a linux system
-  def linux_system(vm)
-    Vagrant::Systems::Linux.new(vm)
-  end
-
-  def stub_default_action_dependecies(mock)
-    mock.stubs(:precedes).returns([])
-    mock.stubs(:follows).returns([])
-  end
-
   # Sets up the mocks and stubs for a downloader
   def mock_downloader(downloader_klass)
     tempfile = mock("tempfile")
     tempfile.stubs(:write)
 
-    _, env = mock_action_data
+    _, env = action_env
     [downloader_klass.new(env), tempfile]
   end
 end