vagrant-hostsupdater 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: 092e9d19e52604448eef2935325883f9f9a1406d
-  data.tar.gz: df0ef378226ef4c9bdb7194546f0a8dee36aad0d
 SHA512: 
-  metadata.gz: 5403a44f9eb9389019bcfbf947b0df3a1b64abc0de2b6f7fe8f6abdfbfa2d5b0896cb1c11287b26a5baec29ce1b0e70085865abbe04c285d09fccfa47701ec45
-  data.tar.gz: fc3bf266de0209b090151fa7dcfa56a7339da8e5e6a101fa8239d10ae667e0670f1266683604df1a1d2bf49415a5f26fd315ba7b08d9d8ea7f79854afa08c4c7
+  metadata.gz: c56f591feb65c66cde8837ca645e19143fcbdb3b015d726725003d7cae3df670949708cb63c5749216b5683d4e24b7d020570093a1a33245494c941c4283ef00
+  data.tar.gz: 958b809be3ea034db7872553836c8d232620be3677e8992202eca4975df942ef0f4bd63d2301b8c32a05939a6fe4b7c50d10c747d6cbada3ab4ebfa56555e335
+SHA1: 
+  metadata.gz: 2a7afc721f01110c8c34b3e35fb33efcf3b27893
+  data.tar.gz: bbc27f75779ed6de5b56f04224096d3bb40f42ff

data/README.md

@@ -11,6 +11,9 @@ By setting the remove\_on\_suspend option, you can have them removed on **suspen
 
 ##  Versions
 
+### 0.0.8
+* trying to use proper windows hosts file
+
 ### 0.0.7
 * using hashed uids now to identify hosts entries (you might need to remove previous hostentries manually)
 * fixed removing of host entries

data/lib/vagrant-hostsupdater/HostsUpdater.rb

@@ -1,9 +1,7 @@
 module VagrantPlugins
   module HostsUpdater
     module HostsUpdater
-      def test
-        puts "jawoll"
-      end
+      @@hosts_path = Vagrant::Util::Platform.windows? ? File.expand_path('system32/drivers/etc/hosts', ENV['windir']) : '/etc/hosts'
 
       def getIps
         ips = []
@@ -36,24 +34,16 @@ module VagrantPlugins
           hostEntries.each do |hostEntry|
             escapedEntry = Regexp.quote(hostEntry)
             if !hostsContents.match(/#{escapedEntry}/)
-              @ui.info "pushing #{hostEntry}"
+              @ui.info "adding to (#@@hosts_path) : #{hostEntry}"
               entries.push(hostEntry)
             end
           end
         end
-        @ui.info entries
-        if !File.writable?("/etc/hosts")
-          sudo(addToHosts(entries))
-        else
-          command = addToHosts(entries)
-          @ui.info command
-          `#{command}`
-        end
-
+        addToHosts(entries)
       end
 
       def removeHostEntries
-        file = File.open("/etc/hosts", "rb")
+        file = File.open(@@hosts_path, "rb")
         hostsContents = file.read
         uuid = @machine.id
         hashedId = Digest::MD5.hexdigest(uuid)
@@ -76,21 +66,30 @@ module VagrantPlugins
 
       def addToHosts(entries)
         return if entries.length == 0
-        hosts_path = '/etc/hosts'
         content = entries.join("\n")
-        %Q(sh -c 'echo "#{content}" >>#{hosts_path}')
+        if !File.writable?(@@hosts_path)
+          sudo(%Q(sh -c 'echo "#{content}" >> #@@hosts_path'))
+        else
+          hostsFile = File.open(@@hosts_path, "a")
+          hostsFile.write(content)
+          hostsFile.close()
+        end
+
+
       end
 
       def removeFromHosts(options = {})
-        hosts_path = '/etc/hosts'
         uuid = @machine.id
         hashedId = Digest::MD5.hexdigest(uuid)
-        if !File.writable?("/etc/hosts")
-          sudo(%Q(sed -i -e '/#{hashedId}/ d' #{hosts_path}))
+        if !File.writable?(@@hosts_path)
+          sudo(%Q(sed -i -e '/#{hashedId}/ d' #@@hosts_path))
         else
-          output = `sed -e "/#{hashedId}/ d" #{hosts_path}`
-          hostsFile = File.open(hosts_path, "w")
-          hostsFile.write(output)
+          hosts = ""
+          File.open(@@hosts_path).each do |line|
+            hosts << line unless line.include?(hashedId)
+          end
+          hostsFile = File.open(@@hosts_path, "w")
+          hostsFile.write(hosts)
           hostsFile.close()
         end
       end
@@ -104,11 +103,11 @@ module VagrantPlugins
 
       def sudo(command)
         return if !command
-        # if Util::Platform.windows?
-        #   `#{command}`
-        # else
+        if Vagrant::Util::Platform.windows?
+          `#{command}`
+        else
           `sudo #{command}`
-        # end
+        end
       end
     end
   end

data/lib/vagrant-hostsupdater/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostsUpdater
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: vagrant-hostsupdater
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - "Falk K\xC3\xBChnel"