haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplify trigger command filtering

This commit is contained in:
Brian Cain 2018-03-28 15:34:16 -07:00
parent 372a6a7911
commit 1462b3f718
No known key found for this signature in database
GPG Key ID: 43D51080D357A001
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vagrant/plugin/v2/trigger.rb
View File

@ -30,11 +30,9 @@ module Vagrant
# @param [String] guest_name The guest that invoked firing the triggers
def fire_before_triggers(action, guest_name)
# get all triggers matching action
triggers = []
triggers << config.before_triggers.map do |trigger|
trigger if trigger.command == action
end.compact
triggers = triggers.first
triggers = config.before_triggers.select do |trigger|
trigger.command == action
end
triggers = filter_triggers(triggers, guest_name)
binding.pry
@ -51,12 +49,10 @@ module Vagrant
# @param [Symbol] action Vagrant command to fire trigger on
# @param [String] guest_name The guest that invoked firing the triggers
def fire_after_triggers(action, guest_name)
# get all triggers matching action
triggers = []
triggers << config.after_triggers.map do |trigger|
trigger if trigger.command == action
end.compact
triggers = triggers.first
triggers = config.after_triggers.select do |trigger|
trigger.command == action
end
triggers = filter_triggers(triggers, guest_name)
binding.pry
@ -110,12 +106,15 @@ module Vagrant
#
# @param [ShellProvisioner/Config] config A Shell provisioner config
def run(config)
@logger.info("Running script on the host...")
end
# Runs a script on the host
#
# @param [ShellProvisioner/Config] config A Shell provisioner config
def run_remote(config)
@logger.info("Running script on the guest...")
# make sure guest actually exists, if not, display a WARNING
end
end
end