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

providers/docker: Remove custom Action::Message

This commit is contained in:
Fabio Rehm 2014-03-26 21:21:40 -03:00 committed by Mitchell Hashimoto
parent 15605b1a81
commit 29f2d9b09d
2 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/providers/docker/action.rb
View File

@ -40,13 +40,13 @@ module VagrantPlugins
b.use ConfigValidate b.use ConfigValidate
b.use Call, Created do |env1, b2| b.use Call, Created do |env1, b2|
if !env1[:result] if !env1[:result]
b2.use Message, :not_created b2.use Message, I18n.t("docker_provider.messages.not_created")
next next
end end
b2.use Call, IsRunning do |env2, b3| b2.use Call, IsRunning do |env2, b3|
if !env2[:result] if !env2[:result]
b3.use Message, :not_running b3.use Message, I18n.t("docker_provider.messages.not_running")
next next
end end
@ -68,7 +68,7 @@ module VagrantPlugins
end end
end end
else else
b2.use Message, :not_created b2.use Message, I18n.t("docker_provider.messages.not_created")
end end
end end
end end
@ -81,7 +81,7 @@ module VagrantPlugins
Vagrant::Action::Builder.new.tap do |b| Vagrant::Action::Builder.new.tap do |b|
b.use Call, Created do |env1, b2| b.use Call, Created do |env1, b2|
if !env1[:result] if !env1[:result]
b2.use Message, :not_created b2.use Message, I18n.t("docker_provider.messages.not_created")
next next
end end
@ -98,7 +98,7 @@ module VagrantPlugins
Vagrant::Action::Builder.new.tap do |b| Vagrant::Action::Builder.new.tap do |b|
b.use Call, Created do |env1, b2| b.use Call, Created do |env1, b2|
if !env1[:result] if !env1[:result]
b2.use Message, :not_created b2.use Message, I18n.t("docker_provider.messages.not_created")
next next
end end
@ -110,7 +110,7 @@ module VagrantPlugins
b3.use Destroy b3.use Destroy
b3.use ProvisionerCleanup b3.use ProvisionerCleanup
else else
b3.use Message, :will_not_destroy b3.use Message, I18n.t("docker_provider.messages.will_not_destroy")
end end
end end
end end
@ -141,7 +141,7 @@ module VagrantPlugins
next if env[:result] next if env[:result]
b2.use Provision b2.use Provision
b2.use Message, :starting b2.use Message, I18n.t("docker_provider.messages.starting")
b2.use action_boot b2.use action_boot
end end
end end
@ -163,7 +163,6 @@ module VagrantPlugins
autoload :Destroy, action_root.join("destroy") autoload :Destroy, action_root.join("destroy")
autoload :ForwardPorts, action_root.join("forward_ports") autoload :ForwardPorts, action_root.join("forward_ports")
autoload :Stop, action_root.join("stop") autoload :Stop, action_root.join("stop")
autoload :Message, action_root.join("message")
autoload :PrepareNFSValidIds, action_root.join("prepare_nfs_valid_ids") autoload :PrepareNFSValidIds, action_root.join("prepare_nfs_valid_ids")
autoload :PrepareNFSSettings, action_root.join("prepare_nfs_settings") autoload :PrepareNFSSettings, action_root.join("prepare_nfs_settings")
autoload :IsRunning, action_root.join("is_running") autoload :IsRunning, action_root.join("is_running")

23
plugins/providers/docker/action/message.rb
View File

@ -1,23 +0,0 @@
module VagrantPlugins
module DockerProvider
module Action
# XXX: Is this really needed? Should we contribute this back to Vagrant's core?
class Message
def initialize(app, env, msg_key, type = :info)
@app = app
@msg_key = msg_key
@type = type
end
def call(env)
machine = env[:machine]
message = I18n.t("docker_provider.messages.#{@msg_key}", name: machine.name)
env[:ui].send @type, message
@app.call env
end
end
end
end
end