bovem 3.0.5 → 4.0.0

data/doc/top-level-namespace.html

@@ -6,7 +6,7 @@
 <title>
   Top Level Namespace
   
-    &mdash; Documentation by YARD 0.8.7.3
+    &mdash; Documentation by YARD 0.8.7.6
   
 </title>
 
@@ -17,7 +17,7 @@
 <script type="text/javascript" charset="utf-8">
   hasFrames = window.top.frames.main ? true : false;
   relpath = '';
-  framesUrl = "frames.html#!" + escape(window.location.href);
+  framesUrl = "frames.html#!top-level-namespace.html";
 </script>
 
 
@@ -103,9 +103,9 @@
 </div>
 
     <div id="footer">
-  Generated on Sat Mar  8 10:27:42 2014 by
+  Generated on Tue Mar 29 20:43:16 2016 by
   <a href="http://yardoc.org" title="Yay! A Ruby Documentation Tool" target="_parent">yard</a>
-  0.8.7.3 (ruby-2.1.0).
+  0.8.7.6 (ruby-2.3.0).
 </div>
 
   </body>

data/lib/bovem.rb

@@ -9,14 +9,13 @@ require "prettyprint"
 require "logger"
 require "open4"
 require "find"
-require "fileutils"
 require "lazier"
 
 Lazier.load!(:object, :boolean, :math)
 
-require "bovem/version" if !defined?(Bovem::Version)
+require "bovem/version" unless defined?(Bovem::Version)
+require "bovem/i18n"
 require "bovem/errors"
-require "bovem/localizer"
 require "bovem/configuration"
 require "bovem/logger"
 require "bovem/console"
@@ -24,4 +23,4 @@ require "bovem/shell"
 require "bovem/command"
 require "bovem/option"
 require "bovem/application"
-require "bovem/parser"
+require "bovem/parser"

data/lib/bovem/application.rb

@@ -29,6 +29,9 @@ module Bovem
     attr_accessor :show_commands
     attr_accessor :output_commands
 
+    # The location of the locales translation files.
+    LOCALE_ROOT = ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../../locales/").freeze
+
     # Initializes a new Bovem application.
     #
     # In options, you can override the command line arguments with `:__args__`, and you can skip execution by specifying `run: false`.
@@ -38,7 +41,13 @@ module Bovem
     # @param options [Hash] The settings to initialize the application with.
     # @return [Application] The created application.
     def self.create(options = {}, &block)
-      raise Bovem::Errors::Error.new(Bovem::Application, :missing_block, Bovem::Localizer.localize_on_locale(options[:locale], :missing_app_block)) if !block_given?
+      unless block_given?
+        raise Bovem::Errors::Error.new(
+          Bovem::Application, :missing_block,
+          Bovem::I18n.new(options[:locale], root: "bovem.application", path: LOCALE_ROOT).missing_app_block
+        )
+      end
+
       run, args, options = setup_application_option(options)
 
       begin
@@ -49,6 +58,32 @@ module Bovem
       end
     end
 
+    # Setup options for application creation.
+    #
+    # @param options [Hash] The options to setups.
+    # @return [Array] If to run the application, the arguments and the specified options.
+    def self.setup_application_option(options)
+      base_options = {
+        name: Bovem::I18n.new(options[:locale], root: "bovem.application", path: LOCALE_ROOT).default_application_name,
+        parent: nil, application: nil
+      }
+      options = base_options.merge(options.ensure_hash)
+      run = options.delete(:run)
+      [(!run.nil? ? run : true).to_boolean, options.delete(:__args__), options]
+    end
+
+    # Create the application.
+    #
+    # @param run [Boolean] If to run the application.
+    # @param args [Hash] The arguments to use for running.
+    # @param options [Hash] The options of the application.
+    # @return [Application] The new application.
+    def self.create_application(run, args, options, &block)
+      application = new(options, &block)
+      application.execute(args) if application && run
+      application
+    end
+
     # Creates a new application.
     #
     # @param options [Hash] The settings to initialize the application with.
@@ -69,7 +104,7 @@ module Bovem
     # @param value [String|nil] The new version of this application.
     # @return [String|nil] The version of this application.
     def version(value = nil)
-      @version = value.ensure_string if !value.nil?
+      @version = value.ensure_string unless value.nil?
       @version
     end
 
@@ -86,14 +121,14 @@ module Bovem
         action { |command| application.command_help(command) }
       end
 
-      option(:help, [i18n.help_option_short_form, i18n.help_option_long_form], help: i18n.help_message){ |application, _| application.show_help }
+      option(:help, [i18n.help_option_short_form, i18n.help_option_long_form], help: i18n.help_message) { |application, _| application.show_help }
     end
 
     # The name of the current executable.
     #
     # @return [String] The name of the current executable.
     def executable_name
-      $0
+      $PROGRAM_NAME
     end
 
     # Shows a help about a command.
@@ -102,13 +137,9 @@ module Bovem
     def command_help(command)
       fetch_commands_for_help(command).each do |arg|
         # Find the command across
-        next_command = Bovem::Parser.find_command(arg, command, [])
-
-        if next_command then
-          command = command.commands[next_command[:name]]
-        else
-          break
-        end
+        next_command = Bovem::Parser.find_command(arg, command, args: [])
+        break unless next_command
+        command = command.commands[next_command[:name]]
       end
 
       command.show_help
@@ -126,33 +157,10 @@ module Bovem
     end
 
     private
-      # Setup options for application creation.
-      #
-      # @param options [Hash] The options to setups.
-      # @return [Array] If to run the application, the arguments and the specified options.
-      def self.setup_application_option(options)
-        options = {name: Bovem::Localizer.localize_on_locale(options[:locale], :default_application_name), parent: nil, application: nil}.merge(options.ensure_hash)
-        run = options.delete(:run)
-        [(!run.nil? ? run : true).to_boolean, options.delete(:__args__), options]
-      end
 
-      # Create the application.
-      #
-      # @param run [Boolean ]If to run the application.
-      # @param args [Hash] The arguments to use for running.
-      # @param options [Hash] The options of the application.
-      # @return [Application] The new application.
-      def self.create_application(run, args, options, &block)
-        application = new(options, &block)
-        application.execute(args) if application && run
-        application
-      end
-
-      # Fetch a command list for showing help.
-      #
-      # @param command [Command] The command to show help for.
-      def fetch_commands_for_help(command)
-        command.arguments.map {|c| c.split(":") }.flatten.map(&:strip).select(&:present?)
-      end
+    # :nodoc:
+    def fetch_commands_for_help(command)
+      command.arguments.map { |c| c.split(":") }.flatten.map(&:strip).select(&:present?)
+    end
   end
-end
+end

data/lib/bovem/command.rb

@@ -11,122 +11,121 @@ module Bovem
     module Help
       # Shows a help about this command.
       def show_help
-        console = is_application? ? self.console : application.console
-        is_application? ? show_help_application_summary(console) : show_help_command_summary(console)
-        show_help_banner(console) if has_banner?
-        show_help_options(console) if has_options?
-        show_help_commands(console) if has_commands?
+        console = application? ? self.console : application.console
+        application? ? show_help_application_summary(console) : show_help_command_summary(console)
+        show_help_banner(console) if banner?
+        show_help_options(console) if options?
+        show_help_commands(console) if commands?
         Kernel.exit(0)
       end
 
       private
-        # Prints a help summary about the application.
-        #
-        # @param console [Bovem::Console] The console object to use to print.
-        def show_help_application_summary(console)
-          # Application
-          console.write(i18n.help_name)
-          console.write("%s %s%s" % [name, version, has_description? ? " - " + description : ""], "\n", 4, true)
-          show_synopsis(console)
-        end
 
-        # Prints a synopsis about the application.
-        #
-        # @param console [Bovem::Console] The console object to use to print.
-        def show_synopsis(console)
-          console.write("")
-          console.write(i18n.help_synopsis)
-          console.write(synopsis.present? ? synopsis : i18n.help_application_synopsis % [executable_name, has_commands? ? i18n.help_subcommand_invocation : ""], "\n", 4, true)
-        end
+      # :nodoc:
+      def show_help_application_summary(console)
+        # Application
+        console.write(i18n.help_name)
+        console.write(sprintf("%s %s%s", name, version, description? ? " - " + description : ""), suffix: "\n", indented: 4, wrap: true)
+        show_synopsis(console)
+      end
 
-        # Prints a help summary about the command.
-        #
-        # @param console [Bovem::Console] The console object to use to print.
-        def show_help_command_summary(console)
-          console.write(i18n.help_synopsis)
-          console.write(synopsis.present? ? synopsis : i18n.help_command_synopsis % [application.executable_name, full_name(nil, " "), has_commands? ? i18n.help_subsubcommand_invocation : ""], "\n", 4, true)
-        end
+      # :nodoc:
+      def show_synopsis(console)
+        console.write("")
+        console.write(i18n.help_synopsis)
+        console.write(format_synopsis, suffix: "\n", indented: 4, wrap: true)
+      end
 
-        # Prints the description of the command.
-        #
-        # @param console [Bovem::Console] The console object to use to print.
-        def show_help_banner(console)
-          console.write("")
-          console.write(i18n.help_description)
-          console.write(banner, "\n", 4, true)
-        end
+      # :nodoc:
+      def show_help_command_summary(console)
+        console.write(i18n.help_synopsis)
+        console.write(format_summary, suffix: "\n", indented: 4, wrap: true)
+      end
 
-        # Prints information about the command's options.
-        #
-        # @param console [Bovem::Console] The console object to use to print.
-        def show_help_options(console)
-          console.write("")
-          console.write(is_application? ? i18n.help_global_options : i18n.help_options)
+      # :nodoc:
+      def show_help_banner(console)
+        console.write("")
+        console.write(i18n.help_description)
+        console.write(banner, suffix: "\n", indented: 4, wrap: true)
+      end
 
-          # First of all, grab all options and construct labels
-          lefts = show_help_options_build_labels
+      # :nodoc:
+      def show_help_options(console)
+        console.write("")
+        console.write(application? ? i18n.help_global_options : i18n.help_options)
 
-          console.with_indentation(4) do
-            lefts.keys.sort.each do |head|
-              show_help_option(console, lefts, head)
-            end
-          end
-        end
+        # First of all, grab all options and construct labels
+        lefts = show_help_options_build_labels
 
-        # Adjusts options names for printing.
-        #
-        # @return [Hash] The adjusted options for printing.
-        def show_help_options_build_labels
-          options.values.reduce({}) do |lefts, option|
-            left = [option.complete_short, option.complete_long]
-            left.map!{|l| l + " " + option.meta } if option.requires_argument?
-            lefts[left.join(", ")] = option.has_help? ? option.help : i18n.help_no_description
-            lefts
+        console.with_indentation(4) do
+          lefts.keys.sort.each do |head|
+            show_help_option(console, lefts, head)
           end
         end
+      end
 
-        # Prints information about an option.
-        #
-        # @param console [Bovem::Console] The console object to use to print.
-        # @param lefts [Hash] The list of adjusted options.
-        # @param head [String] The option to print.
-        def show_help_option(console, lefts, head)
-          alignment = lefts.keys.map(&:length).max
-          help = lefts[head]
-          console.write("%s - %s" % [head.ljust(alignment, " "), help], "\n", true, true)
+      # :nodoc:
+      def show_help_options_build_labels
+        options.values.reduce({}) do |lefts, option|
+          left = [option.complete_short, option.complete_long]
+          format_label(option, left, lefts)
         end
+      end
 
-        # Prints information about the command's subcommands.
-        #
-        # @param console [Bovem::Console] The console object to use to print.
-        def show_help_commands(console)
-          alignment = prepare_show_help_commands(console)
+      # :nodoc:
+      def show_help_option(console, lefts, head)
+        alignment = lefts.keys.map(&:length).max
+        help = lefts[head]
+        console.write(sprintf("%s - %s", head.ljust(alignment, " "), help), suffix: "\n", indented: true, wrap: true)
+      end
+
+      # :nodoc:
+      def show_help_commands(console)
+        alignment = prepare_show_help_commands(console)
 
-          console.with_indentation(4) do
-            commands.keys.sort.each do |name|
-              show_help_command(console, name, alignment)
-            end
+        console.with_indentation(4) do
+          commands.keys.sort.each do |name|
+            show_help_command(console, name, alignment)
           end
         end
+      end
 
-        # Starts printing information about the command's subcommands.
-        #
-        # @param console [Bovem::Console] The console object to use to print.
-        def prepare_show_help_commands(console)
-          console.write("")
-          console.write(is_application? ? i18n.help_commands : i18n.help_subcommands)
-          commands.keys.map(&:length).max
-        end
+      # :nodoc:
+      def prepare_show_help_commands(console)
+        console.write("")
+        console.write(application? ? i18n.help_commands : i18n.help_subcommands)
+        commands.keys.map(&:length).max
+      end
 
-        # Prints information about a command's subcommand.
-        #
-        # @param name [String] The name of command to print.
-        # @param console [Bovem::Console] The console object to use to print.
-        def show_help_command(console, name, alignment)
-          # Find the maximum length of the commands
-          command = commands[name]
-          console.write("%s - %s" % [name.ljust(alignment, " "), command.description.present? ? command.description : i18n.help_no_description], "\n", true, true)
-        end
+      # :nodoc:
+      def show_help_command(console, name, alignment)
+        # Find the maximum length of the commands
+        command = commands[name]
+        console.write(
+          sprintf("%s - %s", name.ljust(alignment, " "), command.description.present? ? command.description : i18n.help_no_description),
+          suffix: "\n", indented: true, wrap: true
+        )
+      end
+
+      # :nodoc:
+      def format_synopsis
+        sprintf(synopsis.present? ? synopsis : i18n.help_application_synopsis, executable_name, commands? ? i18n.help_subcommand_invocation : "")
+      end
+
+      # :nodoc:
+      def format_summary
+        sprintf(
+          synopsis.present? ? synopsis : i18n.help_command_synopsis,
+          application.executable_name, full_name(nil, " "), commands? ? i18n.help_subsubcommand_invocation : ""
+        )
+      end
+
+      # :nodoc:
+      def format_label(option, left, lefts)
+        left.map! { |l| l + " " + option.meta } if option.requires_argument?
+        lefts[left.join(", ")] = option.help? ? option.help : i18n.help_no_description
+        lefts
+      end
     end
 
     # Methods to manage options and subcommands.
@@ -161,12 +160,8 @@ module Bovem
         name = name.ensure_string
         @options ||= HashWithIndifferentAccess.new
 
-        if @options[name] then
-          if is_application? then
-            raise Bovem::Errors::Error.new(self, :duplicate_option, i18n.existing_option_global(name))
-          else
-            raise Bovem::Errors::Error.new(self, :duplicate_option, i18n.existing_option(name, full_name))
-          end
+        if @options[name]
+          raise Bovem::Errors::Error.new(self, :duplicate_option, application? ? i18n.existing_option_global(name) : i18n.existing_option(name, full_name))
         end
 
         option = Bovem::Option.new(name, forms, options, &action)
@@ -192,8 +187,8 @@ module Bovem
       # Check if this command has subcommands.
       #
       # @return [Boolean] `true` if this command has subcommands, `false` otherwise.
-      def has_commands?
-        commands.length > 0
+      def commands?
+        !commands.empty?
       end
 
       # Returns the list of options of this command.
@@ -212,8 +207,8 @@ module Bovem
       # Check if this command has options.
       #
       # @return [Boolean] `true` if this command has options, `false` otherwise.
-      def has_options?
-        options.length > 0
+      def options?
+        !options.empty?
       end
 
       # Adds a new argument to this command.
@@ -241,52 +236,43 @@ module Bovem
       # @param prefix [String] The prefix to add to the option of this command.
       # @param whitelist [Array] The list of options to include. By default all options are included.
       # @return [HashWithIndifferentAccess] The requested options.
-      def get_options(unprovided = false, application = "application_", prefix = "", *whitelist)
+      def get_options(unprovided: false, application: "application_", prefix: "", whitelist: [])
         rv = HashWithIndifferentAccess.new
-        rv.merge!(self.application.get_options(unprovided, nil, application, *whitelist)) if application && !is_application?
+
+        if application && !application?
+          rv.merge!(self.application.get_options(unprovided: unprovided, application: nil, prefix: application, whitelist: whitelist))
+        end
+
         rv.merge!(get_current_options(unprovided, prefix, whitelist))
         rv
       end
 
       private
-        # Creates a new command.
-        #
-        # @param name [String] The name of this command.
-        # @param options [Hash] The settings for this command.
-        # @return [Command] The new command.
-        def create_command(name, options, &block)
-          command = Bovem::Command.new(options, &block)
-          command.option(:help, [i18n.help_option_short_form, i18n.help_option_long_form], help: i18n.help_message){|c, _| c.show_help }
-          @commands[name.to_s] = command
-          command
-        end
 
-        # Gets the list of the options of this command.
-        # @param unprovided [Boolean] If to include also options that were not provided by the user and that don't have any default value.
-        # @param prefix [String] The prefix to add to the option of this command.
-        # @param whitelist [Array] The list of options to include. By default all options are included.
-        # @return [HashWithIndifferentAccess] The requested options.
-        def get_current_options(unprovided, prefix, whitelist)
-          rv = HashWithIndifferentAccess.new
-          whitelist = (whitelist.present? ? whitelist : options.keys).map(&:to_s)
-
-          options.each do |key, option|
-            rv["#{prefix}#{key}"] = option.value if include_option?(whitelist, unprovided, key, option)
-          end
+      # :nodoc:
+      def create_command(name, options, &block)
+        command = Bovem::Command.new(options, &block)
+        command.option(:help, [i18n.help_option_short_form, i18n.help_option_long_form], help: i18n.help_message) { |c, _| c.show_help }
+        @commands[name.to_s] = command
+        command
+      end
 
-          rv
-        end
+      # :nodoc:
+      def get_current_options(unprovided, prefix, whitelist)
+        rv = HashWithIndifferentAccess.new
+        whitelist = (whitelist.present? ? whitelist : options.keys).map(&:to_s)
 
-        # Checks if a option must be included in a hash.
-        #
-        # @param whitelist [Array] The list of options to include.
-        # @param unprovided [Boolean] If to include also options that were not provided by the user and that don't have any default value.
-        # @param key [String] The option name.
-        # @param option [Option] The option to include.
-        # @return [Boolean] Whether to include the option.
-        def include_option?(whitelist, unprovided, key, option)
-          whitelist.include?(key.to_s) && (option.provided? || option.has_default? || (unprovided && option.action.nil?))
+        options.each do |key, option|
+          rv["#{prefix}#{key}"] = option.value if include_option?(whitelist, unprovided, key, option)
         end
+
+        rv
+      end
+
+      # :nodoc:
+      def include_option?(whitelist, unprovided, key, option)
+        whitelist.include?(key.to_s) && (option.provided? || option.default? || (unprovided && option.action.nil?))
+      end
     end
   end
 
@@ -318,6 +304,8 @@ module Bovem
   #   @return [Array] The options available for this command.
   # @attribute [r] arguments
   #   @return [Array] The arguments provided to this command.
+  # @attribute [r] i18n
+  #   @return [I18n] A i18n helper.
   class Command
     attr_accessor :name
     attr_accessor :description
@@ -328,8 +316,8 @@ module Bovem
     attr_accessor :after
     attr_accessor :application
     attr_accessor :parent
+    attr_reader :i18n
 
-    include Lazier::I18n
     include Bovem::CommandMethods::Help
     include Bovem::CommandMethods::Children
 
@@ -346,7 +334,7 @@ module Bovem
     # @param value [NilClass|Object] The new name of this command.
     # @return [String] The name of this command.
     def name(value = nil)
-      @name = value if !value.nil?
+      @name = value unless value.nil?
       @name
     end
 
@@ -356,11 +344,8 @@ module Bovem
     # @param separator [String] The separator to use for components.
     # @return [String] The full name.
     def full_name(suffix = nil, separator = ":")
-      if is_application? then
-        nil
-      else
-        [@parent ? @parent.full_name(nil, separator) : nil, !is_application? ? name : nil, suffix].compact.join(separator)
-      end
+      return nil if application?
+      [@parent ? @parent.full_name(nil, separator) : nil, !application? ? name : nil, suffix].compact.join(separator)
     end
 
     # Reads and optionally sets the short description of this command.
@@ -368,7 +353,7 @@ module Bovem
     # @param value [NilClass|Object] The new short description of this command.
     # @return [String] The short description of this command.
     def description(value = nil)
-      @description = value if !value.nil?
+      @description = value unless value.nil?
       @description
     end
 
@@ -377,7 +362,7 @@ module Bovem
     # @param value [NilClass|Object] The new description of this command.
     # @return [String] The description of this command.
     def banner(value = nil)
-      @banner = value if !value.nil?
+      @banner = value unless value.nil?
       @banner
     end
 
@@ -386,7 +371,7 @@ module Bovem
     # @param value [NilClass|Object] The new synopsis of this command.
     # @return [String] The synopsis of this command.
     def synopsis(value = nil)
-      @synopsis = value if !value.nil?
+      @synopsis = value unless value.nil?
       @synopsis
     end
 
@@ -430,27 +415,27 @@ module Bovem
     #
     # @return [Application] The application this command belongs to or `self`, if the command is an Application.
     def application
-      is_application? ? self : @application
+      application? ? self : @application
     end
 
     # Checks if the command is an application.
     #
     # @return [Boolean] `true` if command is an application, `false` otherwise.
-    def is_application?
+    def application?
       is_a?(Bovem::Application)
     end
 
     # Check if this command has a description.
     #
     # @return [Boolean] `true` if this command has a description, `false` otherwise.
-    def has_description?
+    def description?
       description.present?
     end
 
     # Check if this command has a banner.
     #
     # @return [Boolean] `true` if this command has a banner, `false` otherwise.
-    def has_banner?
+    def banner?
       banner.present?
     end
 
@@ -459,15 +444,15 @@ module Bovem
     # @param options [Hash] The settings for this command.
     # @return [Command] The command.
     def setup_with(options = {})
-      options = {} if !options.is_a?(::Hash)
+      options = {} unless options.is_a?(::Hash)
       setup_i18n(options)
 
       options.each_pair do |option, value|
         method = option.to_s
 
-        if respond_to?(method) && self.method(method).arity != 0 then
+        if respond_to?(method) && self.method(method).arity != 0
           send(method, value)
-        elsif respond_to?(method + "=") then
+        elsif respond_to?(method + "=")
           send(method + "=", value)
         end
       end
@@ -481,49 +466,46 @@ module Bovem
     def execute(args)
       subcommand = Bovem::Parser.parse(self, args)
 
-      if subcommand.present? then # We have a subcommand to call
+      if subcommand.present? # We have a subcommand to call
         commands[subcommand[:name]].execute(subcommand[:args])
-      elsif action then # Run our action
+      elsif action # Run our action
         # Run the before hook
-        execute_hook(before)
-
-        # Run the action
-        execute_hook(action)
-
-        # Run the after hook
-        execute_hook(after)
+        perform_action
       else # Show the help
         show_help
       end
     end
 
     private
-      # Setups the application localization.
-      #
-      # @param options [Hash] The settings for this command.
-      def setup_i18n(options)
-        i18n_setup("bovem.application", ::File.absolute_path(::Pathname.new(::File.dirname(__FILE__)).to_s + "/../../locales/"))
-        self.i18n = (options[:locale]).ensure_string
-      end
 
-      # Assigns a hook to a command.
-      #
-      # @param method [String|Symbol|NilClass] The method of the application to hookup.
-      # @param hook [Proc] The block to hookup if method is not provided.
-      def assign_hook(method, &hook)
-        assigned = nil
-        assigned = method if method.is_a?(::String) || method.is_a?(::Symbol)
-        assigned = hook if !assigned && hook && hook.arity == 1
-        assigned
-      end
+    # :nodoc:
+    def setup_i18n(options)
+      @i18n = Bovem::I18n.new(options[:locale], root: "bovem.application", path: Bovem::Application::LOCALE_ROOT)
+    end
 
-      # Executes a hook.
-      #
-      # @param hook [String|Symbol|Proc|NilClass] The hook to execute.
-      def execute_hook(hook)
-        if hook then
-          hook.is_a?(::String) || hook.is_a?(::Symbol) ? application.send(hook, self) : hook.call(self)
-        end
-      end
+    # :nodoc:
+    def assign_hook(method, &hook)
+      assigned = nil
+      assigned = method if method.is_a?(::String) || method.is_a?(::Symbol)
+      assigned = hook if !assigned && hook && hook.arity == 1
+      assigned
+    end
+
+    # :nodoc:
+    def execute_hook(hook)
+      return unless hook
+      hook.is_a?(::String) || hook.is_a?(::Symbol) ? application.send(hook, self) : hook.call(self)
+    end
+
+    # :nodoc:
+    def perform_action
+      execute_hook(before)
+
+      # Run the action
+      execute_hook(action)
+
+      # Run the after hook
+      execute_hook(after)
+    end
   end
-end
+end