vagrantup 0.9.7 → 0.9.99.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d7e8f9a0b6d47c68c8cfb4192bd3afa8d9d2ce
-  data.tar.gz: a8865e244a54fc4dcd14b54a27c87ad0740df019
+  metadata.gz: 2e96062b6fdca98e03dead5bc15cb7bee039c360
+  data.tar.gz: d22414b06f0fa20c534f940c7749420a458ac736
 SHA512:
-  metadata.gz: 1bbd300b908863fc8a714108f1e9d11a29cbde5d9cd0ffe2be1b8e669fde5222fde1a35b05ba412ce7b3627aa3f979fcd31b1fa5b9b8a200705a1599886562cb
-  data.tar.gz: 7c2c4860f428ffecca43814ff4929a6b2019cc89eba5fc6b4f14da7025513ba81af1a83c00fe80a332d491fea287ffe3575970ec7ab29bbe5a361ca38779de60
+  metadata.gz: 205eb4b0eb766e9ca4487bbe2e1ef1bdf7ff86e74e780244b94a057b512aba5061023e689bf43e1fdbb72a4e2a8f62d66bc37052a882a33621c67d32159b1d8e
+  data.tar.gz: 5316a1d824364e938bd798d082de4d3bd42c97afe66518d1957580f2f511f58f4df7f9235f9fb6488e618ad4f60b45f353c3d369bed913a92e12776219a4b348

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.0.0 (unreleased)
+
+  - `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]
+
 ## 0.9.7 (February 9, 2012)
 
   - Fix regression where all subprocess IO simply didn't work with

data/lib/vagrant.rb

@@ -50,6 +50,9 @@ require 'i18n'
 # there are issues with ciphers not being properly loaded.
 require 'openssl'
 
+# Always make the version available
+require 'vagrant/version'
+
 module Vagrant
   autoload :Action,        'vagrant/action'
   autoload :Box,           'vagrant/box'
@@ -136,6 +139,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 }
@@ -186,7 +190,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/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/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/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
@@ -15,8 +22,27 @@ module Vagrant
         @logger.debug("'Destroy' each target VM...")
         with_target_vms(argv[0]) 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

data/lib/vagrant/driver/virtualbox_4_0.rb

@@ -23,7 +23,8 @@ module Vagrant
       end
 
       def clear_shared_folders
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           if line =~ /^SharedFolderNameMachineMapping\d+="(.+?)"$/
             execute("sharedfolder", "remove", @uuid, "--name", $1.to_s)
           end
@@ -70,8 +71,9 @@ module Vagrant
 
         execute("list", "vms").split("\n").each do |line|
           if line =~ /^".+?"\s+\{(.+?)\}$/
-            execute("showvminfo", $1.to_s, "--machinereadable").split("\n").each do |info|
-              if info =~ /^hostonlyadapter\d+="(.+?)"$/
+            info = execute("showvminfo", $1.to_s, "--machinereadable", :retryable => true)
+            info.split("\n").each do |line|
+              if line =~ /^hostonlyadapter\d+="(.+?)"$/
                 networks.delete($1.to_s)
               end
             end
@@ -202,7 +204,8 @@ module Vagrant
 
         results = []
         current_nic = nil
-        execute("showvminfo", uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           # This is how we find the nic that a FP is attached to,
           # since this comes first.
           current_nic = $1.to_i if line =~ /^nic(\d+)=".+?"$/
@@ -246,7 +249,8 @@ module Vagrant
       end
 
       def read_guest_additions_version
-        output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version")
+        output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version",
+                         :retryable => true)
         if output =~ /^Value: (.+?)$/
           # Split the version by _ since some distro versions modify it
           # to look like this: 4.1.2_ubuntu, and the distro part isn't
@@ -260,7 +264,7 @@ module Vagrant
 
       def read_host_only_interfaces
         dhcp = {}
-        execute("list", "dhcpservers").split("\n\n").each do |block|
+        execute("list", "dhcpservers", :retryable => true).split("\n\n").each do |block|
           info = {}
 
           block.split("\n").each do |line|
@@ -279,7 +283,7 @@ module Vagrant
           dhcp[info[:network]] = info
         end
 
-        execute("list", "hostonlyifs").split("\n\n").collect do |block|
+        execute("list", "hostonlyifs", :retryable => true).split("\n\n").collect do |block|
           info = {}
 
           block.split("\n").each do |line|
@@ -302,7 +306,8 @@ module Vagrant
       end
 
       def read_mac_address
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           return $1.to_s if line =~ /^macaddress1="(.+?)"$/
         end
 
@@ -310,7 +315,7 @@ module Vagrant
       end
 
       def read_machine_folder
-        execute("list", "systemproperties").split("\n").each do |line|
+        execute("list", "systemproperties", :retryable => true).split("\n").each do |line|
           if line =~ /^Default machine folder:\s+(.+?)$/i
             return $1.to_s
           end
@@ -321,7 +326,8 @@ module Vagrant
 
       def read_network_interfaces
         nics = {}
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           if line =~ /^nic(\d+)="(.+?)"$/
             adapter = $1.to_i
             type    = $2.to_sym
@@ -347,7 +353,7 @@ module Vagrant
       end
 
       def read_state
-        output = execute("showvminfo", @uuid, "--machinereadable")
+        output = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
         if output =~ /^name="<inaccessible>"$/
           return :inaccessible
         elsif output =~ /^VMState="(.+?)"$/
@@ -359,7 +365,7 @@ module Vagrant
 
       def read_used_ports
         ports = []
-        execute("list", "vms").split("\n").each do |line|
+        execute("list", "vms", :retryable => true).split("\n").each do |line|
           if line =~ /^".+?" \{(.+?)\}$/
             uuid = $1.to_s
 
@@ -377,7 +383,7 @@ module Vagrant
 
       def read_vms
         results = []
-        execute("list", "vms").split("\n").each do |line|
+        execute("list", "vms", :retryable => true).split("\n").each do |line|
           if line =~ /^".+?" \{(.+?)\}$/
             results << $1.to_s
           end
@@ -417,7 +423,17 @@ module Vagrant
       end
 
       def start(mode)
-        execute("startvm", @uuid, "--type", mode.to_s)
+        command = ["startvm", @uuid, "--type", mode.to_s]
+        r = raw(*command)
+
+        if r.exit_code == 0 || r.stdout =~ /VM ".+?" has been successfully started/
+          # Some systems return an exit code 1 for some reason. For that
+          # we depend on the output.
+          return true
+        end
+
+        # If we reached this point then it didn't work out.
+        raise Errors::VBoxManageError, :command => command.inspect
       end
 
       def suspend

data/lib/vagrant/driver/virtualbox_4_1.rb

@@ -23,7 +23,8 @@ module Vagrant
       end
 
       def clear_shared_folders
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           if line =~ /^SharedFolderNameMachineMapping\d+="(.+?)"$/
             execute("sharedfolder", "remove", @uuid, "--name", $1.to_s)
           end
@@ -70,8 +71,9 @@ module Vagrant
 
         execute("list", "vms").split("\n").each do |line|
           if line =~ /^".+?"\s+\{(.+?)\}$/
-            execute("showvminfo", $1.to_s, "--machinereadable").split("\n").each do |info|
-              if info =~ /^hostonlyadapter\d+="(.+?)"$/
+            info = execute("showvminfo", $1.to_s, "--machinereadable", :retryable => true)
+            info.split("\n").each do |line|
+              if line =~ /^hostonlyadapter\d+="(.+?)"$/
                 networks.delete($1.to_s)
               end
             end
@@ -202,7 +204,8 @@ module Vagrant
 
         results = []
         current_nic = nil
-        execute("showvminfo", uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           # This is how we find the nic that a FP is attached to,
           # since this comes first.
           current_nic = $1.to_i if line =~ /^nic(\d+)=".+?"$/
@@ -246,7 +249,8 @@ module Vagrant
       end
 
       def read_guest_additions_version
-        output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version")
+        output = execute("guestproperty", "get", @uuid, "/VirtualBox/GuestAdd/Version",
+                         :retryable => true)
         if output =~ /^Value: (.+?)$/
           # Split the version by _ since some distro versions modify it
           # to look like this: 4.1.2_ubuntu, and the distro part isn't
@@ -260,7 +264,7 @@ module Vagrant
 
       def read_host_only_interfaces
         dhcp = {}
-        execute("list", "dhcpservers").split("\n\n").each do |block|
+        execute("list", "dhcpservers", :retryable => true).split("\n\n").each do |block|
           info = {}
 
           block.split("\n").each do |line|
@@ -279,7 +283,7 @@ module Vagrant
           dhcp[info[:network]] = info
         end
 
-        execute("list", "hostonlyifs").split("\n\n").collect do |block|
+        execute("list", "hostonlyifs", :retryable => true).split("\n\n").collect do |block|
           info = {}
 
           block.split("\n").each do |line|
@@ -302,7 +306,8 @@ module Vagrant
       end
 
       def read_mac_address
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           return $1.to_s if line =~ /^macaddress1="(.+?)"$/
         end
 
@@ -310,7 +315,7 @@ module Vagrant
       end
 
       def read_machine_folder
-        execute("list", "systemproperties").split("\n").each do |line|
+        execute("list", "systemproperties", :retryable => true).split("\n").each do |line|
           if line =~ /^Default machine folder:\s+(.+?)$/i
             return $1.to_s
           end
@@ -321,7 +326,8 @@ module Vagrant
 
       def read_network_interfaces
         nics = {}
-        execute("showvminfo", @uuid, "--machinereadable").split("\n").each do |line|
+        info = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
+        info.split("\n").each do |line|
           if line =~ /^nic(\d+)="(.+?)"$/
             adapter = $1.to_i
             type    = $2.to_sym
@@ -347,7 +353,7 @@ module Vagrant
       end
 
       def read_state
-        output = execute("showvminfo", @uuid, "--machinereadable")
+        output = execute("showvminfo", @uuid, "--machinereadable", :retryable => true)
         if output =~ /^name="<inaccessible>"$/
           return :inaccessible
         elsif output =~ /^VMState="(.+?)"$/
@@ -359,7 +365,7 @@ module Vagrant
 
       def read_used_ports
         ports = []
-        execute("list", "vms").split("\n").each do |line|
+        execute("list", "vms", :retryable => true).split("\n").each do |line|
           if line =~ /^".+?" \{(.+?)\}$/
             uuid = $1.to_s
 
@@ -377,7 +383,7 @@ module Vagrant
 
       def read_vms
         results = []
-        execute("list", "vms").split("\n").each do |line|
+        execute("list", "vms", :retryable => true).split("\n").each do |line|
           if line =~ /^".+?" \{(.+?)\}$/
             results << $1.to_s
           end
@@ -417,7 +423,17 @@ module Vagrant
       end
 
       def start(mode)
-        execute("startvm", @uuid, "--type", mode.to_s)
+        command = ["startvm", @uuid, "--type", mode.to_s]
+        r = raw(*command)
+
+        if r.exit_code == 0 || r.stdout =~ /VM ".+?" has been successfully started/
+          # Some systems return an exit code 1 for some reason. For that
+          # we depend on the output.
+          return true
+        end
+
+        # If we reached this point then it didn't work out.
+        raise Errors::VBoxManageError, :command => command.inspect
       end
 
       def suspend

data/lib/vagrant/driver/virtualbox_base.rb

@@ -2,6 +2,7 @@ require 'log4r'
 
 require 'vagrant/util/busy'
 require 'vagrant/util/platform'
+require 'vagrant/util/retryable'
 require 'vagrant/util/subprocess'
 
 module Vagrant
@@ -13,6 +14,7 @@ module Vagrant
     class VirtualBoxBase
       # Include this so we can use `Subprocess` more easily.
       include Vagrant::Util
+      include Vagrant::Util::Retryable
 
       def initialize
         @logger = Log4r::Logger.new("vagrant::driver::virtualbox_base")
@@ -245,28 +247,38 @@ module Vagrant
       def vm_exists?(uuid)
       end
 
-      protected
-
       # Execute the given subcommand for VBoxManage and return the output.
       def execute(*command, &block)
-        # Execute the command
-        r = raw(*command, &block)
-
-        # If the command was a failure, then raise an exception that is
-        # nicely handled by Vagrant.
-        if r.exit_code != 0
-          if @interrupted
-            @logger.info("Exit code != 0, but interrupted. Ignoring.")
+        # Get the options hash if it exists
+        opts = {}
+        opts = command.pop if command.last.is_a?(Hash)
+
+        tries = 0
+        tries = 3 if opts[:retryable]
+
+        # Variable to store our execution result
+        r = nil
+
+        retryable(:on => Errors::VBoxManageError, :tries => tries, :sleep => 1) do
+          # Execute the command
+          r = raw(*command, &block)
+
+          # If the command was a failure, then raise an exception that is
+          # nicely handled by Vagrant.
+          if r.exit_code != 0
+            if @interrupted
+              @logger.info("Exit code != 0, but interrupted. Ignoring.")
+            else
+              raise Errors::VBoxManageError, :command => command.inspect
+            end
           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
+            # 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
         end
 

data/lib/vagrant/environment.rb

@@ -11,7 +11,7 @@ module Vagrant
   # defined as basically a folder with a "Vagrantfile." This class allows
   # access to the VMs, CLI, etc. all in the scope of this environment.
   class Environment
-    HOME_SUBDIRS = ["tmp", "boxes"]
+    HOME_SUBDIRS = ["tmp", "boxes", "gems"]
     DEFAULT_VM = :default
     DEFAULT_HOME = "~/.vagrant.d"
 
@@ -34,6 +34,9 @@ module Vagrant
     # The directory where boxes are stored.
     attr_reader :boxes_path
 
+    # The path where the plugins are stored (gems)
+    attr_reader :gems_path
+
     # The path to the default private key
     attr_reader :default_private_key_path
 
@@ -80,10 +83,14 @@ module Vagrant
       setup_home_path
       @tmp_path = @home_path.join("tmp")
       @boxes_path = @home_path.join("boxes")
+      @gems_path  = @home_path.join("gems")
 
       # Setup the default private key
       @default_private_key_path = @home_path.join("insecure_private_key")
       copy_insecure_private_key
+
+      # Load the plugins
+      load_plugins
     end
 
     #---------------------------------------------------------------
@@ -490,5 +497,17 @@ module Vagrant
 
       nil
     end
+
+    # Loads the Vagrant plugins by properly setting up RubyGems so that
+    # our private gem repository is on the path.
+    def load_plugins
+      # Add our private gem path to the gem path and reset the paths
+      # that Rubygems knows about.
+      ENV["GEM_PATH"] = "#{@gems_path}:#{ENV["GEM_PATH"]}"
+      ::Gem.clear_paths
+
+      # Load the plugins
+      Plugin.load!
+    end
   end
 end

data/lib/vagrant/errors.rb

@@ -173,6 +173,11 @@ module Vagrant
       error_key(:environment_locked)
     end
 
+    class GemCommandInBundler < VagrantError
+      status_code(71)
+      error_key(:gem_command_in_bundler)
+    end
+
     class HomeDirectoryMigrationFailed < VagrantError
       status_code(53)
       error_key(:home_dir_migration_failed)
@@ -258,6 +263,11 @@ module Vagrant
       error_key(:include_file_missing, "vagrant.actions.general.package")
     end
 
+    class PackageOutputDirectory < VagrantError
+      status_code(72)
+      error_key(:output_is_directory, "vagrant.actions.general.package")
+    end
+
     class PackageOutputExists < VagrantError
       status_code(16)
       error_key(:output_exists, "vagrant.actions.general.package")

data/lib/vagrant/guest/arch.rb

@@ -1,9 +1,14 @@
 require 'set'
 require 'tempfile'
 
+require 'vagrant/util/template_renderer'
+
 module Vagrant
   module Guest
     class Arch < Linux
+      # Make the TemplateRenderer top-level
+      include Vagrant::Util
+
       def change_host_name(name)
         # Only do this if the hostname is not already set
         if !vm.channel.test("sudo hostname | grep '#{name}'")
@@ -23,13 +28,16 @@ module Vagrant
         entries = []
         networks.each do |network|
           interfaces.add(network[:interface])
-          entries << TemplateRenderer.render("guests/arch/network_#{network[:type]}",
-                                             :options => network)
+          entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}",
+                                          :options => network)
+
+          entries << entry
         end
 
         # Perform the careful dance necessary to reconfigure
         # the network interfaces
         temp = Tempfile.new("vagrant")
+        temp.binmode
         temp.write(entries.join("\n"))
         temp.close
 

data/lib/vagrant/guest/base.rb

@@ -81,7 +81,7 @@ module Vagrant
       #
       # {
       #   :type      => :static,
-      #   :ip        => "33.33.33.10",
+      #   :ip        => "192.168.33.10",
       #   :netmask   => "255.255.255.0",
       #   :interface => 1
       # }

data/lib/vagrant/guest/debian.rb

@@ -22,13 +22,16 @@ module Vagrant
         entries = []
         networks.each do |network|
           interfaces.add(network[:interface])
-          entries << TemplateRenderer.render("guests/debian/network_#{network[:type]}",
-                                             :options => network)
+          entry = TemplateRenderer.render("guests/debian/network_#{network[:type]}",
+                                          :options => network)
+
+          entries << entry
         end
 
         # Perform the careful dance necessary to reconfigure
         # the network interfaces
         temp = Tempfile.new("vagrant")
+        temp.binmode
         temp.write(entries.join("\n"))
         temp.close
 

data/lib/vagrant/guest/gentoo.rb

@@ -1,8 +1,13 @@
 require 'tempfile'
 
+require 'vagrant/util/template_renderer'
+
 module Vagrant
   module Guest
     class Gentoo < Linux
+      # Make the TemplateRenderer top-level
+      include Vagrant::Util
+
       def configure_networks(networks)
         # Remove any previous host only network additions to the interface file
         vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/conf.d/net > /tmp/vagrant-network-interfaces")
@@ -15,6 +20,7 @@ module Vagrant
 
           # Upload the entry to a temporary location
           temp = Tempfile.new("vagrant")
+          temp.binmode
           temp.write(entry)
           temp.close
 

data/lib/vagrant/guest/redhat.rb

@@ -29,6 +29,7 @@ module Vagrant
                                           :options => network)
 
           temp = Tempfile.new("vagrant")
+          temp.binmode
           temp.write(entry)
           temp.close
 

data/lib/vagrant/guest/ubuntu.rb

@@ -8,7 +8,7 @@ module Vagrant
         super
 
         # Emit an upstart event if upstart is available
-        @vm.channel.sudo("[ -x /sbin/initctl ] && /sbin/initctl emit vagrant-mounted MOUNTPOINT=#{guestpath}")
+        vm.channel.sudo("[ -x /sbin/initctl ] && /sbin/initctl emit vagrant-mounted MOUNTPOINT=#{guestpath}")
       end
 
       def change_host_name(name)

data/lib/vagrant/plugin.rb

@@ -1,5 +1,7 @@
 require "rubygems"
 
+require "log4r"
+
 module Vagrant
   # Represents a single plugin and also manages loading plugins from
   # RubyGems. If a plugin has a `vagrant_init.rb` file somewhere on its
@@ -7,20 +9,17 @@ module Vagrant
   # (for debugging), the list of loaded plugins is stored in the {plugins}
   # array.
   class Plugin
-    # The array of loaded plugins.
+    # The array of gem specifications that were loaded as plugins.
     @@plugins = []
 
-    # The gemspec of this plugin. This is an actual gemspec object.
-    attr_reader :gemspec
-
-    # The path to the `vagrant_init.rb` file which was loaded for this plugin.
-    attr_reader :file
-
     # Loads all the plugins for Vagrant. Plugins are currently
     # gems which have a "vagrant_init.rb" somewhere on their
     # load path. This file is loaded to kick off the load sequence
     # for that plugin.
     def self.load!
+      logger = Log4r::Logger.new("vagrant::plugin")
+      logger.info("Searching and loading any available plugins...")
+
       # Our version is used for checking dependencies
       our_version = Gem::Version.create(Vagrant::VERSION)
 
@@ -41,10 +40,18 @@ module Vagrant
         specs = Gem::VERSION >= "1.6.0" ? source.latest_specs(true) : source.latest_specs
 
         specs.each do |spec|
+          if @@plugins.include?(spec)
+            logger.debug("Plugin already loaded, not loading again: #{spec.name}")
+            next
+          end
+
           # If this gem depends on Vagrant, verify this is a valid release of
           # Vagrant for this gem to load into.
           vagrant_dep = spec.dependencies.find { |d| d.name == "vagrant" }
-          next if vagrant_dep && !vagrant_dep.requirement.satisfied_by?(our_version)
+          if vagrant_dep && !vagrant_dep.requirement.satisfied_by?(our_version)
+            logger.debug("Plugin Vagrant dependency mismatch: #{spec.name} (#{spec.version})")
+            next
+          end
 
           # Find a vagrant_init.rb to verify if this is a plugin
           file = nil
@@ -55,8 +62,13 @@ module Vagrant
           end
 
           next if !file
-          @@plugins << new(spec, file)
+
+          logger.info("Loading plugin: #{spec.name} (#{spec.version})")
+          @@plugins << spec
+          load file
         end
+
+        logger.info("Loaded #{@@plugins.length} plugins.")
       end
     end
 
@@ -65,15 +77,5 @@ module Vagrant
     #
     # @return [Array]
     def self.plugins; @@plugins; end
-
-    # Initializes a new plugin, given a Gemspec and the path to the
-    # gem's `vagrant_init.rb` file. This should never be called manually.
-    # Instead {load!} creates all the instances.
-    def initialize(spec, file)
-      @gemspec = spec
-      @file = file
-
-      load file
-    end
   end
 end

data/lib/vagrant/provisioners/puppet.rb

@@ -14,12 +14,10 @@ module Vagrant
         attr_accessor :pp_path
         attr_accessor :options
 
-        def initialize
-          @manifest_file = "default.pp"
-          @manifests_path = "manifests"
-          @pp_path = "/tmp/vagrant-puppet"
-          @options = []
-        end
+        def manifest_file; @manifest_file || "default.pp"; end
+        def manifests_path; @manifests_path || "manifests"; end
+        def pp_path; @pp_path || "/tmp/vagrant-puppet"; end
+        def options; @options ||= []; end
 
         # Returns the manifests path expanded relative to the root path of the
         # environment.

data/lib/vagrant/util/line_ending_helpers.rb

@@ -0,0 +1,14 @@
+module Vagrant
+  module Util
+    module LineEndingHelpers
+      # Converts line endings to unix-style line endings in the
+      # given string.
+      #
+      # @param [String] string Original string
+      # @return [String] The fixed string
+      def dos_to_unix(string)
+        string.gsub("\r\n", "\n")
+      end
+    end
+  end
+end

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.7"
+  VERSION = "0.9.99.1"
 end

data/templates/commands/init/Vagrantfile.erb

@@ -20,7 +20,7 @@ Vagrant::Config.run do |config|
   # via the IP. Host-only networks can talk to the host machine as well as
   # any other machines on the same network, but cannot be accessed (through this
   # network interface) by any external networks.
-  # config.vm.network :hostonly, "33.33.33.10"
+  # config.vm.network :hostonly, "192.168.33.10"
 
   # Assign this VM to a bridged network, allowing you to connect directly to a
   # network using the host's network device. This makes the VM appear as another

data/templates/locales/en.yml

@@ -47,6 +47,12 @@ en:
         may run at any given time to avoid problems with VirtualBox inconsistencies
         occurring. Please wait for the other instance of Vagrant to end and then
         try again.
+      gem_command_in_bundler: |-
+        You cannot run the `vagrant gem` command while in a bundler environment.
+        Bundler messes around quite a bit with the RubyGem load paths and gems
+        installed via `vagrant gem` are excluded by Bundler.
+
+        Instead, please include your Vagrant plugins in your Gemfile itself.
       guest:
         invalid_class: |-
           The specified guest class does not inherit from `Vagrant::Guest::Base`.
@@ -225,6 +231,18 @@ en:
         vm_not_running: "VM is not currently running. Please bring it up to run this command."
       box:
         no_installed_boxes: "There are no installed boxes! Use `vagrant box add` to add some."
+      destroy:
+        confirmation: "Are you sure you want to destroy the '%{name}' VM? [Y/N] "
+        will_not_destroy: |-
+          The VM '%{name}' will not be destroyed, since the confirmation
+          was declined.
+      gem:
+        help_preamble: |-
+          `vagrant gem` is used to install Vagrant plugins via the RubyGems
+          system. In fact, `vagrant gem` is just a frontend to the actual `gem`
+          interface, with the difference being that Vagrant sets up a custom
+          directory where gems are installed so that they are isolated from your
+          system gems.
       init:
         success: |-
           A `Vagrantfile` has been placed in this directory. You are now
@@ -522,6 +540,9 @@ en:
           output_exists: |-
             The specified file to save the package as already exists. Please
             remove this file or specify a different file name for outputting.
+          output_is_directory: |-
+            The specified output is a directory. Please specify a path including
+            a filename.
           requires_directory: |-
             A directory was not specified to package. This should never happen
             and is a result of an internal inconsistency.

data/test/acceptance/networking/host_only_test.rb

@@ -26,12 +26,12 @@ describe "vagrant host only networking" do
       f.puts(<<VFILE)
 Vagrant::Config.run do |config|
   config.vm.box = "base"
-  config.vm.network :hostonly, "33.33.33.10"
+  config.vm.network :hostonly, "192.168.33.10"
 end
 VFILE
     end
 
     assert_execute("vagrant", "up")
-    assert_host_to_vm_network("http://33.33.33.10:8000/", 8000)
+    assert_host_to_vm_network("http://192.168.33.10:8000/", 8000)
   end
 end

data/test/unit/vagrant/config/vm_test.rb

@@ -34,15 +34,15 @@ describe Vagrant::Config::VMConfig do
 
   it "merges by appending networks" do
     a = described_class.new
-    a.network :hostonly, "33.33.33.10"
+    a.network :hostonly, "192.168.33.10"
 
     b = described_class.new
-    b.network :hostonly, "33.33.33.11"
+    b.network :hostonly, "192.168.33.11"
 
     c = a.merge(b)
     c.networks.length.should == 2
-    c.networks[0].should == [:hostonly, ["33.33.33.10"]]
-    c.networks[1].should == [:hostonly, ["33.33.33.11"]]
+    c.networks[0].should == [:hostonly, ["192.168.33.10"]]
+    c.networks[1].should == [:hostonly, ["192.168.33.11"]]
   end
 
   it "merges by appending provisioners" do

data/test/unit/vagrant/util/line_endings_helper_test.rb

@@ -0,0 +1,16 @@
+require File.expand_path("../../../base", __FILE__)
+
+require "vagrant/util/line_ending_helpers"
+
+describe Vagrant::Util::LineEndingHelpers do
+  let(:klass) do
+    Class.new do
+      extend Vagrant::Util::LineEndingHelpers
+    end
+  end
+
+  it "should convert DOS to unix-style line endings" do
+    klass.dos_to_unix("foo\r\nbar\r\n").should == "foo\nbar\n"
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrantup
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.99.1
 platform: ruby
 authors:
 - Mitchell Hashimoto
@@ -303,6 +303,7 @@ files:
 - lib/vagrant/command/box_remove.rb
 - lib/vagrant/command/box_repackage.rb
 - lib/vagrant/command/destroy.rb
+- lib/vagrant/command/gem.rb
 - lib/vagrant/command/halt.rb
 - lib/vagrant/command/init.rb
 - lib/vagrant/command/package.rb
@@ -384,6 +385,7 @@ files:
 - lib/vagrant/util/file_checksum.rb
 - lib/vagrant/util/file_mode.rb
 - lib/vagrant/util/hash_with_indifferent_access.rb
+- lib/vagrant/util/line_ending_helpers.rb
 - lib/vagrant/util/network_ip.rb
 - lib/vagrant/util/platform.rb
 - lib/vagrant/util/retryable.rb
@@ -542,6 +544,7 @@ files:
 - test/unit/vagrant/util/ansi_escape_code_remover_test.rb
 - test/unit/vagrant/util/file_checksum_test.rb
 - test/unit/vagrant/util/hash_with_indifferent_access_test.rb
+- test/unit/vagrant/util/line_endings_helper_test.rb
 - test/unit/vagrant/util/network_ip_test.rb
 - test/unit/vagrant/util/retryable_test.rb
 - test/unit/vagrant_test.rb