vagrant 0.9.7 → 1.0.0

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")
@@ -232,6 +234,12 @@ module Vagrant
       def suspend
       end
 
+      # Verifies that the driver is ready to accept work.
+      #
+      # This should raise a VagrantError if things are not ready.
+      def verify!
+      end
+
       # Verifies that an image can be imported properly.
       #
       # @param [String] path Path to an OVF file.
@@ -245,28 +253,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
 
     #---------------------------------------------------------------
@@ -131,7 +138,7 @@ module Vagrant
     def primary_vm
       return vms.values.first if !multivm?
 
-      config.vm.defined_vms.each do |name, subvm|
+      config.global.vm.defined_vms.each do |name, subvm|
         return vms[name] if subvm.options[:primary]
       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.rb

@@ -5,6 +5,7 @@ module Vagrant
     # Specific guests
     autoload :Arch,    'vagrant/guest/arch'
     autoload :Debian,  'vagrant/guest/debian'
+    autoload :Fedora,  'vagrant/guest/fedora'
     autoload :FreeBSD, 'vagrant/guest/freebsd'
     autoload :Gentoo,  'vagrant/guest/gentoo'
     autoload :Linux,   'vagrant/guest/linux'

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/fedora.rb

@@ -0,0 +1,66 @@
+require 'set'
+require 'tempfile'
+
+require 'vagrant/util/template_renderer'
+
+module Vagrant
+  module Guest
+    class Fedora < Linux
+      # Make the TemplateRenderer top-level
+      include Vagrant::Util
+
+      def configure_networks(networks)
+        # Accumulate the configurations to add to the interfaces file as well
+        # as what interfaces we're actually configuring since we use that later.
+        interfaces = Set.new
+        networks.each do |network|
+          interfaces.add(network[:interface])
+
+          # Remove any previous vagrant configuration in this network
+          # interface's configuration files.
+          vm.channel.sudo("touch #{network_scripts_dir}/ifcfg-p7p#{network[:interface]}")
+          vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-p7p#{network[:interface]} > /tmp/vagrant-ifcfg-p7p#{network[:interface]}")
+          vm.channel.sudo("cat /tmp/vagrant-ifcfg-p7p#{network[:interface]} > #{network_scripts_dir}/ifcfg-p7p#{network[:interface]}")
+
+          # Render and upload the network entry file to a deterministic
+          # temporary location.
+          entry = TemplateRenderer.render("guests/fedora/network_#{network[:type]}",
+                                          :options => network)
+
+          temp = Tempfile.new("vagrant")
+          temp.binmode
+          temp.write(entry)
+          temp.close
+
+          vm.channel.upload(temp.path, "/tmp/vagrant-network-entry_#{network[:interface]}")
+        end
+
+        # Bring down all the interfaces we're reconfiguring. By bringing down
+        # each specifically, we avoid reconfiguring p7p (the NAT interface) so
+        # SSH never dies.
+        interfaces.each do |interface|
+          vm.channel.sudo("/sbin/ifdown p7p#{interface} 2> /dev/null", :error_check => false)
+          vm.channel.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-p7p#{interface}")
+          vm.channel.sudo("/sbin/ifup p7p#{interface} 2> /dev/null")
+        end
+      end
+
+      # The path to the directory with the network configuration scripts.
+      # This is pulled out into its own directory since there are other
+      # operating systems (SuSE) which behave similarly but with a different
+      # path to the network scripts.
+      def network_scripts_dir
+        '/etc/sysconfig/network-scripts'
+      end
+
+      def change_host_name(name)
+        # Only do this if the hostname is not already set
+        if !vm.channel.test("sudo hostname | grep '#{name}'")
+          vm.channel.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network")
+          vm.channel.sudo("hostname #{name}")
+          vm.channel.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+        end
+      end
+    end
+  end
+end

data/lib/vagrant/guest/freebsd.rb

@@ -1,3 +1,5 @@
+require 'vagrant/util/template_renderer'
+
 module Vagrant
   module Guest
     # A general Vagrant system implementation for "freebsd".
@@ -57,19 +59,28 @@ module Vagrant
       end
 
       def configure_networks(networks)
-        # Remove any previous host only network additions to the
-        # interface file.
-        vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN-HOSTONLY/,/^#VAGRANT-END-HOSTONLY/ d' /etc/rc.conf > /tmp/rc.conf")
-        vm.channel.sudo("mv /tmp/rc.conf /etc/rc.conf")
+        # Remove any previous network additions to the configuration file.
+        vm.channel.sudo("sed -i '' -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.conf")
 
         networks.each do |network|
-          entry = "#VAGRANT-BEGIN-HOSTONLY\nifconfig_em#{network[:interface]}=\"inet #{network[:ip]} netmask #{network[:netmask]}\"\n#VAGRANT-END-HOSTONLY\n"
+          entry = TemplateRenderer.render("guests/freebsd/network_#{network[:type]}",
+                                          :options => network)
           vm.channel.upload(StringIO.new(entry), "/tmp/vagrant-network-entry")
-
           vm.channel.sudo("su -m root -c 'cat /tmp/vagrant-network-entry >> /etc/rc.conf'")
-          vm.channel.sudo("ifconfig em#{network[:interface]} inet #{network[:ip]} netmask #{network[:netmask]}")
+          if network[:type].to_sym == :static
+            vm.channel.sudo("ifconfig em#{network[:interface]} inet #{network[:ip]} netmask #{network[:netmask]}")
+          elsif network[:type].to_sym == :dhcp
+            vm.channel.sudo("dhclient em#{network[:interface]}")
+          end
         end
       end
+
+     def change_host_name(name)
+       if !vm.channel.test("hostname -f | grep '^#{name}$' || hostname -s | grep '^#{name}$'")
+         vm.channel.sudo("sed -i '' 's/^hostname=.*$/hostname=#{name}/' /etc/rc.conf")
+         vm.channel.sudo("hostname #{name}")
+       end
+     end
     end
   end
 end

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/linux.rb

@@ -19,6 +19,7 @@ module Vagrant
         end
 
         return :gentoo if @vm.channel.test("cat /etc/gentoo-release")
+        return :fedora if @vm.channel.test("grep 'Fedora release 16' /etc/redhat-release")
         return :redhat if @vm.channel.test("cat /etc/redhat-release")
         return :suse if @vm.channel.test("cat /etc/SuSE-release")
         return :arch if @vm.channel.test("cat /etc/arch-release")

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/hosts.rb

@@ -7,6 +7,7 @@ module Vagrant
     autoload :BSD,     'vagrant/hosts/bsd'
     autoload :FreeBSD, 'vagrant/hosts/freebsd'
     autoload :Fedora,  'vagrant/hosts/fedora'
+    autoload :OpenSUSE, 'vagrant/hosts/opensuse'
     autoload :Gentoo,  'vagrant/hosts/gentoo'
     autoload :Linux,   'vagrant/hosts/linux'
     autoload :Windows, 'vagrant/hosts/windows'

data/lib/vagrant/hosts/opensuse.rb

@@ -0,0 +1,30 @@
+require 'pathname'
+
+module Vagrant
+  module Hosts
+    class OpenSUSE < Linux
+      def self.match?
+        release_file = Pathname.new("/etc/SuSE-release")
+
+        if release_file.exist?
+          release_file.open("r") do |f|
+            return true if f.gets =~ /^openSUSE/
+          end
+        end
+
+        false
+      end
+
+      # Normal, mid-range precedence.
+      def self.precedence
+        5
+      end
+
+      def initialize(*args)
+        super
+
+        @nfs_server_binary = "/etc/init.d/nfsserver"
+      end
+    end
+  end
+end

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