vagrantup 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bce7b6eeae444bf20234892e06d974d0612aa928
-  data.tar.gz: bfa089718d5c2387d5580c4207c20f79b1071ef2
+  metadata.gz: fc8f177e1018b78c3060a5b5bc2902855a74d908
+  data.tar.gz: c8aac003402bcefb65a4af7fec95241ea640488b
 SHA512:
-  metadata.gz: 3645050437b980983b3613cb280d4eb422cf84072292a9ef678be4ed7d565531fe21fc084ac07ddd6271eccf9edd84d9614734341b47771ad60e3cf18b64b14a
-  data.tar.gz: 64c5d97c804d76b14615aaf5ae4d8967cb6827fd7cade81305741b667c134a3f1454fc2bb3a63405c1e7a23d390b51c8995d344f5f113130aac96890705bd05c
+  metadata.gz: 5f4ea077695846f9123cdbc0a751ce35c5410743e31b18722a78cec516a7a3d4022e3b5e56bed05debe4fb8111c5617c1aa133b641d63af288145d7d8a11cc9a
+  data.tar.gz: 47d3c1bcb4e64890e90ad9f251a2aee06de7ccc45a32d810fbbb3674f76c8d4d38740aefcf3378fd300395b8ea3ac84e38fda9d1b589b8b9ba086c3d0eb08bc3

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.9.4 (January 28, 2012)
+
+  - Important internal changes to middlewares that make plugin developer's
+    lives much easier. [GH-684]
+  - Match VM names that have parens, brackets, etc.
+  - Detect when the VirtualBox kernel module is not loaded and error. [GH-677]
+  - Set `:auto_config` to false on any networking option to not automatically
+    configure it on the guest. [GH-663]
+  - NFS shared folder guest paths can now contain shell expansion characters
+    such as `~`.
+  - NFS shared folders with a `:create` flag will have their host folders
+    properly created if they don't exist. [GH-667]
+  - Fix the precedence for Arch, Ubuntu, and FreeBSD host classes so
+    they are properly detected. [GH-683]
+  - Fix issue where VM import sometimes made strange VirtualBox folder
+    layouts. [GH-669]
+  - Call proper `id` command on Solaris. [GH-679]
+  - More accurate VBoxManage error detection.
+  - Shared folders can now be marked as transient using the `:transient`
+    flag. [GH-688]
+
 ## 0.9.3 (January 24, 2012)
 
   - Proper error handling for not enough arguments to `box` commands.

data/lib/vagrant/action/builtin.rb

@@ -1,144 +1,158 @@
 module Vagrant
   module Action
-    # Registers the builtin actions with a specific registry.
-    #
-    # These are the pre-built action sequences that are shipped with
-    # Vagrant itself.
-    def self.builtin!(registry)
-      # provision - Provisions a running VM
-      registry.register(:provision) do
-        Builder.new do
-          use General::Validate
-          use VM::CheckAccessible
-          use VM::Provision
-        end
+    # A registry object containing the built-in middleware stacks.
+    class Builtin < Registry
+      def initialize
+        # Properly initialize the registry object
+        super
+
+        # Register all the built-in stacks
+        register_builtin!
       end
 
-      # start - Starts a VM, assuming it already exists on the
-      # environment.
-      registry.register(:start) do
-        Builder.new do
-          use General::Validate
-          use VM::CheckAccessible
-          use VM::CleanMachineFolder
-          use VM::ClearForwardedPorts
-          use VM::CheckPortCollisions, :port_collision_handler => :correct
-          use VM::ForwardPorts
-          use VM::Provision
-          use VM::PruneNFSExports
-          use VM::NFS
-          use VM::ClearSharedFolders
-          use VM::ShareFolders
-          use VM::HostName
-          use VM::ClearNetworkInterfaces
-          use VM::Network
-          use VM::Customize
-          use VM::Boot
+      protected
+
+      def register_builtin!
+        # We do this so that the blocks below have a variable to access the
+        # outer registry.
+        registry = self
+
+        # provision - Provisions a running VM
+        register(:provision) do
+          Builder.new do
+            use General::Validate
+            use VM::CheckAccessible
+            use VM::Provision
+          end
         end
-      end
 
-      # halt - Halts the VM, attempting gracefully but then forcing
-      # a restart if fails.
-      registry.register(:halt) do
-        Builder.new do
-          use General::Validate
-          use VM::CheckAccessible
-          use VM::DiscardState
-          use VM::Halt
+        # start - Starts a VM, assuming it already exists on the
+        # environment.
+        register(:start) do
+          Builder.new do
+            use General::Validate
+            use VM::CheckAccessible
+            use VM::CleanMachineFolder
+            use VM::ClearForwardedPorts
+            use VM::CheckPortCollisions, :port_collision_handler => :correct
+            use VM::ForwardPorts
+            use VM::Provision
+            use VM::PruneNFSExports
+            use VM::NFS
+            use VM::ClearSharedFolders
+            use VM::ShareFolders
+            use VM::HostName
+            use VM::ClearNetworkInterfaces
+            use VM::Network
+            use VM::Customize
+            use VM::Boot
+          end
         end
-      end
 
-      # suspend - Suspends the VM
-      registry.register(:suspend) do
-        Builder.new do
-          use General::Validate
-          use VM::CheckAccessible
-          use VM::Suspend
+        # halt - Halts the VM, attempting gracefully but then forcing
+        # a restart if fails.
+        register(:halt) do
+          Builder.new do
+            use General::Validate
+            use VM::CheckAccessible
+            use VM::DiscardState
+            use VM::Halt
+          end
         end
-      end
 
-      # resume - Resume a VM
-      registry.register(:resume) do
-        Builder.new do
-          use General::Validate
-          use VM::CheckAccessible
-          use VM::CheckPortCollisions
-          use VM::Resume
+        # suspend - Suspends the VM
+        register(:suspend) do
+          Builder.new do
+            use General::Validate
+            use VM::CheckAccessible
+            use VM::Suspend
+          end
         end
-      end
 
-      # reload - Halts then restarts the VM
-      registry.register(:reload) do
-        Builder.new do
-          use General::Validate
-          use VM::CheckAccessible
-          use registry.get(:halt)
-          use registry.get(:start)
+        # resume - Resume a VM
+        register(:resume) do
+          Builder.new do
+            use General::Validate
+            use VM::CheckAccessible
+            use VM::CheckPortCollisions
+            use VM::Resume
+          end
         end
-      end
 
-      # up - Imports, prepares, then starts a fresh VM.
-      registry.register(:up) do
-        Builder.new do
-          use General::Validate
-          use VM::CheckAccessible
-          use VM::CheckBox
-          use VM::Import
-          use VM::CheckGuestAdditions
-          use VM::MatchMACAddress
-          use registry.get(:start)
+        # reload - Halts then restarts the VM
+        register(:reload) do
+          Builder.new do
+            use General::Validate
+            use VM::CheckAccessible
+            use registry.get(:halt)
+            use registry.get(:start)
+          end
         end
-      end
 
-      # destroy - Halts, cleans up, and destroys an existing VM
-      registry.register(:destroy) do
-        Builder.new do
-          use General::Validate
-          use VM::CheckAccessible
-          use registry.get(:halt), :force => true
-          use VM::ProvisionerCleanup
-          use VM::PruneNFSExports
-          use VM::Destroy
-          use VM::CleanMachineFolder
-          use VM::DestroyUnusedNetworkInterfaces
+        # up - Imports, prepares, then starts a fresh VM.
+        register(:up) do
+          Builder.new do
+            use General::Validate
+            use VM::CheckAccessible
+            use VM::CheckBox
+            use VM::Import
+            use VM::CheckGuestAdditions
+            use VM::DefaultName
+            use VM::MatchMACAddress
+            use registry.get(:start)
+          end
         end
-      end
 
-      # package - Export and package the VM
-      registry.register(:package) do
-        Builder.new do
-          use General::Validate
-          use VM::SetupPackageFiles
-          use VM::CheckAccessible
-          use registry.get(:halt)
-          use VM::ClearForwardedPorts
-          use VM::ClearSharedFolders
-          use VM::Export
-          use VM::PackageVagrantfile
-          use VM::Package
+        # destroy - Halts, cleans up, and destroys an existing VM
+        register(:destroy) do
+          Builder.new do
+            use General::Validate
+            use VM::CheckAccessible
+            use registry.get(:halt), :force => true
+            use VM::ProvisionerCleanup
+            use VM::PruneNFSExports
+            use VM::Destroy
+            use VM::CleanMachineFolder
+            use VM::DestroyUnusedNetworkInterfaces
+          end
         end
-      end
 
-      # box_add - Download and add a box.
-      registry.register(:box_add) do
-        Builder.new do
-          use Box::Download
-          use Box::Unpackage
-          use Box::Verify
+        # package - Export and package the VM
+        register(:package) do
+          Builder.new do
+            use General::Validate
+            use VM::SetupPackageFiles
+            use VM::CheckAccessible
+            use registry.get(:halt)
+            use VM::ClearForwardedPorts
+            use VM::ClearSharedFolders
+            use VM::Export
+            use VM::PackageVagrantfile
+            use VM::Package
+          end
         end
-      end
 
-      # box_remove - Removes/deletes a box.
-      registry.register(:box_remove) do
-        Builder.new do
-          use Box::Destroy
+        # box_add - Download and add a box.
+        register(:box_add) do
+          Builder.new do
+            use Box::Download
+            use Box::Unpackage
+            use Box::Verify
+          end
+        end
+
+        # box_remove - Removes/deletes a box.
+        register(:box_remove) do
+          Builder.new do
+            use Box::Destroy
+          end
         end
-      end
 
-      # box_repackage - Repackages a box.
-      registry.register(:box_repackage) do
-        Builder.new do
-          use Box::Package
+        # box_repackage - Repackages a box.
+        register(:box_repackage) do
+          Builder.new do
+            use Box::Package
+          end
         end
       end
     end

data/lib/vagrant/action/vm/default_name.rb

@@ -0,0 +1,22 @@
+require 'log4r'
+
+module Vagrant
+  module Action
+    module VM
+      class DefaultName
+        def initialize(app, env)
+          @logger = Log4r::Logger.new("vagrant::action::vm::defaultname")
+          @app = app
+        end
+
+        def call(env)
+          @logger.info("Setting the default name of the VM")
+          name = env[:root_path].basename.to_s + "_#{Time.now.to_i}"
+          env[:vm].driver.set_name(name)
+
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/vm/import.rb

@@ -10,9 +10,8 @@ module Vagrant
           env[:ui].info I18n.t("vagrant.actions.vm.import.importing", :name => env[:vm].box.name)
 
           # Import the virtual machine
-          name = File.basename(env[:vm].env.cwd) + "_#{Time.now.to_i}"
           ovf_file = env[:vm].box.directory.join("box.ovf").to_s
-          env[:vm].uuid = env[:vm].driver.import(ovf_file, name) do |progress|
+          env[:vm].uuid = env[:vm].driver.import(ovf_file) do |progress|
             env[:ui].clear_line
             env[:ui].report_progress(progress, 100, false)
           end

data/lib/vagrant/action/vm/network.rb

@@ -37,8 +37,12 @@ module Vagrant
             adapters << adapter
 
             # Get the network configuration
-            network = send("#{type}_network_config", config)
-            networks << network
+            if config[:auto_config]
+              network = send("#{type}_network_config", config)
+              networks << network
+            else
+              @logger.info("Auto config disabled, not configuring: #{type}")
+            end
           end
 
           if !adapters.empty?
@@ -167,7 +171,8 @@ module Vagrant
             :netmask => "255.255.255.0",
             :adapter => nil,
             :mac     => nil,
-            :name    => nil
+            :name    => nil,
+            :auto_config => true
           }.merge(options)
 
           # Verify that this hostonly network wouldn't conflict with any
@@ -307,7 +312,8 @@ module Vagrant
 
           return {
             :adapter => nil,
-            :mac     => nil
+            :mac     => nil,
+            :auto_config => true
           }.merge(options)
         end
 

data/lib/vagrant/action/vm/nfs.rb

@@ -1,3 +1,8 @@
+require 'fileutils'
+require 'pathname'
+
+require 'log4r'
+
 module Vagrant
   module Action
     module VM
@@ -15,6 +20,7 @@ module Vagrant
       #
       class NFS
         def initialize(app,env)
+          @logger = Log4r::Logger.new("vagrant::action::vm::nfs")
           @app = app
           @env = env
 
@@ -46,18 +52,35 @@ module Vagrant
         # task.
         def extract_folders
           # Load the NFS enabled shared folders
-          @folders = @env[:vm].config.vm.shared_folders.inject({}) do |acc, data|
-            key, opts = data
-
+          @folders = {}
+          @env[:vm].config.vm.shared_folders.each do |key, opts|
             if opts[:nfs]
               # Duplicate the options, set the hostpath, and set disabled on the original
               # options so the ShareFolders middleware doesn't try to mount it.
-              acc[key] = opts.dup
-              acc[key][:hostpath] = File.expand_path(opts[:hostpath], @env[:root_path])
+              folder = opts.dup
+              hostpath = Pathname.new(opts[:hostpath]).expand_path(@env[:root_path])
+
+              if !hostpath.directory? && opts[:create]
+                # Host path doesn't exist, so let's create it.
+                @logger.debug("Host path doesn't exist, creating: #{hostpath}")
+
+                begin
+                  FileUtils.mkpath(hostpath)
+                rescue Errno::EACCES
+                  raise Errors::SharedFolderCreateFailed, :path => hostpath.to_s
+                end
+              end
+
+              # Set the hostpath now that it exists.
+              folder[:hostpath] = hostpath.to_s
+
+              # Assign the folder to our instance variable for later use
+              @folders[key] = folder
+
+              # Disable the folder so that regular shared folders don't try to
+              # mount it.
               opts[:disabled] = true
             end
-
-            acc
           end
         end
 

data/lib/vagrant/action/vm/share_folders.rb

@@ -63,7 +63,8 @@ module Vagrant
           shared_folders.each do |name, data|
             folders << {
               :name => name,
-              :hostpath => File.expand_path(data[:hostpath], @env[:root_path])
+              :hostpath => File.expand_path(data[:hostpath], @env[:root_path]),
+              :transient => data[:transient]
             }
           end
 

data/lib/vagrant/action.rb

@@ -1,8 +1,8 @@
 require 'vagrant/action/builder'
-require 'vagrant/action/builtin'
 
 module Vagrant
   module Action
+    autoload :Builtin,     'vagrant/action/builtin'
     autoload :Environment, 'vagrant/action/environment'
     autoload :Runner,      'vagrant/action/runner'
     autoload :Warden,      'vagrant/action/warden'
@@ -35,6 +35,7 @@ module Vagrant
       autoload :ClearNetworkInterfaces, 'vagrant/action/vm/clear_network_interfaces'
       autoload :ClearSharedFolders,  'vagrant/action/vm/clear_shared_folders'
       autoload :Customize,           'vagrant/action/vm/customize'
+      autoload :DefaultName,         'vagrant/action/vm/default_name'
       autoload :Destroy,             'vagrant/action/vm/destroy'
       autoload :DestroyUnusedNetworkInterfaces, 'vagrant/action/vm/destroy_unused_network_interfaces'
       autoload :DiscardState,        'vagrant/action/vm/discard_state'

data/lib/vagrant/config/vm.rb

@@ -79,6 +79,7 @@ Please change your configurations to match this new syntax.
           :owner => nil,
           :group => nil,
           :nfs   => false,
+          :transient => false,
           :extra => nil
         }.merge(opts || {})
       end

data/lib/vagrant/driver/virtualbox.rb

@@ -94,6 +94,7 @@ module Vagrant
                                :read_used_ports,
                                :read_vms,
                                :set_mac_address,
+                               :set_name,
                                :share_folders,
                                :ssh_port,
                                :start,
@@ -117,7 +118,12 @@ module Vagrant
 
         # Note: We split this into multiple lines because apparently "".split("_")
         # is [], so we have to check for an empty array in between.
-        parts = execute("--version").split("_")
+        output = execute("--version")
+        if output =~ /vboxdrv kernel module is not loaded/
+          raise Errors::VirtualBoxKernelModuleNotLoaded
+        end
+
+        parts = output.split("_")
         return nil if parts.empty?
         parts[0].split("r")[0]
       end

data/lib/vagrant/driver/virtualbox_4_0.rb

@@ -9,7 +9,7 @@ module Vagrant
       def initialize(uuid)
         super()
 
-        @logger = Log4r::Logger.new("vagrant::driver::virtualbox_4_1")
+        @logger = Log4r::Logger.new("vagrant::driver::virtualbox_4_0")
         @uuid = uuid
       end
 
@@ -147,11 +147,15 @@ module Vagrant
         execute("controlvm", @uuid, "poweroff")
       end
 
-      def import(ovf, name)
+      def import(ovf)
+        output = ""
         total = ""
         last  = 0
-        execute("import", ovf, "--vsys", "0", "--vmname", name) do |type, data|
-          if type == :stderr
+        execute("import", ovf) do |type, data|
+          if type == :stdout
+            # Keep track of the stdout so that we can get the VM name
+            output << data
+          elsif type == :stderr
             # Append the data so we can see the full view
             total << data
 
@@ -171,8 +175,16 @@ module Vagrant
           end
         end
 
+        # Find the name of the VM name
+        if output !~ /Suggested VM name "(.+?)"/
+          @logger.error("Couldn't find VM name in the output.")
+          return nil
+        end
+
+        name = $1.to_s
+
         output = execute("list", "vms")
-        if output =~ /^"#{name}" \{(.+?)\}$/
+        if output =~ /^"#{Regexp.escape(name)}" \{(.+?)\}$/
           return $1.to_s
         end
 
@@ -274,7 +286,7 @@ module Vagrant
             elsif line =~ /^NetworkMask:\s+(.+?)$/
               info[:netmask] = $1.to_s
             elsif line =~ /^Status:\s+(.+?)$/
-                info[:status] = $1.to_s
+              info[:status] = $1.to_s
             end
           end
 
@@ -374,10 +386,18 @@ module Vagrant
         execute("modifyvm", @uuid, "--macaddress1", mac)
       end
 
+      def set_name(name)
+        execute("modifyvm", @uuid, "--name", name)
+      end
+
       def share_folders(folders)
         folders.each do |folder|
-          execute("sharedfolder", "add", @uuid, "--name",
-                  folder[:name], "--hostpath", folder[:hostpath])
+          args = ["--name",
+                  folder[:name],
+                  "--hostpath",
+                  folder[:hostpath]]
+          args << "--transient" if folder.has_key?(:transient) && folder[:transient]
+          execute("sharedfolder", "add", @uuid, *args)
         end
       end
 

data/lib/vagrant/driver/virtualbox_4_1.rb

@@ -147,11 +147,15 @@ module Vagrant
         execute("controlvm", @uuid, "poweroff")
       end
 
-      def import(ovf, name)
+      def import(ovf)
+        output = ""
         total = ""
         last  = 0
-        execute("import", ovf, "--vsys", "0", "--vmname", name) do |type, data|
-          if type == :stderr
+        execute("import", ovf) do |type, data|
+          if type == :stdout
+            # Keep track of the stdout so that we can get the VM name
+            output << data
+          elsif type == :stderr
             # Append the data so we can see the full view
             total << data
 
@@ -171,8 +175,16 @@ module Vagrant
           end
         end
 
+        # Find the name of the VM name
+        if output !~ /Suggested VM name "(.+?)"/
+          @logger.error("Couldn't find VM name in the output.")
+          return nil
+        end
+
+        name = $1.to_s
+
         output = execute("list", "vms")
-        if output =~ /^"#{name}" \{(.+?)\}$/
+        if output =~ /^"#{Regexp.escape(name)}" \{(.+?)\}$/
           return $1.to_s
         end
 
@@ -374,10 +386,18 @@ module Vagrant
         execute("modifyvm", @uuid, "--macaddress1", mac)
       end
 
+      def set_name(name)
+        execute("modifyvm", @uuid, "--name", name)
+      end
+
       def share_folders(folders)
         folders.each do |folder|
-          execute("sharedfolder", "add", @uuid, "--name",
-                  folder[:name], "--hostpath", folder[:hostpath])
+          args = ["--name",
+                  folder[:name],
+                  "--hostpath",
+                  folder[:hostpath]]
+          args << "--transient" if folder.has_key?(:transient) && folder[:transient]
+          execute("sharedfolder", "add", @uuid, *args)
         end
       end
 

data/lib/vagrant/driver/virtualbox_base.rb

@@ -133,9 +133,8 @@ module Vagrant
       # Imports the VM from an OVF file.
       #
       # @param [String] ovf Path to the OVF file.
-      # @param [String] name Name of the VM.
       # @return [String] UUID of the imported VM.
-      def import(ovf, name)
+      def import(ovf)
       end
 
       # Returns a list of forwarded ports for a VM.
@@ -261,6 +260,14 @@ module Vagrant
           else
             raise Errors::VBoxManageError, :command => command.inspect
           end
+        else
+          # Sometimes, VBoxManage fails but doesn't actual return a non-zero
+          # exit code. For this we inspect the output and determine if an error
+          # occurred.
+          if r.stderr =~ /VBoxManage: error:/
+            @logger.info("VBoxManage error text found, assuming error.")
+            raise Errors::VBoxManageError, :command => command.inspect
+          end
         end
 
         # Return the output, making sure to replace any Windows-style

data/lib/vagrant/environment.rb

@@ -197,13 +197,10 @@ module Vagrant
     #
     # @return [Registry]
     def action_registry
-      return @action_registry if defined?(@action_registry)
-
-      # The action registry hasn't been loaded yet, so load it
-      # and setup the built-in actions with it.
-      @action_registry = Registry.new
-      Vagrant::Action.builtin!(@action_registry)
-      @action_registry
+      # For now we return the global built-in actions registry. In the future
+      # we may want to create an isolated registry that inherits from this
+      # global one, but for now there isn't a use case that calls for it.
+      Vagrant.actions
     end
 
     # Loads on initial access and reads data from the global data store.

data/lib/vagrant/errors.rb

@@ -343,6 +343,11 @@ module Vagrant
       error_key(:virtualbox_not_detected)
     end
 
+    class VirtualBoxKernelModuleNotLoaded < VagrantError
+      status_code(70)
+      error_key(:virtualbox_kernel_module_not_loaded)
+    end
+
     class VMBaseMacNotSpecified < VagrantError
       status_code(47)
       error_key(:no_base_mac, "vagrant.actions.vm.match_mac")

data/lib/vagrant/guest/linux.rb

@@ -43,25 +43,7 @@ module Vagrant
       end
 
       def mount_shared_folder(name, guestpath, options)
-        # Determine the real guest path. Since we use a `sudo` shell everywhere
-        # else, things like '~' don't expand properly in shared folders. We have
-        # to `echo` here to get that path.
-        real_guestpath = nil
-        @vm.channel.execute("printf #{guestpath}") do |type, data|
-          if type == :stdout
-            real_guestpath ||= ""
-            real_guestpath += data
-          end
-        end
-
-        if !real_guestpath
-          # Really strange error case if this happens. Let's throw an error,
-          # tell the user to check the echo output.
-          raise LinuxError, :_key => :guestpath_expand_fail
-        end
-
-        # Chomp off the newline if it exists
-        real_guestpath = real_guestpath.chomp
+        real_guestpath = expanded_guest_path(guestpath)
         @logger.debug("Shell expanded guest path: #{real_guestpath}")
 
         @vm.channel.sudo("mkdir -p #{real_guestpath}")
@@ -73,16 +55,44 @@ module Vagrant
         # TODO: Maybe check for nfs support on the guest, since its often
         # not installed by default
         folders.each do |name, opts|
-          @vm.channel.sudo("mkdir -p #{opts[:guestpath]}")
-          @vm.channel.sudo("mount #{ip}:'#{opts[:hostpath]}' #{opts[:guestpath]}",
+          # Expand the guestpath, so we can handle things like "~/vagrant"
+          real_guestpath = expanded_guest_path(opts[:guestpath])
+
+          # Do the actual creating and mounting
+          @vm.channel.sudo("mkdir -p #{real_guestpath}")
+          @vm.channel.sudo("mount #{ip}:'#{opts[:hostpath]}' #{real_guestpath}",
                           :error_class => LinuxError,
                           :error_key => :mount_nfs_fail)
         end
       end
 
-      #-------------------------------------------------------------------
-      # "Private" methods which assist above methods
-      #-------------------------------------------------------------------
+      protected
+
+      # Determine the real guest path. Since we use a `sudo` shell everywhere
+      # else, things like '~' don't expand properly in shared folders. We have
+      # to `echo` here to get that path.
+      #
+      # @param [String] guestpath The unexpanded guest path.
+      # @return [String] The expanded guestpath
+      def expanded_guest_path(guestpath)
+        real_guestpath = nil
+        @vm.channel.execute("printf #{guestpath}") do |type, data|
+          if type == :stdout
+            real_guestpath ||= ""
+            real_guestpath += data
+          end
+        end
+
+        if !real_guestpath
+          # Really strange error case if this happens. Let's throw an error,
+          # tell the user to check the echo output.
+          raise LinuxError, :_key => :guestpath_expand_fail
+        end
+
+        # Chomp the string so that any trailing newlines are killed
+        return real_guestpath.chomp
+      end
+
       def mount_folder(name, guestpath, options)
         # Determine the permission string to attach to the mount command
         mount_options = "-o uid=`id -u #{options[:owner]}`,gid=`id -g #{options[:group]}`"

data/lib/vagrant/guest/solaris.rb

@@ -101,13 +101,17 @@ module Vagrant
         # Create the shared folder
         vm.channel.execute("#{vm.config.solaris.suexec_cmd} mkdir -p #{guestpath}")
 
+        # We have to use this `id` command instead of `/usr/bin/id` since this
+        # one accepts the "-u" and "-g" flags.
+        id_cmd        = "/usr/xpg4/bin/id"
+
         # Mount the folder with the proper owner/group
-        mount_options = "-o uid=`id -u #{owner}`,gid=`id -g #{group}`"
+        mount_options = "-o uid=`#{id_cmd} -u #{owner}`,gid=`#{id_cmd} -g #{group}`"
         mount_options += ",#{options[:extra]}" if options[:extra]
         vm.channel.execute("#{vm.config.solaris.suexec_cmd} /sbin/mount -F vboxfs #{mount_options} #{name} #{guestpath}")
 
         # chown the folder to the proper owner/group
-        vm.channel.execute("#{vm.config.solaris.suexec_cmd} chown `id -u #{owner}`:`id -g #{group}` #{guestpath}")
+        vm.channel.execute("#{vm.config.solaris.suexec_cmd} chown `#{id_cmd} -u #{owner}`:`#{id_cmd} -g #{group}` #{guestpath}")
       end
     end
   end

data/lib/vagrant/hosts/arch.rb

@@ -5,6 +5,11 @@ module Vagrant
         File.exist?("/etc/rc.conf") && File.exist?("/etc/pacman.conf")
       end
 
+      # Normal, mid-range precedence.
+      def self.precedence
+        5
+      end
+
       def nfs_export(id, ip, folders)
         output = TemplateRenderer.render('nfs/exports_linux',
                                          :uuid => id,

data/lib/vagrant/hosts/fedora.rb

@@ -15,6 +15,11 @@ module Vagrant
         false
       end
 
+      # Normal, mid-range precedence.
+      def self.precedence
+        5
+      end
+
       def initialize(*args)
         super
 

data/lib/vagrant/hosts/freebsd.rb

@@ -11,6 +11,11 @@ module Vagrant
         Util::Platform.freebsd?
       end
 
+      # Normal, mid-range precedence.
+      def self.precedence
+        5
+      end
+
       def initialize(*args)
         super
 

data/lib/vagrant/hosts.rb

@@ -1,3 +1,5 @@
+require 'log4r'
+
 module Vagrant
   module Hosts
     autoload :Base,    'vagrant/hosts/base'
@@ -11,13 +13,19 @@ module Vagrant
     # This method detects the correct host based on the `match?` methods
     # implemented in the registered hosts.
     def self.detect(registry)
+      logger = Log4r::Logger.new("vagrant::hosts")
+
       # Sort the hosts by their precedence
       host_klasses = registry.to_hash.values
       host_klasses = host_klasses.sort_by { |a| a.precedence }.reverse
+      logger.debug("Host path search classes: #{host_klasses.inspect}")
 
       # Test for matches and return the host class that matches
       host_klasses.each do |klass|
-        return klass if klass.match?
+        if klass.match?
+          logger.info("Host class: #{klass}")
+          return klass
+        end
       end
 
       # No matches found...

data/lib/vagrant/provisioners/puppet.rb

@@ -130,7 +130,7 @@ module Vagrant
       def verify_binary(binary)
         env[:vm].channel.sudo("which #{binary}",
                               :error_class => PuppetError,
-                              :error_key => :puppet_not_detected,
+                              :error_key => :not_detected,
                               :binary => binary)
       end
 

data/lib/vagrant/provisioners/puppet_server.rb

@@ -29,7 +29,7 @@ module Vagrant
       def verify_binary(binary)
         env[:vm].channel.sudo("which #{binary}",
                               :error_class => PuppetServerError,
-                              :error_key => :puppetd_not_detected,
+                              :error_key => :not_detected,
                               :binary => binary)
       end
 
@@ -46,12 +46,7 @@ module Vagrant
 
         env[:ui].info I18n.t("vagrant.provisioners.puppet_server.running_puppetd")
         env[:vm].channel.sudo(command) do |type, data|
-          # Output the data with the proper color based on the stream.
-          color = type == :stdout ? :green : :red
-
-          # Note: Be sure to chomp the data to avoid the newlines that the
-          # Chef outputs.
-          env[:ui].info(data.chomp, :color => color, :prefix => false)
+          env[:ui].info(data.chomp, :prefix => false)
         end
       end
     end

data/lib/vagrant/registry.rb

@@ -6,6 +6,7 @@ module Vagrant
   class Registry
     def initialize
       @actions = {}
+      @results_cache = {}
     end
 
     # Register a callable by key.
@@ -26,8 +27,10 @@ module Vagrant
     # action stack.
     def get(key)
       return nil if !@actions.has_key?(key)
-      @actions[key].call
+      return @results_cache[key] if @results_cache.has_key?(key)
+      @results_cache[key] = @actions[key].call
     end
+    alias :[] :get
 
     # Iterate over the keyspace.
     def each(&block)

data/lib/vagrant/version.rb

@@ -2,5 +2,5 @@ module Vagrant
   # This will always be up to date with the current version of Vagrant,
   # since it is used to generate the gemspec and is also the source of
   # the version for `vagrant -v`
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/lib/vagrant.rb

@@ -74,6 +74,12 @@ module Vagrant
   autoload :Util,          'vagrant/util'
   autoload :VM,            'vagrant/vm'
 
+  # Returns a `Vagrant::Registry` object that contains all the built-in
+  # middleware stacks.
+  def self.actions
+    @actions ||= Vagrant::Action::Builtin.new
+  end
+
   # The source root is the path to the root directory of
   # the Vagrant gem.
   def self.source_root

data/templates/locales/en.yml

@@ -16,16 +16,6 @@ en:
     errors:
       base_vm_not_found: The base VM with the name '%{name}' was not found.
       box_not_found: Box '%{name}' could not be found.
-      chef_not_detected: |-
-        The chef (either `chef-solo` or `chef-client`) binary was not found on
-        the VM and is required for chef provisioning. Please verify that chef
-        is installed and that the binary is available on the PATH.
-      puppet_not_detected: |-
-        The `puppet` binary was not found on the VM and is required for Puppet provisioning.
-        Please verify that Puppet is installed and that the binary is available on the PATH.
-      puppetd_not_detected: |-
-        The `puppetd` binary was not found on the VM is required for Puppet Server provisioning.
-        Please verify that Puppet is installed and that the binary is available on the PATH.
       cli_invalid_options: |-
         An invalid option was specified. The help for this command
         is available below.
@@ -166,6 +156,10 @@ en:
         listed below to use Vagrant:
 
         %{supported_versions}
+      virtualbox_kernel_module_not_loaded: |-
+        VirtualBox is complaining that the kernel module is not loaded. Please
+        run `VBoxManage --version` to see the error message which should contain
+        instructions on how to fix this error.
       virtualbox_not_detected: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         Vagrant uses the `VBoxManage` binary that ships with VirtualBox, and requires
@@ -563,6 +557,10 @@ en:
 
     provisioners:
       chef:
+        chef_not_detected: |-
+          The chef binary (either `chef-solo` or `chef-client`) was not found on
+          the VM and is required for chef provisioning. Please verify that chef
+          is installed and that the binary is available on the PATH.
         json: "Generating chef JSON and uploading..."
         client_key_folder: "Creating folder to hold client key..."
         upload_validation_key: "Uploading chef client validation key..."

data/test/unit/vagrant/registry_test.rb

@@ -20,7 +20,7 @@ describe Vagrant::Registry do
     end.to_not raise_error
   end
 
-  it "should call and return the result of a block when asking for the ite" do
+  it "should call and return the result of a block when asking for the item" do
     object = Object.new
     instance.register("foo") do
       object
@@ -29,6 +29,24 @@ describe Vagrant::Registry do
     instance.get("foo").should eql(object)
   end
 
+  it "should be able to get the item with []" do
+    object = Object.new
+    instance.register("foo") { object }
+
+    instance["foo"].should eql(object)
+  end
+
+  it "should cache the result of the item so they can be modified" do
+    # Make the proc generate a NEW array each time
+    instance.register("foo") { [] }
+
+    # Test that modifying the result modifies the actual cached
+    # value. This verifies we're caching.
+    instance.get("foo").should == []
+    instance.get("foo") << "value"
+    instance.get("foo").should == ["value"]
+  end
+
   it "should be enumerable" do
     instance.register("foo", "foovalue")
     instance.register("bar", "barvalue")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -270,6 +270,7 @@ files:
 - lib/vagrant/action/vm/clear_network_interfaces.rb
 - lib/vagrant/action/vm/clear_shared_folders.rb
 - lib/vagrant/action/vm/customize.rb
+- lib/vagrant/action/vm/default_name.rb
 - lib/vagrant/action/vm/destroy.rb
 - lib/vagrant/action/vm/destroy_unused_network_interfaces.rb
 - lib/vagrant/action/vm/discard_state.rb