vagrant 0.9.7 → 1.0.0

data/CHANGELOG.md

@@ -1,3 +1,44 @@
+## 1.0.0 (March 6, 2012)
+
+  - `vagrant gem` should now be used to install Vagrant plugins that are
+    gems. This installs the gems to a private gem folder that Vagrant adds
+    to its own load path. This isolates Vagrant-related gems from system
+    gems.
+  - Plugin loading no longer happens right when Vagrant is loaded, but when
+    a Vagrant environment is loaded. I don't anticipate this causing any
+    problems but it is a backwards incompatible change should a plugin
+    depend on this (but I don't see any reason why they would).
+  - `vagrant destroy` now asks for confirmation by default. This can be
+    overridden with the `--force` flag. [GH-699]
+  - Fix issue with Puppet config inheritance. [GH-722]
+  - Fix issue where starting a VM on some systems was incorrectly treated
+    as failing. [GH-720]
+  - It is now an error to specify the packaging `output` as a directory. [GH-730]
+  - Unix-style line endings are used properly for guest OS. [GH-727]
+  - Retry certain VirtualBox operations, since they intermittently fail.
+    [GH-726]
+  - Fix issue where Vagrant would sometimes "lose" a VM if an exception
+    occurred. [GH-725]
+  - `vagrant destroy` destroys virtual machines in reverse order. [GH-739]
+  - Add an `fsid` option to Linux NFS exports. [GH-736]
+  - Fix edge case where an exception could be raised in networking code. [GH-742]
+  - Add missing translation for the "guru meditation" state. [GH-745]
+  - Check that VirtualBox exists before certain commands. [GH-746]
+  - NIC type can be defined for host-only network adapters. [GH-750]
+  - Fix issue where re-running chef-client would sometimes cause
+    problems due to file permissions. [GH-748]
+  - FreeBSD guests can now have their hostnames changed. [GH-757]
+  - FreeBSD guests now support host only networking and bridged networking. [GH-762]
+  - `VM#run_action` is now public so plugin-devs can hook into it.
+  - Fix crashing bug when attempting to run commands on the "primary"
+    VM in a multi-VM environment. [GH-761]
+  - With puppet you can now specify `:facter` as a dictionary of facts to
+    override what is generated by Puppet. [GH-753]
+  - Automatically convert all arguments to `customize` to strings.
+  - openSUSE host system. [GH-766]
+  - Fix subprocess IO deadlock which would occur on Windows. [GH-765]
+  - Fedora 16 guest support. [GH-772]
+
 ## 0.9.7 (February 9, 2012)
 
   - Fix regression where all subprocess IO simply didn't work with

data/config/default.rb

@@ -4,7 +4,6 @@ Vagrant::Config.run do |config|
   config.vagrant.host = :detect
 
   config.ssh.username = "vagrant"
-  config.ssh.password = "vagrant"
   config.ssh.host = "127.0.0.1"
   config.ssh.guest_port = 22
   config.ssh.max_tries = 100

data/lib/vagrant.rb

@@ -1,9 +1,10 @@
+require 'log4r'
+
 # Enable logging if it is requested. We do this before
 # anything else so that we can setup the output before
 # any logging occurs.
 if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != ""
   # Require Log4r and define the levels we'll be using
-  require 'log4r'
   require 'log4r/config'
   Log4r.define_levels(*Log4r::Log4rConfig::LogLevels)
 
@@ -50,6 +51,10 @@ require 'i18n'
 # there are issues with ciphers not being properly loaded.
 require 'openssl'
 
+# Always make the version available
+require 'vagrant/version'
+Log4r::Logger.new("vagrant::global").info("Vagrant version: #{Vagrant::VERSION}")
+
 module Vagrant
   autoload :Action,        'vagrant/action'
   autoload :Box,           'vagrant/box'
@@ -136,6 +141,7 @@ I18n.load_path << File.expand_path("templates/locales/en.yml", Vagrant.source_ro
 # Register the built-in commands
 Vagrant.commands.register(:box)          { Vagrant::Command::Box }
 Vagrant.commands.register(:destroy)      { Vagrant::Command::Destroy }
+Vagrant.commands.register(:gem)          { Vagrant::Command::Gem }
 Vagrant.commands.register(:halt)         { Vagrant::Command::Halt }
 Vagrant.commands.register(:init)         { Vagrant::Command::Init }
 Vagrant.commands.register(:package)      { Vagrant::Command::Package }
@@ -159,6 +165,7 @@ Vagrant.config_keys.register(:package) { Vagrant::Config::PackageConfig }
 Vagrant.hosts.register(:arch)    { Vagrant::Hosts::Arch }
 Vagrant.hosts.register(:bsd)     { Vagrant::Hosts::BSD }
 Vagrant.hosts.register(:fedora)  { Vagrant::Hosts::Fedora }
+Vagrant.hosts.register(:opensuse)  { Vagrant::Hosts::OpenSUSE }
 Vagrant.hosts.register(:freebsd) { Vagrant::Hosts::FreeBSD }
 Vagrant.hosts.register(:gentoo)  { Vagrant::Hosts::Gentoo }
 Vagrant.hosts.register(:linux)   { Vagrant::Hosts::Linux }
@@ -167,6 +174,7 @@ Vagrant.hosts.register(:windows) { Vagrant::Hosts::Windows }
 # Register the built-in guests
 Vagrant.guests.register(:arch)    { Vagrant::Guest::Arch }
 Vagrant.guests.register(:debian)  { Vagrant::Guest::Debian }
+Vagrant.guests.register(:fedora)  { Vagrant::Guest::Fedora }
 Vagrant.guests.register(:freebsd) { Vagrant::Guest::FreeBSD }
 Vagrant.guests.register(:gentoo)  { Vagrant::Guest::Gentoo }
 Vagrant.guests.register(:linux)   { Vagrant::Guest::Linux }
@@ -186,7 +194,3 @@ Vagrant.provisioners.register(:shell)         { Vagrant::Provisioners::Shell }
 Vagrant.config_keys.register(:freebsd) { Vagrant::Guest::FreeBSD::FreeBSDConfig }
 Vagrant.config_keys.register(:linux)   { Vagrant::Guest::Linux::LinuxConfig }
 Vagrant.config_keys.register(:solaris) { Vagrant::Guest::Solaris::SolarisConfig }
-
-# Load the things which must be loaded before anything else.
-require 'vagrant/version'
-Vagrant::Plugin.load!

data/lib/vagrant/action.rb

@@ -20,6 +20,7 @@ module Vagrant
     end
 
     module General
+      autoload :CheckVirtualbox, 'vagrant/action/general/check_virtualbox'
       autoload :Package,  'vagrant/action/general/package'
       autoload :Validate, 'vagrant/action/general/validate'
     end

data/lib/vagrant/action/builtin.rb

@@ -20,6 +20,7 @@ module Vagrant
         # provision - Provisions a running VM
         register(:provision) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::Provision
@@ -30,6 +31,7 @@ module Vagrant
         # environment.
         register(:start) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::CleanMachineFolder
@@ -53,6 +55,7 @@ module Vagrant
         # a restart if fails.
         register(:halt) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::DiscardState
@@ -63,6 +66,7 @@ module Vagrant
         # suspend - Suspends the VM
         register(:suspend) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::Suspend
@@ -72,6 +76,7 @@ module Vagrant
         # resume - Resume a VM
         register(:resume) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::CheckPortCollisions
@@ -82,6 +87,7 @@ module Vagrant
         # reload - Halts then restarts the VM
         register(:reload) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use registry.get(:halt)
@@ -92,6 +98,7 @@ module Vagrant
         # up - Imports, prepares, then starts a fresh VM.
         register(:up) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use VM::CheckBox
@@ -106,6 +113,7 @@ module Vagrant
         # destroy - Halts, cleans up, and destroys an existing VM
         register(:destroy) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::CheckAccessible
             use registry.get(:halt), :force => true
@@ -120,6 +128,7 @@ module Vagrant
         # package - Export and package the VM
         register(:package) do
           Builder.new do
+            use General::CheckVirtualbox
             use General::Validate
             use VM::SetupPackageFiles
             use VM::CheckAccessible
@@ -135,6 +144,7 @@ module Vagrant
         # box_add - Download and add a box.
         register(:box_add) do
           Builder.new do
+            use General::CheckVirtualbox
             use Box::Download
             use Box::Unpackage
             use Box::Verify

data/lib/vagrant/action/general/check_virtualbox.rb

@@ -0,0 +1,28 @@
+module Vagrant
+  module Action
+    module General
+      # Checks that virtualbox is installed and ready to be used.
+      class CheckVirtualbox
+        def initialize(app, env)
+          @app = app
+        end
+
+        def call(env)
+          # Certain actions may not actually have a VM, and thus no
+          # driver, so we have to be clever about obtaining an instance
+          # of the driver.
+          driver = nil
+          driver = env[:vm].driver if env[:vm]
+          driver = Driver::VirtualBox.new(nil) if !driver
+
+          # Verify that it is ready to go! This will raise an exception
+          # if anything goes wrong.
+          driver.verify!
+
+          # Carry on.
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/action/general/package.rb

@@ -27,6 +27,7 @@ module Vagrant
         def call(env)
           @env = env
 
+          raise Errors::PackageOutputDirectory if File.directory?(tar_path)
           raise Errors::PackageOutputExists if File.exist?(tar_path)
           raise Errors::PackageRequiresDirectory if !env["package.directory"] ||
             !File.directory?(env["package.directory"])
@@ -37,12 +38,14 @@ module Vagrant
         end
 
         def recover(env)
-          # Don't delete the tar_path if the error is that the output already
-          # exists, since this will nuke the user's previous file.
-          if !env["vagrant.error"].is_a?(Errors::PackageOutputExists)
-						# Cleanup any packaged files if the packaging failed at some point.
-						File.delete(tar_path) if File.exist?(tar_path)
-					end
+          # There are certain exceptions that we don't delete the file for.
+          ignore_exc = [Errors::PackageOutputDirectory, Errors::PackageOutputExists]
+          ignore_exc.each do |exc|
+            return if env["vagrant.error"].is_a?(exc)
+          end
+
+          # Cleanup any packaged files if the packaging failed at some point.
+          File.delete(tar_path) if File.exist?(tar_path)
         end
 
         # This method copies the include files (passed in via command line)
@@ -90,7 +93,7 @@ module Vagrant
 
         # Path to the final box output file
         def tar_path
-          File.join(FileUtils.pwd, @env["package.output"])
+          File.expand_path(@env["package.output"], FileUtils.pwd)
         end
       end
     end

data/lib/vagrant/action/general/validate.rb

@@ -6,12 +6,11 @@ module Vagrant
       class Validate
         def initialize(app, env)
           @app = app
-          @env = env
         end
 
         def call(env)
-          @env[:vm].config.validate!(@env[:vm].env) if !@env.has_key?("validate") || @env["validate"]
-          @app.call(@env)
+          env[:vm].config.validate!(env[:vm].env) if !env.has_key?("validate") || env["validate"]
+          @app.call(env)
         end
       end
     end

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

@@ -15,7 +15,7 @@ module Vagrant
             customizations.each do |command|
               processed_command = command.collect do |arg|
                 arg = env[:vm].uuid if arg == :id
-                arg
+                arg.to_s
               end
 
               result = env[:vm].driver.execute_command(processed_command)

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

@@ -37,12 +37,9 @@ module Vagrant
             adapters << adapter
 
             # Get the network configuration
-            if config[:auto_config]
-              network = send("#{type}_network_config", config)
-              networks << network
-            else
-              @logger.info("Auto config disabled, not configuring: #{type}")
-            end
+            network = send("#{type}_network_config", config)
+            network[:_auto_config] = true if config[:auto_config]
+            networks << network
           end
 
           if !adapters.empty?
@@ -68,9 +65,11 @@ module Vagrant
             # Determine the interface numbers for the guest.
             assign_interface_numbers(networks, adapters)
 
-            # Configure all the network interfaces on the guest.
+            # Configure all the network interfaces on the guest. We only
+            # want to configure the networks that have `auto_config` setup.
+            networks_to_configure = networks.select { |n| n[:_auto_config] }
             env[:ui].info I18n.t("vagrant.actions.vm.network.configuring")
-            env[:vm].guest.configure_networks(networks)
+            env[:vm].guest.configure_networks(networks_to_configure)
           end
         end
 
@@ -253,7 +252,8 @@ module Vagrant
             :adapter     => config[:adapter],
             :type        => :hostonly,
             :hostonly    => interface[:name],
-            :mac_address => config[:mac]
+            :mac_address => config[:mac],
+            :nic_type    => config[:nic_type]
           }
         end
 
@@ -309,6 +309,7 @@ module Vagrant
 
         def bridged_config(args)
           options = args[0] || {}
+          options = {} if !options.is_a?(Hash)
 
           return {
             :adapter => nil,

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

@@ -1,3 +1,4 @@
+require 'digest/md5'
 require 'fileutils'
 require 'pathname'
 
@@ -93,6 +94,12 @@ module Vagrant
             opts[:map_gid] = prepare_permission(:gid, opts)
             opts[:nfs_version] ||= 3
 
+            # The poor man's UUID. An MD5 hash here is sufficient since
+            # we need a 32 character "uuid" to represent the filesystem
+            # of an export. Hashing the host path is safe because two of
+            # the same host path will hash to the same fsid.
+            opts[:uuid]    = Digest::MD5.hexdigest(opts[:hostpath])
+
             acc[key] = opts
             acc
           end

data/lib/vagrant/command.rb

@@ -8,6 +8,7 @@ module Vagrant
     autoload :BoxRepackage, 'vagrant/command/box_repackage'
     autoload :BoxList,      'vagrant/command/box_list'
     autoload :Destroy,      'vagrant/command/destroy'
+    autoload :Gem,          'vagrant/command/gem'
     autoload :Halt,         'vagrant/command/halt'
     autoload :Init,         'vagrant/command/init'
     autoload :Package,      'vagrant/command/package'

data/lib/vagrant/command/base.rb

@@ -60,10 +60,13 @@ module Vagrant
       # @param [String] name The name of the VM. Nil if every VM.
       # @param [Boolean] single_target If true, then an exception will be
       #   raised if more than one target is found.
-      def with_target_vms(name=nil, single_target=false)
+      def with_target_vms(name=nil, options=nil)
         # Using VMs requires a Vagrant environment to be properly setup
         raise Errors::NoEnvironmentError if !@env.root_path
 
+        # Setup the options hash
+        options ||= {}
+
         # First determine the proper array of VMs.
         vms = []
         if name
@@ -89,7 +92,10 @@ module Vagrant
         end
 
         # Make sure we're only working with one VM if single target
-        raise Errors::MultiVMTargetRequired if single_target && vms.length != 1
+        raise Errors::MultiVMTargetRequired if options[:single_target] && vms.length != 1
+
+        # If we asked for reversed ordering, then reverse it
+        vms.reverse! if options[:reverse]
 
         # Go through each VM and yield it!
         vms.each do |old_vm|

data/lib/vagrant/command/destroy.rb

@@ -4,8 +4,15 @@ module Vagrant
   module Command
     class Destroy < Base
       def execute
+        options = {}
+
         opts = OptionParser.new do |opts|
           opts.banner = "Usage: vagrant destroy [vm-name]"
+          opts.separator ""
+
+          opts.on("-f", "--force", "Destroy without confirmation.") do |f|
+            options[:force] = f
+          end
         end
 
         # Parse the options
@@ -13,10 +20,29 @@ module Vagrant
         return if !argv
 
         @logger.debug("'Destroy' each target VM...")
-        with_target_vms(argv[0]) do |vm|
+        with_target_vms(argv[0], :reverse => true) do |vm|
           if vm.created?
-            @logger.info("Destroying: #{vm.name}")
-            vm.destroy
+            # Boolean whether we should actually go through with the destroy
+            # or not. This is true only if the "--force" flag is set or if the
+            # user confirms it.
+            do_destroy = false
+
+            if options[:force]
+              do_destroy = true
+            else
+              choice = @env.ui.ask(I18n.t("vagrant.commands.destroy.confirmation",
+                                          :name => vm.name))
+              do_destroy = choice.upcase == "Y"
+            end
+
+            if do_destroy
+              @logger.info("Destroying: #{vm.name}")
+              vm.destroy
+            else
+              @logger.info("Not destroying #{vm.name} since confirmation was declined.")
+              @env.ui.success(I18n.t("vagrant.commands.destroy.will_not_destroy",
+                                     :name => vm.name), :prefix => false)
+            end
           else
             @logger.info("Not destroying #{vm.name}, since it isn't created.")
             vm.ui.info I18n.t("vagrant.commands.common.vm_not_created")

data/lib/vagrant/command/gem.rb

@@ -0,0 +1,35 @@
+require "rubygems"
+require "rubygems/gem_runner"
+
+module Vagrant
+  module Command
+    class Gem < Base
+      def execute
+        # Bundler sets up its own custom gem load paths such that our
+        # own gems are never loaded. Therefore, give an error if a user
+        # tries to install gems while within a Bundler-managed environment.
+        if defined?(Bundler)
+          require 'bundler/shared_helpers'
+          if Bundler::SharedHelpers.in_bundle?
+            raise Errors::GemCommandInBundler
+          end
+        end
+
+        # If the user needs some help, we add our own little message at the
+        # top so that they're aware of what `vagrant gem` is doing, really.
+        if @argv.empty? || @argv.include?("-h") || @argv.include?("--help")
+          @env.ui.info(I18n.t("vagrant.commands.gem.help_preamble"),
+                       :prefix => false)
+          puts
+        end
+
+        # We just proxy the arguments onto a real RubyGems command
+        # but change `GEM_HOME` so that the gems are installed into
+        # our own private gem folder.
+        ENV["GEM_HOME"] = @env.gems_path.to_s
+        ::Gem.clear_paths
+        ::Gem::GemRunner.new.run(@argv.dup)
+      end
+    end
+  end
+end