vagrant-hostmanager 1.4.0 → 1.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c46205a89edc88b63ee7d7c113e567fb40b1dc84
+  data.tar.gz: 44bfdd6743cd8b5a9ff8e59369c358a655d1af0d
+SHA512:
+  metadata.gz: 7563696329fd2701f04f66e4ea9b6c9d5d7b172cf67a95a1bb568050226b4f3e63f8c37e2b43384cf2ffc2a6f49df5ca6ca104485663e8eed41a2d911ba23962
+  data.tar.gz: 41666ea71d5427d9e23347474b75287d712540119501a5dde0b6491f3fe2caab188eeff2e2a45854f8370f2fc5ea273d26a5a42589de56bfb2b18b4bf104b92f

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 1.5.0
+### Features
+* hostmanager now runs *before* provisioning takes place, on `up` action [[#73](https://github.com/smdahlen/vagrant-hostmanager/issues/73)]
+
+### Bug fixes
+* properly detect hosts file location on Windows guests [[#67](https://github.com/smdahlen/vagrant-hostmanager/pull/67)]
+* do not add host if IP cannot be determined [[#85](https://github.com/smdahlen/vagrant-hostmanager/pull/85)]
+* force moving of hosts file on Linux guests [[#93](https://github.com/smdahlen/vagrant-hostmanager/pull/93)]
+* allow top-level config options (eg. `ip_resolver`) to propagate to machine configs [[#91](https://github.com/smdahlen/vagrant-hostmanager/issues/91)]
+
+### Miscelaneous
+* add passwordless sudo instructions to README [[#95](https://github.com/smdahlen/vagrant-hostmanager/pull/95)]
+
+[Full diff](https://github.com/smdahlen/vagrant-hostmanager/compare/v1.4.0...v1.5.0)  
+
+
 ## 1.4.0
 ### Features
 * supports vagrant 1.5 [[#80](https://github.com/smdahlen/vagrant-hostmanager/issues/80), [#81](https://github.com/smdahlen/vagrant-hostmanager/pull/81)]

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.5.1'
+  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.6.2'
 end
 
 group :plugins do

data/README.md

@@ -6,7 +6,16 @@ resolution of multi-machine environments deployed with a cloud provider
 where IP addresses are not known in advance.
 
 *NOTE:* Version 1.1 of the plugin prematurely introduced a feature to hook into
-commands other than `vagrant up` and `vagrant destroy`. Version 1.1 broke support for some providers. Version 1.2 reverts this feature until a suitable implementation supporting all providers is available.
+commands other than `vagrant up` and `vagrant destroy`. Version 1.1 broke support
+for some providers. Version 1.2 reverts this feature until a suitable implementation
+supporting all providers is available.
+
+***Potentially breaking change in v1.5.0:*** the running order on `vagrant up` has changed
+so that hostmanager runs before provisioning takes place.  This ensures all hostnames are 
+available to the guest when it is being provisioned 
+(see [#73](https://github.com/smdahlen/vagrant-hostmanager/issues/73)).
+Previously, hostmanager would run as the very last action.  If you depend on the old behavior, 
+see the [provisioner](#provisioner) section.
 
 Installation
 ------------
@@ -61,15 +70,26 @@ Vagrant.configure("2") do |config|
 end
 ```
 
-As a last option, you can use hostmanager as a provisioner.
-This allows you to use the provisioning order to ensure that hostmanager
-runs before or after provisioning. The provisioner will collect hosts from
-boxes with the same provider as the running box.
+### Provisioner
+
+Starting at version 1.5.0, hostmanager runs before any provisioning occurs.  If you 
+would like hostmanager to run after or during your provisioning stage, 
+you can use hostmanager as a provisioner.  This allows you to use the provisioning 
+order to ensure that hostmanager runs when desired. The provisioner will collect
+hosts from boxes with the same provider as the running box.
 
-Use:
+Example:
 
 ```ruby
+# Disable the default hostmanager behavior
+config.hostmanager.enabled = false
+
+# ... possible provisioner config before hostmanager ...
+
+# hostmanager provisioner
 config.vm.provision :hostmanager
+
+# ... possible provisioning config after hostmanager ...
 ```
 
 Custom IP resolver
@@ -92,15 +112,26 @@ config.hostmanager.ip_resolver = proc do |vm, resolving_vm|
 end
 ```
 
+Passwordless sudo
+-----------------
+
+Add  the  following snippet  to  the  sudoers  file (for  example,  to
+```/etc/sudoers.d/vagrant_hostmanager```)  to  make   it  stop  asking
+password when updating hosts  file (replace ```/home/user``` with your
+actual home directory):
+
+    Cmnd_Alias VAGRANT_HOSTMANAGER_UPDATE = /bin/cp /home/user/.vagrant.d/tmp/hosts.local /etc/hosts
+    %sudo ALL=(root) NOPASSWD: VAGRANT_HOSTMANAGER_UPDATE
+
 Windows support
 ---------------
 
-Hostmanager will detect Windows guests and hosts and use the appropriate 
+Hostmanager will detect Windows guests and hosts and use the appropriate
 path for the ```hosts``` file: ```%WINDIR%\System32\drivers\etc\hosts```
 
 By default on a Windows host, the ```hosts``` file is not writable without
 elevated privileges. If hostmanager detects that it cannot overwrite the file,
-it will attempt to do so with elevated privileges, causing the 
+it will attempt to do so with elevated privileges, causing the
 [UAC](http://en.wikipedia.org/wiki/User_Account_Control) prompt to appear.
 
 ### UAC limitations
@@ -108,6 +139,19 @@ it will attempt to do so with elevated privileges, causing the
 Due to limitations caused by UAC, cancelling out of the UAC prompt will not cause any
 visible errors, however the ```hosts``` file will not be updated.
 
+Installing development version
+------------------------------
+
+If you want to install the bleeding version of vagrant-hostmanager (*at your own risk*), you can do the following
+(requires ruby and git):
+
+```
+git clone https://github.com/smdahlen/vagrant-hostmanager.git
+cd vagrant-hostmanager
+rake gem:build
+vagrant plugin install pkg/vagrant-hostmanager-*.gem
+```
+
 Contribute
 ----------
 Contributions are welcome.

data/lib/vagrant-hostmanager/action/update_all.rb

@@ -23,8 +23,6 @@ module VagrantPlugins
         end
 
         def call(env)
-          # skip if machine is already active on up action
-          return @app.call(env) if @machine.id && env[:machine_action] == :up
           # skip if machine is not active on destroy action
           return @app.call(env) if !@machine.id && env[:machine_action] == :destroy
 

data/lib/vagrant-hostmanager/config.rb

@@ -13,20 +13,22 @@ module VagrantPlugins
       alias_method :manage_host?, :manage_host
 
       def initialize
-        @enabled = false
-        @manage_host = UNSET_VALUE
-        @ignore_private_ip = UNSET_VALUE
-        @include_offline = UNSET_VALUE
-        @aliases = []
-        @aliases = Array.new
-        @include_offline = false
-        @ip_resolver = nil
+        @enabled            = UNSET_VALUE
+        @manage_host        = UNSET_VALUE
+        @ignore_private_ip  = UNSET_VALUE
+        @include_offline    = UNSET_VALUE
+        @aliases            = UNSET_VALUE
+        @ip_resolver        = UNSET_VALUE
       end
 
       def finalize!
-        @manage_host = false if @manage_host == UNSET_VALUE
-        @ignore_private_ip = false if @ignore_private_ip == UNSET_VALUE
-        @include_offline = false if @include_offline == UNSET_VALUE
+        @enabled            = false if @enabled == UNSET_VALUE
+        @manage_host        = false if @manage_host == UNSET_VALUE
+        @ignore_private_ip  = false if @ignore_private_ip == UNSET_VALUE
+        @include_offline    = false if @include_offline == UNSET_VALUE
+        @aliases            = [] if @aliases == UNSET_VALUE
+        @ip_resolver        = nil if @ip_resolver == UNSET_VALUE
+
         @aliases = [ @aliases ].flatten
       end
 

data/lib/vagrant-hostmanager/hosts_file.rb

@@ -10,11 +10,15 @@ module VagrantPlugins
           realhostfile = '/etc/inet/hosts'
           move_cmd = 'mv'
         elsif (machine.communicate.test("test -d $Env:SystemRoot"))
-          realhostfile = "#{ENV['WINDIR']}\\System32\\drivers\\etc\\hosts"
+          windir = ""
+          machine.communicate.execute("echo %SYSTEMROOT%", {:shell => :cmd}) do |type, contents|
+            windir << contents.gsub("\r\n", '') if type == :stdout
+          end
+          realhostfile = "#{windir}\\System32\\drivers\\etc\\hosts"
           move_cmd = 'mv -force'
         else 
           realhostfile = '/etc/hosts'
-          move_cmd = 'mv'
+          move_cmd = 'mv -f'
         end
         # download and modify file with Vagrant-managed entries
         file = @global_env.tmp_path.join("hosts.#{machine.name}")
@@ -80,7 +84,9 @@ module VagrantPlugins
         ip = get_ip_address(machine, resolving_machine)
         host = machine.config.vm.hostname || machine.name
         aliases = machine.config.hostmanager.aliases.join(' ').chomp
-        "#{ip}\t#{host} #{aliases}\n"
+        if ip != nil
+          "#{ip}\t#{host} #{aliases}\n"
+        end
       end
 
       def get_ip_address(machine, resolving_machine)

data/lib/vagrant-hostmanager/plugin.rb

@@ -17,7 +17,7 @@ module VagrantPlugins
       end
 
       action_hook(:hostmanager, :machine_action_up) do |hook|
-        hook.prepend(Action.update_all)
+        hook.after(Vagrant::Action::Builtin::Provision, Action.update_all)
       end
 
       action_hook(:hostmanager, :machine_action_destroy) do |hook|

data/lib/vagrant-hostmanager/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostManager
-    VERSION = '1.4.0'
+    VERSION = '1.5.0'
   end
 end

data/test/Vagrantfile

@@ -33,4 +33,9 @@ Vagrant.configure('2') do |config|
     server.vm.network :private_network, :ip => '10.0.5.4'
     server.vm.provision :hostmanager
   end
-end
+
+  config.vm.define :server4 do |server|
+    server.vm.hostname = 'scruffy'
+    server.vm.provision :hostmanager
+  end
+end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hostmanager
 version: !ruby/object:Gem::Version
-  version: 1.4.0
-  prerelease: 
+  version: 1.5.0
 platform: ruby
 authors:
 - Shawn Dahlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,17 +27,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Vagrant plugin that manages the /etc/hosts file within a multi-machine
@@ -76,27 +71,26 @@ files:
 homepage: 
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Vagrant plugin that manages the /etc/hosts file within a multi-machine
   environment
 test_files: