From cac99bd8c34e8664bcc02e4f94692c50449bfc3e Mon Sep 17 00:00:00 2001 From: Matt Brictson Date: Wed, 2 Mar 2016 17:43:03 -0800 Subject: [PATCH] hooks -> load_hooks --- lib/capistrano/configuration.rb | 4 ++-- lib/capistrano/configuration/plugin_installer.rb | 6 +++--- lib/capistrano/plugin.rb | 2 +- spec/lib/capistrano/plugin_spec.rb | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/capistrano/configuration.rb b/lib/capistrano/configuration.rb index 68819d71..bb5d86fc 100644 --- a/lib/capistrano/configuration.rb +++ b/lib/capistrano/configuration.rb @@ -152,8 +152,8 @@ module Capistrano fetch(:sshkit_backend) == SSHKit::Backend::Printer end - def install_plugin(plugin, hooks:true) - installer.install(plugin, hooks: hooks) + def install_plugin(plugin, load_hooks:true) + installer.install(plugin, load_hooks: load_hooks) end private diff --git a/lib/capistrano/configuration/plugin_installer.rb b/lib/capistrano/configuration/plugin_installer.rb index 71ce1f45..4720e6d8 100644 --- a/lib/capistrano/configuration/plugin_installer.rb +++ b/lib/capistrano/configuration/plugin_installer.rb @@ -11,18 +11,18 @@ module Capistrano # "Installs" a Plugin into Capistrano by loading its tasks, hooks, and # defaults at the appropriate time. The hooks in particular can be # skipped, if you want full control over when and how the plugin's tasks - # are executed. Simply pass `hooks:false` to opt out. + # are executed. Simply pass `load_hooks:false` to opt out. # # The plugin class or instance may be provided. These are equivalent: # # install(Capistrano::SCM::Git) # install(Capistrano::SCM::Git.new) # - def install(plugin, hooks:true) + def install(plugin, load_hooks:true) plugin = plugin.is_a?(Class) ? plugin.new : plugin plugin.define_tasks - plugin.register_hooks if hooks + plugin.register_hooks if load_hooks Rake::Task.define_task("load:defaults") do plugin.set_defaults diff --git a/lib/capistrano/plugin.rb b/lib/capistrano/plugin.rb index 63cee207..7c58b094 100644 --- a/lib/capistrano/plugin.rb +++ b/lib/capistrano/plugin.rb @@ -30,7 +30,7 @@ require "rake/tasklib" # # # Capfile # require "capistrano/superfancy" -# install_plugin Capistrano::Superfancy, hooks: false +# install_plugin Capistrano::Superfancy, load_hooks: false # class Capistrano::Plugin < Rake::TaskLib include Capistrano::DSL diff --git a/spec/lib/capistrano/plugin_spec.rb b/spec/lib/capistrano/plugin_spec.rb index 4865b2e6..f30ba792 100644 --- a/spec/lib/capistrano/plugin_spec.rb +++ b/spec/lib/capistrano/plugin_spec.rb @@ -51,8 +51,8 @@ module Capistrano expect(Rake::Task["deploy:published"].prerequisites).to include("hello") end - it "skips registering hooks if :hooks => false" do - install_plugin(DummyPlugin, hooks: false) + it "skips registering hooks if load_hooks: false" do + install_plugin(DummyPlugin, load_hooks: false) expect(Rake::Task["deploy:published"].prerequisites).to be_empty end