vagrant-hosts 2.1.5 → 2.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7e35165882b1b5100f44d6d9f8b1840ee94cfe6b
-  data.tar.gz: 8a9eaed2d3a1a7d080fc9afb8867285c8a66707a
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NmEyNTU5YzljMjY1ZDU2YWRhYWY1YWY1MThiNjgyNTIwMmM0N2RjZQ==
+  data.tar.gz: !binary |-
+    Y2YwNWQ5ZmRlZTMxNzBmNTE5OTU0OWYzNDFkMDEwNjllOTY2YTE1Yw==
 SHA512:
-  metadata.gz: e85b8efdec1f5750c953c6e6613b7e594d367ad9eb4eb7f8140f48cfec4b8440ae347572b4227ad2a69e5ca314d2d5437d614d781811f66f26b2af2a24979f16
-  data.tar.gz: 0066aa51ff0fac2a5380de30b3356f2cd0369e8d0ce8984b966c1439e1716fa98fdba87a63e866516d49619855b67d30206d1c864f2a3f3185e3409846dbe810
+  metadata.gz: !binary |-
+    YWQ0YTU2OTgwMzRiYzQxNTkwNGUxMjNjMGU2ZjQ2YThlNWIzMmQwMjk1OGNl
+    ZmEzY2RiYTdkMTg1ZDc0ZWY4ZWZiNWE4NTVmYjViMDRmYWZkZGJlYmUxNjBi
+    NmVlOTFmMjE1NDllNTVhYzIyZWNmOTYwZGQ5NTY1MjJlNzMwNTI=
+  data.tar.gz: !binary |-
+    YzNiNWUxM2JjNzAwOTZjZWE5ZDhjMzgxNTkzMzU0OTBiMmRkYWUzNjZjOTk2
+    ZThkNTM3MzFkZmRlYzkyNTllYWUyODM0OWEwODFjMDdjZTY3NmJlMjg0YjQ2
+    ZWQwZTMxMDBkZGUyMTljZmRhZGM0Y2FkMjA0OTc5Y2JiOTA4NTc=

data/CHANGELOG

@@ -1,6 +1,18 @@
 CHANGELOG
 =========
 
+2.2.0
+-----
+
+2014-07-30
+
+This is a backwards compatible feature release
+
+  * (GH-24) Allow users to enable/disable localhost entries
+  * (GH-35) Add support for OSX guests
+
+Thanks to Jeff Goldschrafe for their work on this release.
+
 2.1.5
 -----
 

data/README.markdown

@@ -8,73 +8,79 @@ Synopsis
 
 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']
-
-        # Or as many aliases as you like!
-        provisioner.add_host '10.0.2.5', [
-          'mypuppetmaster.vagrantup.internal',
-          'puppet.vagrantup.internal',
-          'mypuppetmaster',
-          'puppet'
-        ]
-      end
-    end
+```ruby
+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']
+
+    # Or as many aliases as you like!
+    provisioner.add_host '10.0.2.5', [
+      'mypuppetmaster.vagrantup.internal',
+      'puppet.vagrantup.internal',
+      'mypuppetmaster',
+      'puppet'
+    ]
+  end
+end
+```
 
 - - -
 
 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
+```ruby
+# 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
+```ruby
+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
 -------------------

data/lib/vagrant-hosts/addresses.rb

@@ -3,9 +3,8 @@ module VagrantHosts::Addresses
   private
 
   def all_hosts(config)
-
     all_hosts = []
-    all_hosts += local_hosts(@machine)
+    all_hosts += local_hosts(@machine, config)
 
     if config.autoconfigure
       all_hosts += vagrant_hosts(@env)
@@ -30,11 +29,14 @@ module VagrantHosts::Addresses
     hostnames
   end
 
-  def local_hosts(machine)
-    [
-      ['127.0.0.1', ['localhost']],
-      ['127.0.1.1', hostnames_for_machine(machine)],
-    ]
+  def local_hosts(machine, config)
+    entries = [['127.0.0.1', ['localhost']]]
+
+    if config.add_localhost_hostnames
+      entries << ['127.0.1.1', hostnames_for_machine(machine)]
+    end
+
+    entries
   end
 
   def vagrant_hosts(env)

data/lib/vagrant-hosts/config.rb

@@ -12,9 +12,12 @@ module VagrantHosts
     #                                   other vagrant machines
     attr_accessor :autoconfigure
 
+    attr_accessor :add_localhost_hostnames
+
     def initialize
       @hosts = []
       @autoconfigure = UNSET_VALUE
+      @add_localhost_hostnames = UNSET_VALUE
     end
 
     # Register a host for entry
@@ -42,6 +45,10 @@ module VagrantHosts
           @autoconfigure = false
         end
       end
+
+      if @add_localhost_hostnames == UNSET_VALUE
+        @add_localhost_hostnames = true
+      end
     end
 
     # @param other [VagrantHosts::Config]

data/lib/vagrant-hosts/plugin.rb

@@ -22,14 +22,11 @@ class VagrantHosts::Plugin < Vagrant.plugin(2)
 
   # Guest capabilities for vagrant-hosts
 
-  guest_capability(:linux, 'sync_hosts') do
-    require_relative 'cap'
-    VagrantHosts::Cap::SyncHosts::POSIX
-  end
-
-  guest_capability(:solaris, 'sync_hosts') do
-    require_relative 'cap'
-    VagrantHosts::Cap::SyncHosts::POSIX
+  [:darwin, :linux, :solaris].each do |os|
+    guest_capability(os, 'sync_hosts') do
+      require_relative 'cap'
+      VagrantHosts::Cap::SyncHosts::POSIX
+    end
   end
 
   guest_capability(:windows, 'sync_hosts') do

data/lib/vagrant-hosts/version.rb

@@ -1,3 +1,3 @@
 module VagrantHosts
-  VERSION = '2.1.5'
+  VERSION = '2.2.0'
 end

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hosts
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.2.0
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies: []
-description: |2
-      Manage static DNS entries and configuration for Vagrant guests.
+description: ! '    Manage static DNS entries and configuration for Vagrant guests.
+
+'
 email: adrien@somethingsinistral.net
 executables: []
 extensions: []
@@ -47,18 +48,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Manage static DNS on vagrant guests
 test_files: []
+has_rdoc: true