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

make get_machines return machine instances instead of machine names

This commit is contained in:
Paulo Bittencourt 2014-02-17 16:32:56 -05:00
parent ab5d82275a
commit 8f041f5ef6
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/vagrant-hostmanager/hosts_file.rb
View File

@ -66,8 +66,6 @@ module VagrantPlugins
header = "## vagrant-hostmanager-start#{id}\n" header = "## vagrant-hostmanager-start#{id}\n"
footer = "## vagrant-hostmanager-end\n" footer = "## vagrant-hostmanager-end\n"
body = get_machines body = get_machines
.select { |name, provider| provider == @provider}
.collect { |name, _| @global_env.machine(name, @provider) }
.map { |machine| get_hosts_file_entry(machine, resolving_machine) } .map { |machine| get_hosts_file_entry(machine, resolving_machine) }
.join .join
get_new_content(header, footer, body, file_content) get_new_content(header, footer, body, file_content)
@ -99,18 +97,20 @@ module VagrantPlugins
def get_machines def get_machines
if @global_env.config_global.hostmanager.include_offline? if @global_env.config_global.hostmanager.include_offline?
machines = [] machines = @global_env.machine_names
@global_env.machine_names.each do |name|
begin
@global_env.machine(name, @provider)
machines << [name, @provider]
rescue Vagrant::Errors::MachineNotFound
end
end
machines
else else
@global_env.active_machines machines = @global_env.active_machines
end end
# Collect only machines that exist for the current provider
machines.collect do |name, _|
begin
machine = @global_env.machine(name, @provider)
rescue Vagrant::Errors::MachineNotFound
# ignore
end
machine
end
.reject(&:nil?)
end end
def get_new_content(header, footer, body, old_content) def get_new_content(header, footer, body, old_content)