vagrant-hostsupdater 0.0.11 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51ccd0d56a1d0868f7dd00c567834fc5292e51b6
-  data.tar.gz: 0309736e690639b86ce559d0d6530d2e82c3ffdf
+  metadata.gz: aa5a906b2206c4c30ffc719ea0b078317cd884c8
+  data.tar.gz: a8f1c3bd95b09e2d604a11a3c9281c904edeedc4
 SHA512:
-  metadata.gz: 41c2785d873b31de816a03dce41460927634c033e92c8250f1d62c84b25181db1f9d149d2e7920fdf0f0c3ac07fc792e0270fc8e667617439807fda3b9b65f77
-  data.tar.gz: 3c9b5067f24205f92e7e0a906fcd384e67004d08b3c626958bd41cc5d24c37377f531d1f4c592c45019f233eea44d05c819dc2d8b103e36b6010112a5a803d8b
+  metadata.gz: dbe7a6d519649649a9373b618176d13871fb442d2be630bb29fefe980bb5bbacabf3108d3a779bab82de53c460b61e1e77cae722940461913ad0ec072d17d4dd
+  data.tar.gz: d004fb3ec7fde2201ae3b0eb67470cb4ae853c95b587b37536456ed788ccba65a6ce6aff686be481eff64e0287c96519878008cefe9193aba2ebf2bd20031d08

data/Gemfile

@@ -1,50 +1,9 @@
-$:.unshift File.expand_path("../lib", __FILE__)
+source 'https://rubygems.org'
 
-Gem::Specification.new do |s|
-  s.name          = "vagrant-hostsupdater"
-  s.version       = 0.2
-  s.platform      = Gem::Platform::RUBY
-  s.authors       = "Falk Kühnel"
-  s.email         = "fk@cogitatio.de"
-  s.homepage      = "https://github.com/cogitatio/vagrant-hostsupdater"
-  s.summary       = "Enables Vagrant to update hosts file on the host machine"
-  s.description   = "Enables Vagrant to update hosts file on the host machine"
-
-
-  # s.add_development_dependency "rake"
-
-  # # The following block of code determines the files that should be included
-  # # in the gem. It does this by reading all the files in the directory where
-  # # this gemspec is, and parsing out the ignored files from the gitignore.
-  # # Note that the entire gitignore(5) syntax is not supported, specifically
-  # # the "!" syntax, but it should mostly work correctly.
-  # root_path      = File.dirname(__FILE__)
-  # all_files      = Dir.chdir(root_path) { Dir.glob("**/{*,.*}") }
-  # all_files.reject! { |file| [".", ".."].include?(File.basename(file)) }
-  # gitignore_path = File.join(root_path, ".gitignore")
-  # gitignore      = File.readlines(gitignore_path)
-  # gitignore.map!    { |line| line.chomp.strip }
-  # gitignore.reject! { |line| line.empty? || line =~ /^(#|!)/ }
-
-  # unignored_files = all_files.reject do |file|
-  #   # Ignore any directories, the gemspec only cares about files
-  #   next true if File.directory?(file)
-
-  #   # Ignore any paths that match anything in the gitignore. We do
-  #   # two tests here:
-  #   #
-  #   #   - First, test to see if the entire path matches the gitignore.
-  #   #   - Second, match if the basename does, this makes it so that things
-  #   #     like '.DS_Store' will match sub-directories too (same behavior
-  #   #     as git).
-  #   #
-  #   gitignore.any? do |ignore|
-  #     File.fnmatch(ignore, file, File::FNM_PATHNAME) ||
-  #       File.fnmatch(ignore, File.basename(file), File::FNM_PATHNAME)
-  #   end
-  # end
-
-  # s.files         = unignored_files
-  # s.executables   = unignored_files.map { |f| f[/^bin\/(.*)/, 1] }.compact
-  # s.require_path  = 'lib'
+group :development do
+  gem 'vagrant', :git => 'git://github.com/mitchellh/vagrant.git', :tag => 'v1.6.2'
 end
+
+group :plugins do
+  gemspec
+end

data/README.md

@@ -1,14 +1,19 @@
 # Vagrant::Hostsupdater
 
-This plugin adds an entry to your /etc/hosts file on the host system.
+[![Gem Version](https://badge.fury.io/rb/vagrant-hostsupdater.svg)](https://badge.fury.io/rb/vagrant-hostsupdater)
+[![Gem](https://img.shields.io/gem/dt/vagrant-hostsupdater.svg)](https://rubygems.org/gems/vagrant-hostsupdater)
+[![Gem](https://img.shields.io/gem/dtv/vagrant-hostsupdater.svg)](https://rubygems.org/gems/vagrant-hostsupdater)
 
-On **up**, **resume** and **reload** commands, it tries to add the information, if its not already existant in your hosts file. If it needs to be added, you will be asked for an administrator password, since it uses sudo to edit the file.
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cogitatio/vagrant-hostsupdater?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+[![Twitter](https://img.shields.io/twitter/url/https/github.com/cogitatio/vagrant-hostsupdater.svg?style=social)](https://twitter.com/intent/tweet?text=Checkout%20this%20awesome%20Vagrant%20plugin!&url=https%3A%2F%2Fgithub.com%2Fcogiatio%2Fvagrant-hostsupdater&hashtags=hostsupdater,vagrant)
 
-On **halt** and **destroy**, those entries will be removed again.
-By setting the remove\_on\_suspend option, you can have them removed on **suspend**, too:
 
-    config.hostsupdater.remove_on_suspend = true
+This plugin adds an entry to your /etc/hosts file on the host system.
+
+On **up**, **resume** and **reload** commands, it tries to add the information, if its not already existant in your hosts file. If it needs to be added, you will be asked for an administrator password, since it uses sudo to edit the file.
 
+On **halt**, **destroy**, and **suspend**, those entries will be removed again.
+By setting the `config.hostsupdater.remove_on_suspend  = false`, **suspend** will not remove them. 
 
 
 ## Installation
@@ -19,17 +24,80 @@ Uninstall it with:
 
     $ vagrant plugin uninstall vagrant-hostsupdater
 
+Update the plugin with:
+
+    $ vagrant plugin update vagrant-hostsupdater
+
 ## Usage
 
-At the moment, the only things you need, are the hostname and a :private_network network with a fixed ip.
+You currently only need the `hostname` and a `:private_network` network with a fixed IP address.
 
     config.vm.network :private_network, ip: "192.168.3.10"
     config.vm.hostname = "www.testing.de"
     config.hostsupdater.aliases = ["alias.testing.de", "alias2.somedomain.com"]
 
-This ip and the hostname will be used for the entry in the /etc/hosts file.
+This IP address and the hostname will be used for the entry in the `/etc/hosts` file.
+
+### Skipping hostupdater
+
+To skip adding some entries to the /etc/hosts file add `hostsupdater: "skip"` option to network configuration:
 
-##  Versions
+    config.vm.network "private_network", ip: "172.21.9.9", hostsupdater: "skip"
+
+Example:
+
+    config.vm.network :private_network, ip: "192.168.50.4"
+    config.vm.network :private_network,
+        ip: "172.21.9.9",
+        netmask: "255.255.240.0",
+        hostsupdater: "skip"
+        
+
+## Passwordless sudo
+
+Add the following snippet to the sudoers file (for example, to `/etc/sudoers.d/vagrant_hostupdater`) to make it
+stop asking password when updating hosts file:
+
+    # Allow passwordless startup of Vagrant with vagrant-hostsupdater.
+    Cmnd_Alias VAGRANT_HOSTS_ADD = /bin/sh -c echo "*" >> /etc/hosts
+    Cmnd_Alias VAGRANT_HOSTS_REMOVE = /usr/bin/sed -i -e /*/ d /etc/hosts
+    %sudo ALL=(root) NOPASSWD: VAGRANT_HOSTS_ADD, VAGRANT_HOSTS_REMOVE
+        
+
+## Installing development version
+
+If you would like to install vagrant-hostsupdater on the development version perform the following:
+
+```
+git clone https://github.com/cogitatio/vagrant-hostsupdater
+cd vagrant-hostsupdater
+git checkout develop
+gem build vagrant-hostsupdater.gemspec
+vagrant plugin install vagrant-hostsupdater-*.gem
+```
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request on the `develop` branch
+
+
+## Versions
+
+### 1.0.0
+* Stable release
+* Feature: Added `skip` flag [#69](/../../issues/69)
+* Feature: Hosts update on provision action [#65](/../../issues/65)
+* Bugfix: `remove_on_suspend` should be true [#19](/../../issues/19)
+* Bugfix: Line break not inserted before first host [#37](/../../issues/37)
+* Bugfix: Old changes not removed in linux [#67](/../../issues/67)
+* Bugfix: Writable issue on OSX [#47](/../../issues/47)
+* Bugfix: Update hosts before provisioning [#31](/../../issues/31)
+* Misc: Using Semantic Versioning for version number
+* Misc: Added note regarding sudoers file
 
 ### 0.0.11
 * bugfix: Fix additional new lines being added to hosts file (Thanks to vincentmac)
@@ -57,13 +125,4 @@ This ip and the hostname will be used for the entry in the /etc/hosts file.
 * fixed problem with removing hosts entries on destroy command (Thanks to Andy Bohne)
 
 ### 0.0.3
-* added aliases config option to define additional hostnames
-
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+* added aliases config option to define additional hostnames

data/lib/vagrant-hostsupdater/Action/RemoveHosts.rb

@@ -13,7 +13,7 @@ module VagrantPlugins
         def call(env)
           machine_action = env[:machine_action]
           if machine_action != :destroy || !@machine.id
-            if machine_action != :suspend || @machine.config.hostsupdater.remove_on_suspend
+            if machine_action != :suspend || false != @machine.config.hostsupdater.remove_on_suspend
               @ui.info "Removing hosts"
               removeHostEntries
             else

data/lib/vagrant-hostsupdater/Action/UpdateHosts.rb

@@ -14,8 +14,8 @@ module VagrantPlugins
 
         def call(env)
           @ui.info "Checking for host entries"
-          @app.call(env)
           addHostEntries()
+          @app.call(env)
         end
 
       end

data/lib/vagrant-hostsupdater/HostsUpdater.rb

@@ -7,8 +7,11 @@ module VagrantPlugins
         ips = []
         @machine.config.vm.networks.each do |network|
           key, options = network[0], network[1]
-          ip = options[:ip] if key == :private_network
+          ip = options[:ip] if (key == :private_network || key == :public_network) && options[:hostsupdater] != "skip"
           ips.push(ip) if ip
+          if options[:hostsupdater] == 'skip'
+            @ui.info 'Skipping adding host entries (config.vm.network hostsupdater: "skip" is set)'
+          end
         end
         return ips
       end
@@ -74,8 +77,8 @@ module VagrantPlugins
 
       def addToHosts(entries)
         return if entries.length == 0
-        content = entries.join("\n").strip
-        if !File.writable?(@@hosts_path)
+        content = entries.join("\n").strip.concat("\n")
+        if !File.writable_real?(@@hosts_path)
           sudo(%Q(sh -c 'echo "#{content}" >> #@@hosts_path'))
         else
           content = "\n" + content
@@ -88,7 +91,7 @@ module VagrantPlugins
       def removeFromHosts(options = {})
         uuid = @machine.id || @machine.config.hostsupdater.id
         hashedId = Digest::MD5.hexdigest(uuid)
-        if !File.writable?(@@hosts_path)
+        if !File.writable_real?(@@hosts_path)
           sudo(%Q(sed -i -e '/#{hashedId}/ d' #@@hosts_path))
         else
           hosts = ""

data/lib/vagrant-hostsupdater/plugin.rb

@@ -17,7 +17,12 @@ module VagrantPlugins
       end
 
       action_hook(:hostsupdater, :machine_action_up) do |hook|
-        hook.append(Action::UpdateHosts)
+        hook.prepend(Action::RemoveHosts)
+        hook.after(Action::RemoveHosts, Action::UpdateHosts)
+      end
+
+      action_hook(:hostsupdater, :machine_action_provision) do |hook|
+        hook.before(Vagrant::Action::Builtin::Provision, Action::UpdateHosts)
       end
 
       action_hook(:hostsupdater, :machine_action_halt) do |hook|
@@ -37,10 +42,12 @@ module VagrantPlugins
       end
 
       action_hook(:hostsupdater, :machine_action_reload) do |hook|
+        hook.prepend(Action::RemoveHosts)
         hook.append(Action::UpdateHosts)
       end
 
       action_hook(:hostsupdater, :machine_action_resume) do |hook|
+        hook.prepend(Action::RemoveHosts)
         hook.append(Action::UpdateHosts)
       end
 

data/lib/vagrant-hostsupdater/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostsUpdater
-    VERSION = "0.0.11"
+    VERSION = "1.0.0"
   end
 end

data/vagrant-hostsupdater.gemspec

@@ -4,20 +4,20 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vagrant-hostsupdater/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "vagrant-hostsupdater"
+  spec.name          = 'vagrant-hostsupdater'
   spec.version       = VagrantPlugins::HostsUpdater::VERSION
-  spec.authors       = ["Falk Kühnel"]
-  spec.email         = ["fk@cogitatio.de"]
+  spec.authors       = ['Falk Kühnel', 'Chris Smith']
+  spec.email         = ['fk@cogitatio.de', 'chris@cgsmith.net']
   spec.description   = %q{Enables Vagrant to update hosts file on the host machine}
-  spec.summary       = %q{Enables Vagrant to update hosts file on the host machine}
-  spec.homepage      = "https://github.com/cogitatio/vagrant-hostsupdater"
-  spec.license       = "MIT"
+  spec.summary       = spec.description
+  spec.homepage      = 'https://github.com/cogitatio/vagrant-hostsupdater'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
 end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hostsupdater
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 1.0.0
 platform: ruby
 authors:
 - Falk Kühnel
+- Chris Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2015-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -41,6 +42,7 @@ dependencies:
 description: Enables Vagrant to update hosts file on the host machine
 email:
 - fk@cogitatio.de
+- chris@cgsmith.net
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -80,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine