vagrant 0.8.10 → 0.9.0

data/lib/vagrant/hosts/bsd.rb

@@ -1,3 +1,5 @@
+require 'log4r'
+
 require 'vagrant/util/platform'
 
 module Vagrant
@@ -7,9 +9,21 @@ module Vagrant
       include Util
       include Util::Retryable
 
-      def self.distro_dispatch
-        return FreeBSD if Util::Platform.freebsd?
-        return self if Util::Platform.darwin? || Util::Platform.bsd?
+      def self.match?
+        Util::Platform.darwin? || Util::Platform.bsd?
+      end
+
+      def self.precedence
+        # Set a lower precedence because this is a generic OS. We
+        # want specific distros to match first.
+        2
+      end
+
+      def initialize(*args)
+        super
+
+        @logger = Log4r::Logger.new("vagrant::hosts::bsd")
+        @nfs_restart_command = "sudo nfsd restart"
       end
 
       def nfs?
@@ -18,42 +32,65 @@ module Vagrant
         end
       end
 
-      def nfs_export(ip, folders)
+      def nfs_export(id, ip, folders)
         output = TemplateRenderer.render('nfs/exports',
-                                         :uuid => env.vm.uuid,
+                                         :uuid => id,
                                          :ip => ip,
                                          :folders => folders)
 
         # The sleep ensures that the output is truly flushed before any `sudo`
         # commands are issued.
-        env.ui.info I18n.t("vagrant.hosts.bsd.nfs_export.prepare")
+        @ui.info I18n.t("vagrant.hosts.bsd.nfs_export")
         sleep 0.5
 
+        # First, clean up the old entry
+        nfs_cleanup(id)
+
+        # Output the rendered template into the exports
         output.split("\n").each do |line|
-          # This should only ask for administrative permission once, even
-          # though its executed in multiple subshells.
           line = line.gsub('"', '\"')
           system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
         end
 
         # We run restart here instead of "update" just in case nfsd
         # is not starting
-        system("sudo nfsd restart")
+        system(@nfs_restart_command)
       end
 
-      def nfs_cleanup
+      def nfs_prune(valid_ids)
         return if !File.exist?("/etc/exports")
 
-        retryable(:tries => 10, :on => TypeError) do
-          system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
+        @logger.info("Pruning invalid NFS entries...")
 
-          if $?.to_i == 0
-            # Use sed to just strip out the block of code which was inserted
-            # by Vagrant
-            system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -ibak /etc/exports")
+        output = false
+
+        File.read("/etc/exports").lines.each do |line|
+          if line =~ /^# VAGRANT-BEGIN: (.+?)$/
+            if valid_ids.include?($1.to_s)
+              @logger.debug("Valid ID: #{$1.to_s}")
+            else
+              if !output
+                # We want to warn the user but we only want to output once
+                @ui.info I18n.t("vagrant.hosts.bsd.nfs_prune")
+                output = true
+              end
+
+              @logger.info("Invalid ID, pruning: #{$1.to_s}")
+              nfs_cleanup($1.to_s)
+            end
           end
         end
       end
+
+      protected
+
+      def nfs_cleanup(id)
+        return if !File.exist?("/etc/exports")
+
+        # Use sed to just strip out the block of code which was inserted
+        # by Vagrant, and restart NFS.
+        system("sudo sed -e '/^# VAGRANT-BEGIN: #{id}/,/^# VAGRANT-END: #{id}/ d' -ibak /etc/exports")
+      end
     end
   end
 end

data/lib/vagrant/hosts/fedora.rb

@@ -1,6 +1,20 @@
+require 'pathname'
+
 module Vagrant
   module Hosts
     class Fedora < Linux
+      def self.match?
+        release_file = Pathname.new("/etc/redhat-release")
+
+        if release_file.exist?
+          release_file.open("r") do |f|
+            return true if f.gets =~ /^Fedora/
+          end
+        end
+
+        false
+      end
+
       def initialize(*args)
         super
 

data/lib/vagrant/hosts/freebsd.rb

@@ -7,45 +7,15 @@ module Vagrant
       include Util
       include Util::Retryable
 
-      def nfs_export(ip, folders)
-        output = TemplateRenderer.render('nfs/exports',
-                                         :uuid => env.vm.uuid,
-                                         :ip => ip,
-                                         :folders => folders)
-
-        # The sleep ensures that the output is truly flushed before any `sudo`
-        # commands are issued.
-        env.ui.info I18n.t("vagrant.hosts.bsd.nfs_export.prepare")
-        sleep 0.5
-
-        output.split("\n").each do |line|
-          # This should only ask for administrative permission once, even
-          # though its executed in multiple subshells.
-          line = line.gsub('"', '\"')
-          system(%Q[sudo su root -c "echo '#{line}' >> /etc/exports"])
-        end
-
-        # We run restart here instead of "update" just in case nfsd
-        # is not starting
-        system("sudo /etc/rc.d/mountd onereload")
+      def self.match?
+        Util::Platform.freebsd?
       end
 
-    end
-
-    def nfs_cleanup
-        return if !File.exist?("/etc/exports")
-
-        retryable(:tries => 10, :on => TypeError) do
-          system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
+      def initialize(*args)
+        super
 
-          if $?.to_i == 0
-            # Use sed to just strip out the block of code which was inserted
-            # by Vagrant
-            system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -ibak /etc/exports")
-          end
-
-          system("sudo /etc/rc.d/mountd onereload")
-        end
+        @nfs_restart_command = "sudo /etc/rc.d/mountd onereload"
       end
+    end
   end
 end

data/lib/vagrant/hosts/linux.rb

@@ -1,3 +1,5 @@
+require 'log4r'
+
 require 'vagrant/util/platform'
 
 module Vagrant
@@ -7,23 +9,20 @@ module Vagrant
       include Util
       include Util::Retryable
 
-      def self.distro_dispatch
-        return nil if !Util::Platform.linux?
-        return Arch if File.exist?("/etc/rc.conf") && File.exist?("/etc/pacman.conf")
-
-        if File.exist?("/etc/redhat-release")
-          # Check if we have a known redhat release
-          File.open("/etc/redhat-release") do |f|
-            return Fedora if f.gets =~ /^Fedora/
-          end
-        end
+      def self.match?
+        Util::Platform.linux?
+      end
 
-        return self
+      def self.precedence
+        # Set a lower precedence because this is a generic OS. We
+        # want specific distros to match first.
+        2
       end
 
       def initialize(*args)
         super
 
+        @logger = Log4r::Logger.new("vagrant::hosts::linux")
         @nfs_server_binary = "/etc/init.d/nfs-kernel-server"
       end
 
@@ -34,15 +33,17 @@ module Vagrant
         end
       end
 
-      def nfs_export(ip, folders)
+      def nfs_export(id, ip, folders)
         output = TemplateRenderer.render('nfs/exports_linux',
-                                         :uuid => env.vm.uuid,
+                                         :uuid => id,
                                          :ip => ip,
                                          :folders => folders)
 
-        env.ui.info I18n.t("vagrant.hosts.linux.nfs_export.prepare")
+        @ui.info I18n.t("vagrant.hosts.linux.nfs_export")
         sleep 0.5
 
+        nfs_cleanup(id)
+
         output.split("\n").each do |line|
           # This should only ask for administrative permission once, even
           # though its executed in multiple subshells.
@@ -54,16 +55,40 @@ module Vagrant
         system("sudo #{@nfs_server_binary} restart")
       end
 
-      def nfs_cleanup
+      def nfs_prune(valid_ids)
         return if !File.exist?("/etc/exports")
-        system("cat /etc/exports | grep 'VAGRANT-BEGIN: #{env.vm.uuid}' > /dev/null 2>&1")
 
-        if $?.to_i == 0
-          # Use sed to just strip out the block of code which was inserted
-          # by Vagrant
-          system("sudo sed -e '/^# VAGRANT-BEGIN: #{env.vm.uuid}/,/^# VAGRANT-END: #{env.vm.uuid}/ d' -ibak /etc/exports")
+        @logger.info("Pruning invalid NFS entries...")
+
+        output = false
+
+        File.read("/etc/exports").lines.each do |line|
+          if line =~ /^# VAGRANT-BEGIN: (.+?)$/
+            if valid_ids.include?($1.to_s)
+              @logger.debug("Valid ID: #{$1.to_s}")
+            else
+              if !output
+                # We want to warn the user but we only want to output once
+                @ui.info I18n.t("vagrant.hosts.linux.nfs_prune")
+                output = true
+              end
+
+              @logger.info("Invalid ID, pruning: #{$1.to_s}")
+              nfs_cleanup($1.to_s)
+            end
+          end
         end
       end
+
+      protected
+
+      def nfs_cleanup(id)
+        return if !File.exist?("/etc/exports")
+
+        # Use sed to just strip out the block of code which was inserted
+        # by Vagrant
+        system("sudo sed -e '/^# VAGRANT-BEGIN: #{id}/,/^# VAGRANT-END: #{id}/ d' -ibak /etc/exports")
+      end
     end
   end
 end

data/lib/vagrant/hosts/windows.rb

@@ -0,0 +1,16 @@
+require 'vagrant/util/platform'
+
+module Vagrant
+  module Hosts
+    class Windows < Base
+      def self.match?
+        Util::Platform.windows?
+      end
+
+      # Windows does not support NFS
+      def nfs?
+        false
+      end
+    end
+  end
+end

data/lib/vagrant/provisioners.rb

@@ -1,9 +1,12 @@
 # These aren't autoloaded because they have to register things such
 # as configuration classes right away with Vagrant.
-require 'vagrant/provisioners/base'
-require 'vagrant/provisioners/chef'
-require 'vagrant/provisioners/chef_client'
-require 'vagrant/provisioners/chef_solo'
-require 'vagrant/provisioners/puppet'
-require 'vagrant/provisioners/puppet_server'
-require 'vagrant/provisioners/shell'
+module Vagrant
+  module Provisioners
+    autoload :Base,         'vagrant/provisioners/base'
+    autoload :ChefSolo,     'vagrant/provisioners/chef_solo'
+    autoload :ChefClient,   'vagrant/provisioners/chef_client'
+    autoload :Puppet,       'vagrant/provisioners/puppet'
+    autoload :PuppetServer, 'vagrant/provisioners/puppet_server'
+    autoload :Shell,        'vagrant/provisioners/shell'
+  end
+end

data/lib/vagrant/provisioners/base.rb

@@ -1,52 +1,29 @@
 module Vagrant
   module Provisioners
     # The base class for a "provisioner." A provisioner is responsible for
-    # provisioning a Vagrant system. This has been abstracted out to provide
-    # support for multiple solutions such as Chef Solo, Chef Client, and
-    # Puppet.
+    # provisioning a Vagrant system.
+    #
+    # This has been abstracted out so it is easy to provide support for
+    # multiple solutions.
     class Base
       include Vagrant::Util
 
-      # The environment which provisioner is running in. This is a
-      # {Vagrant::Action::Environment}
-      attr_reader :action_env
+      # The environment which provisioner is running in. This is the
+      # action environment, not a Vagrant::Environment.
+      attr_reader :env
 
       # The configuration for this provisioner. This will be an instance of
       # the `Config` class which is part of the provisioner.
       attr_reader :config
 
-      # Registers a provisioner with a given shortcut. This allows that provisioner
-      # to be referenced with the shortcut.
-      #
-      # @param [Symbol] shortcut
-      def self.register(shortcut)
-        registered[shortcut] = self
-      end
-
-      # Returns the provisioner associated with the given shortcut.
-      def self.registered
-        @@registered ||= {}
-      end
-
       def initialize(env, config)
-        @action_env = env
+        @env = env
         @config = config
       end
 
-      # Returns the actual {Vagrant::Environment} which this provisioner
-      # represents.
-      #
-      # @return [Vagrant::Environment]
-      def env
-        action_env.env
-      end
-
-      # Returns the VM which this provisioner is working on.
-      #
-      # @return [Vagrant::VM]
-      def vm
-        env.vm
-      end
+      # This method is expected to return a class that is used for configuration
+      # for the provisioner.
+      def self.config_class; end
 
       # This is the method called to "prepare" the provisioner. This is called
       # before any actions are run by the action runner (see {Vagrant::Actions::Runner}).

data/lib/vagrant/provisioners/chef.rb

@@ -1,3 +1,5 @@
+require 'tempfile'
+
 module Vagrant
   module Provisioners
     # This class is a base class where the common functionality shared between
@@ -17,11 +19,12 @@ module Vagrant
       end
 
       def verify_binary(binary)
-        vm.ssh.execute do |ssh|
-          # Checks for the existence of chef binary and error if it
-          # doesn't exist.
-          ssh.sudo!("which #{binary}", :error_class => ChefError, :_key => :chef_not_detected, :binary => binary)
-        end
+        # Checks for the existence of chef binary and error if it
+        # doesn't exist.
+        env[:vm].channel.sudo("which #{binary}",
+                              :error_class => ChefError,
+                              :error_key => :chef_not_detected,
+                              :binary => binary)
       end
 
       # Returns the path to the Chef binary, taking into account the
@@ -32,10 +35,8 @@ module Vagrant
       end
 
       def chown_provisioning_folder
-        vm.ssh.execute do |ssh|
-          ssh.sudo!("mkdir -p #{config.provisioning_path}")
-          ssh.sudo!("chown #{env.config.ssh.username} #{config.provisioning_path}")
-        end
+        env[:vm].channel.sudo("mkdir -p #{config.provisioning_path}")
+        env[:vm].channel.sudo("chown #{env[:vm].config.ssh.username} #{config.provisioning_path}")
       end
 
       def setup_config(template, filename, template_vars)
@@ -50,17 +51,23 @@ module Vagrant
           :no_proxy => config.no_proxy
         }.merge(template_vars))
 
-        vm.ssh.upload!(StringIO.new(config_file), File.join(config.provisioning_path, filename))
+        # Create a temporary file to store the data so we
+        # can upload it
+        temp = Tempfile.new("vagrant")
+        temp.write(config_file)
+        temp.close
+
+        env[:vm].channel.upload(temp.path, File.join(config.provisioning_path, filename))
       end
 
       def setup_json
-        env.ui.info I18n.t("vagrant.provisioners.chef.json")
+        env[:ui].info I18n.t("vagrant.provisioners.chef.json")
 
         # Set up our configuration that is passed to the attributes by default
-        data = { :config => env.config.to_hash }
+        data = { :config => env[:global_config].to_hash }
 
         # Add our default share directory if it exists
-        default_share = env.config.vm.shared_folders["v-root"]
+        default_share = env[:vm].config.vm.shared_folders["v-root"]
         data[:directory] = default_share[:guestpath] if default_share
 
         # And wrap it under the "vagrant" namespace
@@ -72,7 +79,13 @@ module Vagrant
 
         json = data.to_json
 
-        vm.ssh.upload!(StringIO.new(json), File.join(config.provisioning_path, "dna.json"))
+        # Create a temporary file to store the data so we
+        # can upload it
+        temp = Tempfile.new("vagrant")
+        temp.write(json)
+        temp.close
+
+        env[:vm].channel.upload(temp.path, File.join(config.provisioning_path, "dna.json"))
       end
     end
 
@@ -99,22 +112,13 @@ module Vagrant
         attr_accessor :no_proxy
         attr_accessor :binary_path
         attr_accessor :binary_env
+        attr_accessor :attempts
         attr_writer :run_list
 
         def initialize
-          @provisioning_path = nil
-          @log_level = :info
+          @attempts = 1
           @json = {}
-          @http_proxy = nil
-          @http_proxy_user = nil
-          @http_proxy_pass = nil
-          @https_proxy = nil
-          @https_proxy_user = nil
-          @https_proxy_pass = nil
-          @no_proxy = nil
-          @binary_path = nil
-          @binary_env = nil
-          @run_list = nil
+          @log_level = :info
         end
 
         # This returns the json that is merged with the defaults and the