vagrant-hosts 0.0.2 → 1.0.0

data/README.markdown

@@ -6,14 +6,18 @@ Manage vagrant guest local DNS resolution.
 Synopsis
 --------
 
-    Vagrant::Config.run do |config|
+Manually specify addresses:
+
+    Vagrant.configure('2') do |config|
       config.vm.box = "ubuntu-12.04-server-i386"
 
       config.vm.provision :hosts do |provisioner|
         # Add a single hostname
         provisioner.add_host '10.0.2.2', ['myhost.vagrantup.internal']
+
         # Or a fqdn and a short hostname
-        provisioner.add_host '10.0.2.3', ['myotherhost.vagrantup.internal', 'myotherhost'] 
+        provisioner.add_host '10.0.2.3', ['myotherhost.vagrantup.internal', 'myotherhost']
+
         # Or as many aliases as you like!
         provisioner.add_host '10.0.2.5', [
           'mypuppetmaster.vagrantup.internal',
@@ -24,17 +28,64 @@ Synopsis
       end
     end
 
-Supported Guest Platforms
--------------------------
+- - -
+
+Autodetect internal network addresses and autoconfigure hosts:
+
+    # Autoconfigure hosts. This will copy the private network addresses from
+    # each VM and update hosts entries on all other machines. No further
+    # configuration is needed.
+    Vagrant.configure('2') do |config|
+
+      config.vm.define :first do |node|
+        node.vm.box = "ubuntu-12.04-server-i386"
+        node.vm.network :private_network, :ip => '10.20.1.2'
+        node.vm.provision :hosts
+      end
+
+      config.vm.define :second do |node|
+        node.vm.box = "ubuntu-12.04-server-i386"
+        node.vm.network :private_network, :ip => '10.20.1.3'
+        node.vm.provision :hosts
+      end
+    end
+
+- - -
+
+Use autodetection with manual entries
+
+    Vagrant.configure('2') do |config|
+
+      config.vm.define :first do |node|
+        node.vm.box = "ubuntu-12.04-server-i386"
+        node.vm.network :private_network, :ip => '10.20.1.2'
+        node.vm.provision :hosts do |provisioner|
+          provisioner.autoconfigure = true
+          provisioner.add_host 172.16.3.10, ['yum.mirror.local']
+        end
+
+      end
+
+      config.vm.define :second do |node|
+        node.vm.box = "ubuntu-12.04-server-i386"
+        node.vm.network :private_network, :ip => '10.20.1.3'
+        node.vm.provision :hosts do |provisioner|
+          provisioner.autoconfigure = true
+          provisioner.add_host 172.16.3.11, ['apt.mirror.local']
+        end
+      end
+    end
+
+Supported Platforms
+-------------------
+
+As of version 1.0.0 or later Vagrant 1.1 is required.
+
+Supported guests:
 
   * Linux
-  * (soon) Windows (As soon as I get a chance to incorporate the driver)
 
 Installation
 ------------
 
-    # For full releases
-    gem install vagrant-hosts
-    # For pre releases
-    gem install --pre vagrant-hosts
-    # Vagrant hosts magic!
+    vagrant plugin install vagrant-hosts

data/lib/vagrant-hosts/config.rb

@@ -1,12 +1,20 @@
 require 'vagrant'
-require 'vagrant-hosts'
 
-class VagrantHosts::Config < Vagrant::Config::Base
+module VagrantHosts
+class Config < Vagrant.plugin('2', :config)
 
+  # @!attribute hosts
+  #   @return [Array<Array<String, Array<String>>>] A list of IP addresses and their aliases
   attr_reader :hosts
 
+  # @!attribute autoconfigure
+  #   @return [TrueClass, FalseClass] If hosts should be generated from the
+  #                                   other vagrant machines
+  attr_accessor :autoconfigure
+
   def initialize
     @hosts = []
+    @autoconfigure = UNSET_VALUE
   end
 
   # Register a host for entry
@@ -17,6 +25,7 @@ class VagrantHosts::Config < Vagrant::Config::Base
     @hosts << [address, aliases]
   end
 
+  # All IPv6 multicast addresses
   def add_ipv6_multicast
     add_host '::1',     ['ip6-localhost', 'ip6-loopback']
     add_host 'fe00::0', ['ip6-localnet']
@@ -25,11 +34,29 @@ class VagrantHosts::Config < Vagrant::Config::Base
     add_host 'ff02::2', ['ip6-allrouters']
   end
 
-  def validate(env, errors)
+  def finalize!
+    if @autoconfigure == UNSET_VALUE or @hosts.empty?
+      @autoconfigure = true
+    end
+  end
+
+  # @param other [VagrantHosts::Config]
+  # @return [VagrantHosts::Config] The merged results
+  def merge(other)
+    super.tap do |result|
+      result.hosts += other.hosts
+    end
+  end
+
+  def validate(machine)
+    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}")
+        errors << "#{address} should have an array of aliases, got #{aliases.inspect}:#{aliases.class}"
       end
     end
+
+    {"Vagrant Hosts" => errors}
   end
 end
+end

data/lib/vagrant-hosts/plugin.rb

@@ -0,0 +1,26 @@
+require 'vagrant'
+require 'vagrant-hosts'
+require 'vagrant-hosts/version'
+
+if Vagrant::VERSION < "1.1.0"
+  raise "vagrant-hosts version #{VagrantHosts::VERSION} requires Vagrant 1.1 or later"
+end
+
+class VagrantHosts::Plugin < Vagrant.plugin(2)
+  name 'hosts'
+
+  description <<-DESC
+  This plugin adds commands and provisioners to manage static host entries on
+  Vagrant guests.
+  DESC
+
+  provisioner(:hosts) do
+    require_relative 'provisioner'
+    VagrantHosts::Provisioner
+  end
+
+  config(:hosts, :provisioner) do
+    require_relative 'config'
+    VagrantHosts::Config
+  end
+end

data/lib/vagrant-hosts/provisioner.rb

@@ -0,0 +1,90 @@
+require 'vagrant'
+require 'tempfile'
+
+
+module VagrantHosts
+class Provisioner < Vagrant.plugin('2', :provisioner)
+
+  def initialize(machine, config)
+    @machine, @config = machine, config
+    p
+  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
+
+    driver = Linux.new(@machine, @config)
+    driver.sync!
+  end
+
+  class Linux
+
+    def initialize(machine, config)
+      @machine, @config = machine, config
+    end
+
+    def sync!
+      upload_tmphosts
+      update_hosts
+    end
+
+    private
+
+    def upload_tmphosts
+      cache = Tempfile.new('tmp-hosts')
+      cache.write(format_hosts)
+      cache.flush
+      @machine.communicate.upload(cache.path, '/tmp/hosts')
+    end
+
+    def update_hosts
+      @machine.guest.change_host_name(@machine.name.to_s)
+      @machine.communicate.sudo('install -m 644 /tmp/hosts /etc/hosts')
+    end
+
+    # Generates content appropriate for a linux hosts file
+    #
+    # @return [String] All hosts in the config joined into hosts records
+    def format_hosts
+      all_hosts.inject('') do |str, (address, aliases)|
+        str << "#{address} #{aliases.join(' ')}\n"
+      end
+    end
+
+    def all_hosts
+      all_hosts = []
+
+      if @config.autoconfigure
+        all_hosts += vagrant_hosts
+      else
+        all_hosts += @config.hosts
+      end
+
+      all_hosts.unshift(['127.0.0.1', ['localhost']])
+      all_hosts.unshift(['127.0.1.1', [@machine.name]])
+    end
+
+    def vagrant_hosts
+      hosts = []
+      env = @machine.env
+      names = env.machine_names
+
+      # Assume that all VMs are using the current provider
+      provider = @machine.provider
+
+      names.each do |name|
+        network_settings = env.machine(name, :virtualbox).config.vm.networks
+        network_settings.each do |entry|
+          if entry[0] == :private_network
+            ipaddr = entry[1][:ip]
+            hosts << [ipaddr, [name]]
+          end
+        end
+      end
+
+      hosts
+    end
+  end
+end
+end

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '0.0.2'
+  VERSION = '1.0.0'
 end

data/lib/vagrant-hosts.rb

@@ -2,6 +2,4 @@
 module VagrantHosts; end
 
 require 'vagrant-hosts/version'
-require 'vagrant-hosts/provisioners/hosts'
-
-Vagrant.provisioners.register(:hosts) { VagrantHosts::Provisioner }
+require 'vagrant-hosts/plugin'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vagrant
@@ -39,10 +39,9 @@ files:
 - README.markdown
 - lib/vagrant-hosts.rb
 - lib/vagrant-hosts/config.rb
-- lib/vagrant-hosts/provisioners/hosts.rb
-- lib/vagrant-hosts/ssh.rb
+- lib/vagrant-hosts/plugin.rb
+- lib/vagrant-hosts/provisioner.rb
 - lib/vagrant-hosts/version.rb
-- lib/vagrant_init.rb
 - vagrant-hosts.gemspec
 homepage: https://github.com/adrienthebo/vagrant-hosts
 licenses:

data/lib/vagrant-hosts/provisioners/hosts.rb

@@ -1,64 +0,0 @@
-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
-
-  def self.config_class
-    ::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
-
-    driver = Linux.new(@env, config)
-    driver.sync!
-  end
-
-  class Linux
-
-    def initialize(env, config)
-      @env, @config = env, config
-    end
-
-    def sync!
-      upload_tmphosts
-      atomic_sync
-    end
-
-    def upload_tmphosts
-      cache = Tempfile.new('tmp-hosts')
-      cache.write(format_hosts)
-      cache.flush
-      @env[:vm].channel.upload(cache.path, '/tmp/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 format_hosts
-      @config.hosts.inject('') do |str, (address, aliases)|
-        str << "#{address} #{aliases.join(' ')}\n"
-      end
-    end
-  end
-end

data/lib/vagrant-hosts/ssh.rb

@@ -1,27 +0,0 @@
-require 'vagrant'
-require 'vagrant/errors'
-require 'vagrant/communication/ssh'
-
-# Helloooooo monkey patching.
-
-class Vagrant::Communication::SSH
-
-  # Download a remote file
-  #
-  # @param [String] from the path on the remote end
-  # @param [String] to   the path on the local end
-  #
-  #
-  def download(from, to)
-    @logger.debug("Downlaoding: #{from} to #{to}")
-
-    connect do |connection|
-      scp = Net::SCP.new(connection)
-      scp.download!(from, to)
-    end
-
-  rescue Net::SCP::Error => e
-    raise Vagrant::Errors::SCPUnavailable if e.message =~ /\(127\)/
-    raise
-  end
-end

data/lib/vagrant_init.rb

@@ -1 +0,0 @@
-require 'vagrant-hosts'