kienan
/
vagrant-hostmanager
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into upstream

This commit is contained in:
Kienan Stewart 2018-12-02 14:12:53 -05:00
parent 43c2d0492b 2b75b7f00f
commit 23c8ede5fe
No known key found for this signature in database
GPG Key ID: 075A846E78FE47EA
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -8,6 +8,9 @@ Vagrant Host Manager
`vagrant-hostmanager` is a Vagrant plugin that manages the `hosts` file on guest machines (and optionally the host). Its goal is to enable resolution of multi-machine environments deployed with a cloud provider where IP addresses are not known in advance. `vagrant-hostmanager` is a Vagrant plugin that manages the `hosts` file on guest machines (and optionally the host). Its goal is to enable resolution of multi-machine environments deployed with a cloud provider where IP addresses are not known in advance.
Do you like what we do? Consider supporting us through Patreon. All of the money goes directly back into growing our collection of open source and free software.
[![Patreon](https://img.shields.io/badge/patreon-donate-red.svg)](https://www.patreon.com/devopsgroup)
Installation Installation
------------ ------------

8
lib/vagrant-hostmanager/hosts_file/updater.rb
View File

@ -88,8 +88,8 @@ module VagrantPlugins
def update_content(file_content, resolving_machine, include_id, line_endings) def update_content(file_content, resolving_machine, include_id, line_endings)
id = include_id ? " id: #{read_or_create_id}" : "" id = include_id ? " id: #{read_or_create_id}" : ""
header = "## vagrant-hostmanager-start#{id}\n" header = "## vagrant-hostmanager-start#{id}"
footer = "## vagrant-hostmanager-end\n" footer = "## vagrant-hostmanager-end"
body = get_machines body = get_machines
.map { |machine| get_hosts_file_entry(machine, resolving_machine) } .map { |machine| get_hosts_file_entry(machine, resolving_machine) }
.join .join
@ -146,12 +146,12 @@ module VagrantPlugins
if body.empty? if body.empty?
block = "\n" block = "\n"
else else
block = "\n\n" + header + body + footer + "\n" block = "\n\n" + header + "\n" + body + footer + "\n\n"
end end
# Pattern for finding existing block # Pattern for finding existing block
header_pattern = Regexp.quote(header) header_pattern = Regexp.quote(header)
footer_pattern = Regexp.quote(footer) footer_pattern = Regexp.quote(footer)
pattern = Regexp.new("\n*#{header_pattern}.*?#{footer_pattern}\n*", Regexp::MULTILINE) pattern = Regexp.new("[\r\n]*#{header_pattern}.*?#{footer_pattern}[\r\n]*", Regexp::MULTILINE)
# Replace existing block or append # Replace existing block or append
content = old_content.match(pattern) ? old_content.sub(pattern, block) : old_content.rstrip + block content = old_content.match(pattern) ? old_content.sub(pattern, block) : old_content.rstrip + block
if line_endings == "crlf" if line_endings == "crlf"

2
lib/vagrant-hostmanager/version.rb
View File

@ -1,5 +1,5 @@
module VagrantPlugins module VagrantPlugins
module HostManager module HostManager
VERSION = '1.8.8' VERSION = '1.8.9'
end end
end end