lib/vagrant-hosts/provisioners/hosts.rb in vagrant-hosts-0.0.1 vs lib/vagrant-hosts/provisioners/hosts.rb in vagrant-hosts-0.0.2

@@ -1,40 +1,16 @@
 require 'vagrant'
 require 'vagrant-hosts'
 require 'vagrant-hosts/ssh' # Guerrilla patch ssh download
+require 'vagrant-hosts/config'
 require 'tempfile'
 
 
 class VagrantHosts::Provisioner < Vagrant::Provisioners::Base
 
-  class Config < Vagrant::Config::Base
-
-    attr_reader :hosts
-
-    def initialize
-      @hosts = []
-    end
-
-    # Register a host for entry
-    #
-    # @param [String] address The IP address for aliases
-    # @param [Array] aliases An array of hostnames to assign to the IP address
-    def add_host(address, aliases)
-      @hosts << [address, aliases]
-    end
-
-    def validate(env, errors)
-      @hosts.each do |(address, aliases)|
-        unless aliases.is_a? Array
-          errors.add("#{address} should have an array of aliases, got #{aliases.inspect}:#{aliases.class}")
-        end
-      end
-    end
-  end
-
   def self.config_class
-    Config
+    ::VagrantHosts::Config
   end
 
   def provision!
     # too tired to do this. detect target platform, select according provider,
     # add entries that are specified in the config and are not on the client
@@ -48,28 +24,39 @@
     def initialize(env, config)
       @env, @config = env, config
     end
 
     def sync!
-      cache = Tempfile.new('vagrant-hosts')
+      upload_tmphosts
+      atomic_sync
+    end
 
-      # It would be really cool to synchronize this file instead of blindly
-      # smashing the remote hosts file, but this is the quick and dirty solution.
-      #@env[:vm].channel.download('/etc/hosts', cache.path)
-      #cache.rewind
-      #cache.truncate(0)
-
-      cache.write hosts_format
+    def upload_tmphosts
+      cache = Tempfile.new('tmp-hosts')
+      cache.write(format_hosts)
       cache.flush
-
       @env[:vm].channel.upload(cache.path, '/tmp/hosts')
-      @env[:vm].channel.sudo('install -m 644 /tmp/hosts /etc/hosts')
     end
 
+    def atomic_sync
+      script = <<-ATOMIC
+hostname #{@env[:vm].name}
+domainname vagrantup.internal
+install -m 644 /tmp/hosts /etc/hosts
+      ATOMIC
+
+      sync = Tempfile.new('sync')
+      sync.write(script)
+      sync.flush
+      @env[:vm].channel.upload(sync.path, '/tmp/sync')
+
+      @env[:vm].channel.sudo('bash /tmp/sync')
+    end
+
     # Generates content appropriate for a linux hosts file
     #
     # @return [String] All hosts in the config joined into hosts records
-    def hosts_format
+    def format_hosts
       @config.hosts.inject('') do |str, (address, aliases)|
         str << "#{address} #{aliases.join(' ')}\n"
       end
     end
   end