(#6978) Enforce the calling convention of option hooks.

We require that hooks take exactly three arguments; now we enforce that in the
DSL, to ensure we give good, and early, errors to users who do the wrong
thing.

Paired-With: Max Martin <max@puppetlabs.com>

1 files changed, 6 insertions, 0 deletions

diff --git a/lib/puppet/interface/option_builder.rb b/lib/puppet/interface/option_builder.rb
index ccad0850d..d4e59a4df 100644
--- a/lib/puppet/interface/option_builder.rb
+++ b/lib/puppet/interface/option_builder.rb
@@ -31,6 +31,9 @@ class Puppet::Interface::OptionBuilder
     if @option.before_action
       raise ArgumentError, "#{@option} already has a before_action set"
     end
+    unless block.arity == 3 then
+      raise ArgumentError, "before_action takes three arguments, action, args, and options"
+    end
     @option.before_action = block
   end
 
@@ -39,6 +42,9 @@ class Puppet::Interface::OptionBuilder
     if @option.after_action
       raise ArgumentError, "#{@option} already has a after_action set"
     end
+    unless block.arity == 3 then
+      raise ArgumentError, "after_action takes three arguments, action, args, and options"
+    end
     @option.after_action = block
   end
 end