vagrant-hostsupdater 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2a17cded96ebcabea7b7c83fe53a211fec0f67d
-  data.tar.gz: b78d9ce4c6ad59cf4b84e21b20cf757bd20babab
+  metadata.gz: 87d31195aa3a4364f58076f77881ec0d1a638622
+  data.tar.gz: d22efc10a7f881792bb32312d844cf6df7cf09b3
 SHA512:
-  metadata.gz: e050e308db233943db5d919bdc29e955ac2107dac000e55d2c5cb126347dad34b48b20e7d6a020c606f38d77e06866e0790db0e203841b917bfb723a87a78db7
-  data.tar.gz: 0e9ab9617ce0683000bda509941020f2f8540c49a0664a9db48c78ad330ecff32a9f901dfe2ab2bc78a9c563663f7ab933bdabdb99ef03bdfb8eaf129bd2bad3
+  metadata.gz: 0207909fa1335e2a9eab4d049b2a27d3e821667243280fe50dccc580f13c9325982dcc9323ccda52f0cc764b5a306e4f36a253e9ff81e8520ad6a58cb76d26b3
+  data.tar.gz: 9fbdd20e07f2c0c1c2f6b085915fed97acdbd7c7469f29d49fcc6b121640e2adf9a78e6a0ed0348390925a82fd84a7b86b770b87b22a3aa8a01b6b390b771c35

data/.gitignore

@@ -1,4 +1,5 @@
 *.gem
+.idea
 *.rbc
 .bundle
 .config

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 Falk Kühnel
+Copyright (c) 2016 Falk Kühnel
 
 MIT License
 

data/README.md

@@ -13,7 +13,7 @@ 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. 
+By setting the `config.hostsupdater.remove_on_suspend  = false`, **suspend** and **halt** will not remove them. 
 
 
 ## Installation
@@ -52,6 +52,14 @@ Example:
         netmask: "255.255.240.0",
         hostsupdater: "skip"
         
+### Keeping Host Entries After Suspend/Halt
+
+To keep your /etc/hosts file unchanged simply add the line below to your `VagrantFile`:
+
+    config.hostsupdater.resume_on_suspend = false
+    
+This disables vagrant-hostsupdater from running on **suspend** and **halt**.
+        
 
 ## Passwordless sudo
 
@@ -88,6 +96,12 @@ vagrant plugin install vagrant-hostsupdater-*.gem
 
 ## Versions
 
+### 1.0.2
+* Feature: Added `remove_on_suspend` for `vagrant_halt` [#71](/../../issues/71)
+* Feature: Skip entries if they already exist [#69](/../../issues/69)
+* Bugfix: Fixing extra lines in /etc/hosts file [#87](/../../pull/87)
+* Misc: Fix yellow text on UI [#39](/../../issues/39)
+
 ### 1.0.1
 * Bugfix: Fixing `up` issue on initialize [#28](/../../issues/28)
 

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

@@ -14,10 +14,12 @@ module VagrantPlugins
           machine_action = env[:machine_action]
           if machine_action != :destroy || !@machine.id
             if machine_action != :suspend || false != @machine.config.hostsupdater.remove_on_suspend
-              @ui.info "Removing hosts"
-              removeHostEntries
-            else
-              @ui.info "Removing hosts on suspend disabled"
+              if machine_action != :halt || false != @machine.config.hostsupdater.remove_on_suspend
+                @ui.info "[vagrant-hostsupdater] Removing hosts"
+                removeHostEntries
+              else
+                @ui.info "[vagrant-hostsupdater] Removing hosts on suspend disabled"
+              end
             end
           end
           @app.call(env)

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

@@ -13,7 +13,7 @@ module VagrantPlugins
         end
 
         def call(env)
-          @ui.info "Checking for host entries"
+          @ui.info "[vagrant-hostsupdater] Checking for host entries"
           addHostEntries()
           @app.call(env)
         end

data/lib/vagrant-hostsupdater/HostsUpdater.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
           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)'
+            @ui.info '[vagrant-hostsupdater] Skipping adding host entries (config.vm.network hostsupdater: "skip" is set)'
           end
         end
         return ips
@@ -33,11 +33,13 @@ module VagrantPlugins
         name = @machine.name
         entries = []
         ips.each do |ip|
-          hostEntries = getHostEntries(ip, hostnames, name, uuid)
-          hostEntries.each do |hostEntry|
-            escapedEntry = Regexp.quote(hostEntry)
-            if !hostsContents.match(/#{escapedEntry}/)
-              @ui.info "adding to (#@@hosts_path) : #{hostEntry}"
+          hostnames.each do |hostname|
+            entryPattern = hostEntryPattern(ip, hostname)
+
+            if hostsContents.match(/#{entryPattern}/)
+              @ui.info "[vagrant-hostsupdater]   found entry for: #{ip} #{hostname}"
+            else
+              hostEntry = createHostEntry(ip, hostname, name, uuid)
               entries.push(hostEntry)
             end
           end
@@ -51,7 +53,7 @@ module VagrantPlugins
 
       def removeHostEntries
         if !@machine.id and !@machine.config.hostsupdater.id
-          @ui.warn "No machine id, nothing removed from #@@hosts_path"
+          @ui.info "[vagrant-hostsupdater] No machine id, nothing removed from #@@hosts_path"
           return
         end
         file = File.open(@@hosts_path, "rb")
@@ -67,19 +69,30 @@ module VagrantPlugins
         %Q(#{ip}  #{hostnames.join(' ')}  #{signature(name, uuid)})
       end
 
-      def getHostEntries(ip, hostnames, name, uuid = self.uuid)
-        entries = []
-        hostnames.each do |hostname|
-          entries.push(%Q(#{ip}  #{hostname}  #{signature(name, uuid)}))
-        end
-        return entries
+      def createHostEntry(ip, hostname, name, uuid = self.uuid)
+        %Q(#{ip}  #{hostname}  #{signature(name, uuid)})
+      end
+
+      # Create a regular expression that will match *any* entry describing the
+      # given IP/hostname pair. This is intentionally generic in order to
+      # recognize entries created by the end user.
+      def hostEntryPattern(ip, hostname)
+        Regexp.new('^\s*' + ip + '\s+' + hostname + '\s*(#.*)?$')
       end
 
       def addToHosts(entries)
         return if entries.length == 0
-        content = entries.join("\n").strip.concat("\n")
+        content = entries.join("\n").strip
+
+        @ui.info "[vagrant-hostsupdater] Writing the following entries to (#@@hosts_path)"
+        @ui.info "[vagrant-hostsupdater]   " + entries.join("\n[vagrant-hostsupdater]   ")
+        @ui.info "[vagrant-hostsupdater] This operation requires administrative access. You may " +
+          "skip it by manually adding equivalent entries to the hosts file."
         if !File.writable_real?(@@hosts_path)
-          sudo(%Q(sh -c 'echo "#{content}" >> #@@hosts_path'))
+          if !sudo(%Q(sh -c 'echo "#{content}" >> #@@hosts_path'))
+            @ui.error "[vagrant-hostsupdater] Failed to add hosts, could not use sudo"
+            adviseOnSudo
+          end
         else
           content = "\n" + content
           hostsFile = File.open(@@hosts_path, "a")
@@ -92,7 +105,10 @@ module VagrantPlugins
         uuid = @machine.id || @machine.config.hostsupdater.id
         hashedId = Digest::MD5.hexdigest(uuid)
         if !File.writable_real?(@@hosts_path)
-          sudo(%Q(sed -i -e '/#{hashedId}/ d' #@@hosts_path))
+          if !sudo(%Q(sed -i -e '/#{hashedId}/ d' #@@hosts_path))
+            @ui.error "[vagrant-hostsupdater] Failed to remove hosts, could not use sudo"
+            adviseOnSudo
+          end
         else
           hosts = ""
           File.open(@@hosts_path).each do |line|
@@ -116,9 +132,14 @@ module VagrantPlugins
         if Vagrant::Util::Platform.windows?
           `#{command}`
         else
-          `sudo #{command}`
+          return system("sudo #{command}")
         end
       end
+
+      def adviseOnSudo
+        @ui.error "[vagrant-hostsupdater] Consider adding the following to your sudoers file:"
+        @ui.error "[vagrant-hostsupdater]   https://github.com/cogitatio/vagrant-hostsupdater#passwordless-sudo"
+      end
     end
   end
 end

data/lib/vagrant-hostsupdater/plugin.rb

@@ -17,8 +17,7 @@ module VagrantPlugins
       end
 
       action_hook(:hostsupdater, :machine_action_up) do |hook|
-        hook.prepend(Action::RemoveHosts)
-        hook.after(Vagrant::Action::Builtin::SetHostname, Action::UpdateHosts)
+        hook.append(Action::UpdateHosts)
       end
 
       action_hook(:hostsupdater, :machine_action_provision) do |hook|

data/lib/vagrant-hostsupdater/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostsUpdater
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hostsupdater
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Falk Kühnel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-09 00:00:00.000000000 Z
+date: 2016-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler