vagrant-hostmanager 1.2.0 → 1.2.1

data/lib/vagrant-hostmanager/hosts_file.rb

@@ -14,17 +14,29 @@ module VagrantPlugins
         # upload modified file and remove temporary file
         machine.communicate.upload(file, '/tmp/hosts')
         machine.communicate.sudo('mv /tmp/hosts /etc/hosts')
-        FileUtils.rm(file)
+        # i have no idea if this is a windows competibility issue or not, but sometimes it dosen't work on my machine
+        begin
+          FileUtils.rm(file) 
+        rescue Exception => e
+        end
       end
 
       def update_host
         # copy and modify hosts file on host with Vagrant-managed entries
         file = @global_env.tmp_path.join('hosts.local')
-        FileUtils.cp('/etc/hosts', file)
+        # add a "if windows..."
+        hosts_location = '/etc/hosts'
+        copy_cmd = 'sudo cp'
+        # handles the windows hosts file...
+        if ENV['OS'] == 'Windows_NT'
+          hosts_location = "#{ENV['WINDIR']}\\System32\\drivers\\etc\\hosts"
+          copy_cmd = 'cp'
+        end
+        FileUtils.cp(hosts_location, file)
         update_file(file)
 
         # copy modified file using sudo for permission
-        `sudo cp #{file} /etc/hosts`
+        `#{copy_cmd} #{file} #{hosts_location}`
       end
 
       private
@@ -32,6 +44,7 @@ module VagrantPlugins
       def update_file(file)
         # build array of host file entries from Vagrant configuration
         entries = []
+        ids = []
         get_machines.each do |name, p|
           if @provider == p
             machine = @global_env.machine(name, p)
@@ -40,6 +53,7 @@ module VagrantPlugins
             ip = get_ip_address(machine)
             aliases = machine.config.hostmanager.aliases.join(' ').chomp
             entries <<  "#{ip}\t#{host} #{aliases}\t# VAGRANT ID: #{id}\n"
+            ids << id unless ids.include?(id)
           end
         end
 
@@ -47,7 +61,7 @@ module VagrantPlugins
         begin
           # copy each line not managed by Vagrant
           File.open(file).each_line do |line|
-            tmp_file << line unless line =~ /# VAGRANT ID:/
+            tmp_file << line unless ids.any? { |id| line =~ /# VAGRANT ID: #{id}/ }
           end
 
           # write a line for each Vagrant-managed entry

data/lib/vagrant-hostmanager/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module HostManager
-    VERSION = '1.2.0'
+    VERSION = '1.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-hostmanager
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9183860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.3'
   type: :development
   prerelease: false
-  version_requirements: *9183860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &9190520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +37,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *9190520
+  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
   environment
 email:
@@ -82,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A Vagrant plugin that manages the /etc/hosts file within a multi-machine