vagrantup 1.0.7 → 1.1.0

data/plugins/communicators/ssh/plugin.rb

@@ -0,0 +1,19 @@
+require "vagrant"
+
+module VagrantPlugins
+  module CommunicatorSSH
+    class Plugin < Vagrant.plugin("2")
+      name "ssh communiator"
+      description <<-DESC
+      This plugin allows Vagrant to communicate with remote machines using
+      SSH as the underlying protocol, powered internally by Ruby's
+      net-ssh library.
+      DESC
+
+      communicator("ssh") do
+        require File.expand_path("../communicator", __FILE__)
+        Communicator
+      end
+    end
+  end
+end

data/plugins/guests/arch/guest.rb

@@ -0,0 +1,41 @@
+require 'set'
+require 'tempfile'
+
+require "vagrant"
+require 'vagrant/util/template_renderer'
+
+require Vagrant.source_root.join("plugins/guests/linux/guest")
+
+module VagrantPlugins
+  module GuestArch
+    class Guest < VagrantPlugins::GuestLinux::Guest
+      # 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.communicate.test("sudo hostname | grep '#{name}'")
+          vm.communicate.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/rc.conf")
+          vm.communicate.sudo("hostname #{name}")
+          vm.communicate.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} @' /etc/hosts")
+        end
+      end
+
+      def configure_networks(networks)
+        networks.each do |network|
+          entry = TemplateRenderer.render("guests/arch/network_#{network[:type]}",
+                                          :options => network)
+
+          temp = Tempfile.new("vagrant")
+          temp.binmode
+          temp.write(entry)
+          temp.close
+
+          vm.communicate.upload(temp.path, "/tmp/vagrant_network")
+          vm.communicate.sudo("mv /tmp/vagrant_network /etc/network.d/interfaces/eth#{network[:interface]}")
+          vm.communicate.sudo("netcfg interfaces/eth#{network[:interface]}")
+        end
+      end
+    end
+  end
+end

data/plugins/guests/arch/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestArch
+    class Plugin < Vagrant.plugin("2")
+      name "Arch guest"
+      description "Arch guest support."
+
+      guest("arch") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/{lib/vagrant/guest/debian.rb → plugins/guests/debian/guest.rb}

@@ -1,19 +1,23 @@
 require 'set'
 require 'tempfile'
 
+require "vagrant"
 require 'vagrant/util/template_renderer'
 
-module Vagrant
-  module Guest
-    class Debian < Linux
+require Vagrant.source_root.join("plugins/guests/linux/guest")
+
+module VagrantPlugins
+  module GuestDebian
+    class Guest < VagrantPlugins::GuestLinux::Guest
       # Make the TemplateRenderer top-level
       include Vagrant::Util
 
       def configure_networks(networks)
         # First, remove any previous network modifications
         # from the interface file.
-        vm.channel.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces")
-        vm.channel.sudo("su -c 'cat /tmp/vagrant-network-interfaces > /etc/network/interfaces'")
+        vm.communicate.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/network/interfaces > /tmp/vagrant-network-interfaces")
+        vm.communicate.sudo("su -c 'cat /tmp/vagrant-network-interfaces > /etc/network/interfaces'")
+        vm.communicate.sudo("rm /tmp/vagrant-network-interfaces")
 
         # Accumulate the configurations to add to the interfaces file as
         # well as what interfaces we're actually configuring since we use that
@@ -35,28 +39,32 @@ module Vagrant
         temp.write(entries.join("\n"))
         temp.close
 
-        vm.channel.upload(temp.path, "/tmp/vagrant-network-entry")
+        vm.communicate.upload(temp.path, "/tmp/vagrant-network-entry")
 
         # Bring down all the interfaces we're reconfiguring. By bringing down
         # each specifically, we avoid reconfiguring eth0 (the NAT interface) so
         # SSH never dies.
         interfaces.each do |interface|
-          vm.channel.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
+          vm.communicate.sudo("/sbin/ifdown eth#{interface} 2> /dev/null")
         end
 
-        vm.channel.sudo("cat /tmp/vagrant-network-entry >> /etc/network/interfaces")
+        vm.communicate.sudo("cat /tmp/vagrant-network-entry >> /etc/network/interfaces")
+        vm.communicate.sudo("rm /tmp/vagrant-network-entry")
 
         # Bring back up each network interface, reconfigured
         interfaces.each do |interface|
-          vm.channel.sudo("/sbin/ifup eth#{interface}")
+          vm.communicate.sudo("/sbin/ifup eth#{interface}")
         end
       end
 
       def change_host_name(name)
-        if !vm.channel.test("hostname --fqdn | grep '^#{name}$' || hostname --short | grep '^#{name}$'")
-          vm.channel.sudo("sed -r -i 's/^(127[.]0[.]1[.]1[[:space:]]+).*$/\\1#{name} #{name.split('.')[0]}/' /etc/hosts")
-          vm.channel.sudo("sed -i 's/.*$/#{name.split('.')[0]}/' /etc/hostname")
-          vm.channel.sudo("hostname -F /etc/hostname")
+        vm.communicate.tap do |comm|
+          if !comm.test("hostname --fqdn | grep '^#{name}$' || hostname --short | grep '^#{name}$'")
+            comm.sudo("sed -r -i 's/^(127[.]0[.]1[.]1[[:space:]]+).*$/\\1#{name} #{name.split('.')[0]}/' /etc/hosts")
+            comm.sudo("sed -i 's/.*$/#{name.split('.')[0]}/' /etc/hostname")
+            comm.sudo("hostname -F /etc/hostname")
+            comm.sudo("hostname --fqdn > /etc/mailname")
+          end
         end
       end
     end

data/plugins/guests/debian/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestDebian
+    class Plugin < Vagrant.plugin("2")
+      name "Debian guest"
+      description "Debian guest support."
+
+      guest("debian") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/{lib/vagrant/guest/fedora.rb → plugins/guests/fedora/guest.rb}

@@ -1,11 +1,14 @@
 require 'set'
 require 'tempfile'
 
+require "vagrant"
 require 'vagrant/util/template_renderer'
 
-module Vagrant
-  module Guest
-    class Fedora < Linux
+require Vagrant.source_root.join("plugins/guests/linux/guest")
+
+module VagrantPlugins
+  module GuestFedora
+    class Guest < VagrantPlugins::GuestLinux::Guest
       # Make the TemplateRenderer top-level
       include Vagrant::Util
 
@@ -18,9 +21,10 @@ module Vagrant
 
           # 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]}")
+          vm.communicate.sudo("touch #{network_scripts_dir}/ifcfg-p7p#{network[:interface]}")
+          vm.communicate.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' #{network_scripts_dir}/ifcfg-p7p#{network[:interface]} > /tmp/vagrant-ifcfg-p7p#{network[:interface]}")
+          vm.communicate.sudo("cat /tmp/vagrant-ifcfg-p7p#{network[:interface]} > #{network_scripts_dir}/ifcfg-p7p#{network[:interface]}")
+          vm.communicate.sudo("rm /tmp/vagrant-ifcfg-p7p#{network[:interface]}")
 
           # Render and upload the network entry file to a deterministic
           # temporary location.
@@ -32,16 +36,17 @@ module Vagrant
           temp.write(entry)
           temp.close
 
-          vm.channel.upload(temp.path, "/tmp/vagrant-network-entry_#{network[:interface]}")
+          vm.communicate.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")
+          vm.communicate.sudo("/sbin/ifdown p7p#{interface} 2> /dev/null", :error_check => false)
+          vm.communicate.sudo("cat /tmp/vagrant-network-entry_#{interface} >> #{network_scripts_dir}/ifcfg-p7p#{interface}")
+          vm.communicate.sudo("rm /tmp/vagrant-network-entry_#{interface}")
+          vm.communicate.sudo("/sbin/ifup p7p#{interface} 2> /dev/null")
         end
       end
 
@@ -55,10 +60,10 @@ module Vagrant
 
       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")
+        if !vm.communicate.test("sudo hostname | grep '#{name}'")
+          vm.communicate.sudo("sed -i 's/\\(HOSTNAME=\\).*/\\1#{name}/' /etc/sysconfig/network")
+          vm.communicate.sudo("hostname #{name}")
+          vm.communicate.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
         end
       end
     end

data/plugins/guests/fedora/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestFedora
+    class Plugin < Vagrant.plugin("2")
+      name "Fedora guest"
+      description "Fedora guest support."
+
+      guest("fedora") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/plugins/guests/freebsd/config.rb

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module GuestFreeBSD
+    class Config < Vagrant.plugin("2", :config)
+      attr_accessor :halt_timeout
+      attr_accessor :halt_check_interval
+
+      def initialize
+        @halt_timeout = 30
+        @halt_check_interval = 1
+      end
+    end
+  end
+end

data/plugins/guests/freebsd/guest.rb

@@ -0,0 +1,70 @@
+require 'vagrant/util/template_renderer'
+
+module VagrantPlugins
+  module GuestFreeBSD
+    # A general Vagrant system implementation for "freebsd".
+    #
+    # Contributed by Kenneth Vestergaard <kvs@binarysolutions.dk>
+    class Guest < Vagrant.plugin("2", :guest)
+      # Here for whenever it may be used.
+      class FreeBSDError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant.guest.freebsd")
+      end
+
+      def halt
+        vm.communicate.sudo("shutdown -p now")
+      end
+
+      # TODO: vboxsf is currently unsupported in FreeBSD, if you are able to
+      # help out with this project, please contact vbox@FreeBSD.org
+      #
+      # See: http://wiki.freebsd.org/VirtualBox/ToDo
+      # def mount_shared_folder(ssh, name, guestpath)
+      #   ssh.exec!("sudo mkdir -p #{guestpath}")
+      #   # Using a custom mount method here; could use improvement.
+      #   ssh.exec!("sudo mount -t vboxfs v-root #{guestpath}")
+      #   ssh.exec!("sudo chown #{vm.config.ssh.username} #{guestpath}")
+      # end
+
+      def mount_nfs(ip, folders)
+        folders.each do |name, opts|
+          vm.communicate.sudo("mkdir -p #{opts[:guestpath]}")
+          vm.communicate.sudo("mount '#{ip}:#{opts[:hostpath]}' '#{opts[:guestpath]}'")
+        end
+      end
+
+      def configure_networks(networks)
+        # Remove any previous network additions to the configuration file.
+        vm.communicate.sudo("sed -i '' -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/rc.conf")
+
+        networks.each do |network|
+          entry = TemplateRenderer.render("guests/freebsd/network_#{network[:type]}",
+                                          :options => network)
+
+          # Write the entry to a temporary location
+          temp = Tempfile.new("vagrant")
+          temp.binmode
+          temp.write(entry)
+          temp.close
+
+          vm.communicate.upload(temp.path, "/tmp/vagrant-network-entry")
+          vm.communicate.sudo("su -m root -c 'cat /tmp/vagrant-network-entry >> /etc/rc.conf'")
+          vm.communicate.sudo("rm /tmp/vagrant-network-entry")
+
+          if network[:type].to_sym == :static
+            vm.communicate.sudo("ifconfig em#{network[:interface]} inet #{network[:ip]} netmask #{network[:netmask]}")
+          elsif network[:type].to_sym == :dhcp
+            vm.communicate.sudo("dhclient em#{network[:interface]}")
+          end
+        end
+      end
+
+     def change_host_name(name)
+       if !vm.communicate.test("hostname -f | grep '^#{name}$' || hostname -s | grep '^#{name}$'")
+         vm.communicate.sudo("sed -i '' 's/^hostname=.*$/hostname=#{name}/' /etc/rc.conf")
+         vm.communicate.sudo("hostname #{name}")
+       end
+     end
+    end
+  end
+end

data/plugins/guests/freebsd/plugin.rb

@@ -0,0 +1,20 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestFreeBSD
+    class Plugin < Vagrant.plugin("2")
+      name "FreeBSD guest"
+      description "FreeBSD guest support."
+
+      config("freebsd") do
+        require File.expand_path("../config", __FILE__)
+        Config
+      end
+
+      guest("freebsd")  do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/plugins/guests/gentoo/guest.rb

@@ -0,0 +1,51 @@
+require 'tempfile'
+
+require "vagrant"
+require 'vagrant/util/template_renderer'
+
+require Vagrant.source_root.join("plugins/guests/linux/guest")
+
+module VagrantPlugins
+  module GuestGentoo
+    class Guest < VagrantPlugins::GuestLinux::Guest
+      # Make the TemplateRenderer top-level
+      include Vagrant::Util
+
+      def configure_networks(networks)
+        # Remove any previous host only network additions to the interface file
+        vm.communicate.sudo("sed -e '/^#VAGRANT-BEGIN/,/^#VAGRANT-END/ d' /etc/conf.d/net > /tmp/vagrant-network-interfaces")
+        vm.communicate.sudo("cat /tmp/vagrant-network-interfaces > /etc/conf.d/net")
+        vm.communicate.sudo("rm /tmp/vagrant-network-interfaces")
+
+        # Configure each network interface
+        networks.each do |network|
+          entry = TemplateRenderer.render("guests/gentoo/network_#{network[:type]}",
+                                          :options => network)
+
+          # Upload the entry to a temporary location
+          temp = Tempfile.new("vagrant")
+          temp.binmode
+          temp.write(entry)
+          temp.close
+
+          vm.communicate.upload(temp.path, "/tmp/vagrant-network-entry")
+
+          # Configure the interface
+          vm.communicate.sudo("ln -fs /etc/init.d/net.lo /etc/init.d/net.eth#{network[:interface]}")
+          vm.communicate.sudo("/etc/init.d/net.eth#{network[:interface]} stop 2> /dev/null")
+          vm.communicate.sudo("cat /tmp/vagrant-network-entry >> /etc/conf.d/net")
+          vm.communicate.sudo("rm /tmp/vagrant-network-entry")
+          vm.communicate.sudo("/etc/init.d/net.eth#{network[:interface]} start")
+        end
+      end
+
+      def change_host_name(name)
+        if !vm.communicate.test("sudo hostname --fqdn | grep '#{name}'")
+          vm.communicate.sudo("echo 'hostname=#{name.split('.')[0]}' > /etc/conf.d/hostname")
+          vm.communicate.sudo("sed -i 's@^\\(127[.]0[.]0[.]1[[:space:]]\\+\\)@\\1#{name} #{name.split('.')[0]} @' /etc/hosts")
+          vm.communicate.sudo("hostname #{name.split('.')[0]}")
+        end
+      end
+    end
+  end
+end

data/plugins/guests/gentoo/plugin.rb

@@ -0,0 +1,15 @@
+require "vagrant"
+
+module VagrantPlugins
+  module GuestGentoo
+    class Plugin < Vagrant.plugin("2")
+      name "Gentoo guest"
+      description "Gentoo guest support."
+
+      guest("gentoo") do
+        require File.expand_path("../guest", __FILE__)
+        Guest
+      end
+    end
+  end
+end

data/plugins/guests/linux/config.rb

@@ -0,0 +1,13 @@
+module VagrantPlugins
+  module GuestLinux
+    class Config < Vagrant.plugin("2", :config)
+      attr_accessor :halt_timeout
+      attr_accessor :halt_check_interval
+
+      def initialize
+        @halt_timeout = 30
+        @halt_check_interval = 1
+      end
+    end
+  end
+end

data/{lib/vagrant/guest/linux.rb → plugins/guests/linux/guest.rb}

@@ -1,11 +1,17 @@
 require 'log4r'
 
-require 'vagrant/guest/linux/error'
-require 'vagrant/guest/linux/config'
+require "vagrant"
+require "vagrant/util/retryable"
+
+module VagrantPlugins
+  module GuestLinux
+    class Guest < Vagrant.plugin("2", :guest)
+      include Vagrant::Util::Retryable
+
+      class LinuxError < Vagrant::Errors::VagrantError
+        error_namespace("vagrant.guest.linux")
+      end
 
-module Vagrant
-  module Guest
-    class Linux < Base
       def initialize(*args)
         super
 
@@ -13,43 +19,35 @@ module Vagrant
       end
 
       def distro_dispatch
-        if @vm.channel.test("cat /etc/debian_version")
-          return :debian if @vm.channel.test("cat /proc/version | grep 'Debian'")
-          return :ubuntu if @vm.channel.test("cat /proc/version | grep 'Ubuntu'")
-        end
+        @vm.communicate.tap do |comm|
+          if comm.test("cat /etc/debian_version")
+            return :debian if comm.test("cat /proc/version | grep 'Debian'")
+            return :ubuntu if comm.test("cat /proc/version | grep 'Ubuntu'")
+          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")
+          return :gentoo if comm.test("cat /etc/gentoo-release")
+          return :fedora if comm.test("grep 'Fedora release 1[678]' /etc/redhat-release")
+          return :redhat if comm.test("cat /etc/redhat-release")
+          return :suse if comm.test("cat /etc/SuSE-release")
+          return :arch if comm.test("cat /etc/arch-release")
+          return :solaris if comm.test("grep 'Solaris' /etc/release")
+        end
 
         # Can't detect the distro, assume vanilla linux
         nil
       end
 
       def halt
-        @vm.channel.sudo("shutdown -h now")
-
-        # Wait until the VM's state is actually powered off. If this doesn't
-        # occur within a reasonable amount of time (15 seconds by default),
-        # then simply return and allow Vagrant to kill the machine.
-        count = 0
-        while @vm.state != :poweroff
-          count += 1
-
-          return if count >= @vm.config.linux.halt_timeout
-          sleep @vm.config.linux.halt_check_interval
-        end
+        @vm.communicate.sudo("shutdown -h now")
       end
 
       def mount_shared_folder(name, guestpath, options)
         real_guestpath = expanded_guest_path(guestpath)
         @logger.debug("Shell expanded guest path: #{real_guestpath}")
 
-        @vm.channel.sudo("mkdir -p #{real_guestpath}")
+        @vm.communicate.sudo("mkdir -p #{real_guestpath}")
         mount_folder(name, real_guestpath, options)
-        @vm.channel.sudo("chown `id -u #{options[:owner]}`:`id -g #{options[:group]}` #{real_guestpath}")
+        @vm.communicate.sudo("chown `id -u #{options[:owner]}`:`id -g #{options[:group]}` #{real_guestpath}")
       end
 
       def mount_nfs(ip, folders)
@@ -60,10 +58,13 @@ module 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 -o vers=#{opts[:nfs_version]} #{ip}:'#{opts[:hostpath]}' #{real_guestpath}",
-                          :error_class => LinuxError,
-                          :error_key => :mount_nfs_fail)
+          @vm.communicate.sudo("mkdir -p #{real_guestpath}")
+
+          retryable(:on => LinuxError, :tries => 5, :sleep => 2) do
+            @vm.communicate.sudo("mount -o vers=#{opts[:nfs_version]} #{ip}:'#{opts[:hostpath]}' #{real_guestpath}",
+                                 :error_class => LinuxError,
+                                   :error_key => :mount_nfs_fail)
+          end
         end
       end
 
@@ -77,7 +78,7 @@ module Vagrant
       # @return [String] The expanded guestpath
       def expanded_guest_path(guestpath)
         real_guestpath = nil
-        @vm.channel.execute("printf #{guestpath}") do |type, data|
+        @vm.communicate.execute("printf #{guestpath}") do |type, data|
           if type == :stdout
             real_guestpath ||= ""
             real_guestpath += data
@@ -102,7 +103,7 @@ module Vagrant
         attempts = 0
         while true
           success = true
-          @vm.channel.sudo("mount -t vboxsf #{mount_options} #{name} #{guestpath}") do |type, data|
+          @vm.communicate.sudo("mount -t vboxsf #{mount_options} #{name} #{guestpath}") do |type, data|
             success = false if type == :stderr && data =~ /No such device/i
           end