vagrant-hostsupdater 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 7786283817858be33965f444c422ceaeb6097d73
-  data.tar.gz: cbe83dac92dd7f302dcda5424f286a555778eda0
-SHA512: 
-  metadata.gz: 5be6275c2952dcea2287c75484e22a1c2a0283ac6b8a94a6b613f70f10e78390dd4cc15da87d06d4e05ee31b74ebb56790d931d81285579b7cca2333d0a67a55
-  data.tar.gz: 4a5019227644d438edd005b99070c3b41892bec301ea2bb1abcbb63e6c7bb3bf36bb1fc93b19ff3af45dd58a0bedcc50e51ab18a7aa10193d15b9f0d57f2e2ef
+---
+SHA1:
+  metadata.gz: 51ccd0d56a1d0868f7dd00c567834fc5292e51b6
+  data.tar.gz: 0309736e690639b86ce559d0d6530d2e82c3ffdf
+SHA512:
+  metadata.gz: 41c2785d873b31de816a03dce41460927634c033e92c8250f1d62c84b25181db1f9d149d2e7920fdf0f0c3ac07fc792e0270fc8e667617439807fda3b9b65f77
+  data.tar.gz: 3c9b5067f24205f92e7e0a906fcd384e67004d08b3c626958bd41cc5d24c37377f531d1f4c592c45019f233eea44d05c819dc2d8b103e36b6010112a5a803d8b

data/README.md

@@ -9,8 +9,31 @@ By setting the remove\_on\_suspend option, you can have them removed on **suspen
 
     config.hostsupdater.remove_on_suspend = true
 
+
+
+## Installation
+
+    $ vagrant plugin install vagrant-hostsupdater
+
+Uninstall it with:
+
+    $ vagrant plugin uninstall vagrant-hostsupdater
+
+## Usage
+
+At the moment, the only things you need, are the hostname and a :private_network network with a fixed ip.
+
+    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.
+
 ##  Versions
 
+### 0.0.11
+* bugfix: Fix additional new lines being added to hosts file (Thanks to vincentmac)
+
 ### 0.0.10
 * bugfix: wrong path on Windows systems (Thanks to Im0rtality)
 
@@ -36,23 +59,6 @@ By setting the remove\_on\_suspend option, you can have them removed on **suspen
 ### 0.0.3
 * added aliases config option to define additional hostnames
 
-## Installation
-
-    $ vagrant plugin install vagrant-hostsupdater
-
-Uninstall it with:
-
-    $ vagrant plugin uninstall vagrant-hostsupdater
-
-## Usage
-
-At the moment, the only things you need, are the hostname and a :private_network network with a fixed ip.
-
-    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.
 
 ## Contributing
 

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

@@ -0,0 +1,20 @@
+module VagrantPlugins
+  module HostsUpdater
+    module Action
+      class CacheHosts
+        include HostsUpdater
+
+        def initialize(app, env)
+          @app = app
+          @machine = env[:machine]
+        end
+
+        def call(env)
+          cacheHostEntries
+          @app.call(env)
+        end
+
+      end
+    end
+  end
+end

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

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

data/lib/vagrant-hostsupdater/HostsUpdater.rb

@@ -42,14 +42,18 @@ module VagrantPlugins
         addToHosts(entries)
       end
 
+      def cacheHostEntries
+        @machine.config.hostsupdater.id = @machine.id
+      end
+
       def removeHostEntries
-        if !@machine.id
+        if !@machine.id and !@machine.config.hostsupdater.id
           @ui.warn "No machine id, nothing removed from #@@hosts_path"
           return
         end
         file = File.open(@@hosts_path, "rb")
         hostsContents = file.read
-        uuid = @machine.id
+        uuid = @machine.id || @machine.config.hostsupdater.id
         hashedId = Digest::MD5.hexdigest(uuid)
         if hostsContents.match(/#{hashedId}/)
             removeFromHosts
@@ -70,20 +74,19 @@ module VagrantPlugins
 
       def addToHosts(entries)
         return if entries.length == 0
-        content = "\n" + entries.join("\n").strip
+        content = entries.join("\n").strip
         if !File.writable?(@@hosts_path)
           sudo(%Q(sh -c 'echo "#{content}" >> #@@hosts_path'))
         else
+          content = "\n" + content
           hostsFile = File.open(@@hosts_path, "a")
           hostsFile.write(content)
           hostsFile.close()
         end
-
-
       end
 
       def removeFromHosts(options = {})
-        uuid = @machine.id
+        uuid = @machine.id || @machine.config.hostsupdater.id
         hashedId = Digest::MD5.hexdigest(uuid)
         if !File.writable?(@@hosts_path)
           sudo(%Q(sed -i -e '/#{hashedId}/ d' #@@hosts_path))
@@ -115,4 +118,4 @@ module VagrantPlugins
       end
     end
   end
-end
+end

data/lib/vagrant-hostsupdater/config.rb

@@ -4,6 +4,7 @@ module VagrantPlugins
   module HostsUpdater
     class Config < Vagrant.plugin("2", :config)
         attr_accessor :aliases
+        attr_accessor :id
         attr_accessor :remove_on_suspend
     end
   end

data/lib/vagrant-hostsupdater/plugin.rb

@@ -1,4 +1,5 @@
 require "vagrant-hostsupdater/Action/UpdateHosts"
+require "vagrant-hostsupdater/Action/CacheHosts"
 require "vagrant-hostsupdater/Action/RemoveHosts"
 
 module VagrantPlugins
@@ -28,7 +29,11 @@ module VagrantPlugins
       end
 
       action_hook(:hostsupdater, :machine_action_destroy) do |hook|
-        hook.prepend(Action::RemoveHosts)
+        hook.prepend(Action::CacheHosts)
+      end
+
+      action_hook(:hostsupdater, :machine_action_destroy) do |hook|
+        hook.append(Action::RemoveHosts)
       end
 
       action_hook(:hostsupdater, :machine_action_reload) do |hook|

data/lib/vagrant-hostsupdater/version.rb

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

metadata

@@ -1,53 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: vagrant-hostsupdater
-version: !ruby/object:Gem::Version 
-  version: 0.0.10
+version: !ruby/object:Gem::Version
+  version: 0.0.11
 platform: ruby
-authors: 
-- "Falk K\xC3\xBChnel"
+authors:
+- Falk Kühnel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-07-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.3"
+date: 2013-10-31 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id003 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables Vagrant to update hosts file on the host machine
-email: 
+email:
 - fk@cogitatio.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/vagrant-hostsupdater.rb
+- lib/vagrant-hostsupdater/Action/CacheHosts.rb
 - lib/vagrant-hostsupdater/Action/RemoveHosts.rb
 - lib/vagrant-hostsupdater/Action/UpdateHosts.rb
 - lib/vagrant-hostsupdater/HostsUpdater.rb
@@ -57,27 +61,27 @@ files:
 - lib/vagrant-hostsupdater/version.rb
 - vagrant-hostsupdater.gemspec
 homepage: https://github.com/cogitatio/vagrant-hostsupdater
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+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.3
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to update hosts file on the host machine
 test_files: []
-